Beat Dan at bugfixing

app/helpers/application_helper.rb

@@ -58,7 +58,7 @@ module ApplicationHelper
 
   def person_image_tag(person)
     image_location = person.profile.image_url
-    image_location ||= "/images/user/default.jpg"
+    image_location ||= "/images/user/default.png"
 
     image_tag image_location, :class => "avatar", :alt => person.real_name, :title => person.real_name
   end

app/views/albums/index.html.haml

@@ -8,20 +8,23 @@
       $("#add_album_button").fancybox();
     });
 
-- content_for :left_pane do
+.span-4.append-1.last
   = render "shared/aspect_friends"
 
-%h3 Albums
-= link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
+.span-15.last
+  %h3
+    = @aspect
+    Albums
+  = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
 
-.fancybox_content
-  #new_album_pane
-    = render "albums/new_album", :aspect => params[:aspect]
+  .fancybox_content
+    #new_album_pane
+      = render "albums/new_album", :aspect => params[:aspect]
 
-%div
-  - for album in @albums
-    = render "album", :post => album
+  %div
+    - for album in @albums
+      = render "album", :post => album
 
-#pagination
-  = will_paginate @albums
+  #pagination
+    = will_paginate @albums
 

app/views/albums/show.html.haml

@@ -9,29 +9,27 @@
     });
   });
 
-= content_for :page_title do
-  = link_to "◂ #{t('.albums')}", albums_path(:aspect => @aspect)
-
-- content_for :left_pane do
+.span-4.append-1.last
   = render "shared/aspect_friends"
 
-%h3
-  = @album.name
-="#{t('.updated')} #{how_long_ago(@album)}"
--if current_user.owns? @album
-  =render 'photos/new_photo'
-  = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
+.span-19.last
+  %h3
+    = link_to "#{@aspect} Albums", albums_path(:aspect => @aspect)
 
-.album_id{:id => @album.id, :style => "display:hidden;"}
+    = @album.name
+  ="#{t('.updated')} #{how_long_ago(@album)}"
+  .right
+    -if current_user.owns? @album
+      =render 'photos/new_photo'
+      = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
 
--unless current_user.owns? @album
-  %h4= "#{t('.by')} #{@album.person.real_name}"
+  .album_id{:id => @album.id, :style => "display:hidden;"}
 
-#thumbnails
-  - for photo in @album_photos
-    .image_thumb
-      = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
+  -unless current_user.owns? @album
+    %h4= "#{t('.by')} #{@album.person.real_name}"
+
+  #thumbnails
+    - for photo in @album_photos
+      .image_thumb
+        = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
 
-#content_bottom
-  .back
-    = link_to "⇧ #{t('.albums')}", albums_path(:aspect => @aspect) 

app/views/aspects/index.html.haml

@@ -2,19 +2,16 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :left_pane do
+.span-4.append-1.last
   = render "shared/aspect_friends"
 
-- content_for :publish do
-  = render "shared/publisher", :aspect_ids => :all, :broadcast => true
+.span-15.last
+  = render 'aspects/empty_messages'
+  = render "shared/publisher"
+  %ul#stream
+    - for post in @posts
+      = render type_partial(post), :post => post unless post.class == Album
 
-= render 'aspects/empty_messages'
-
-= render "shared/publisher"
-%ul#stream
-  - for post in @posts
-    = render type_partial(post), :post => post unless post.class == Album
-
-#pagination
-  = will_paginate @posts
+  #pagination
+    = will_paginate @posts
 

app/views/aspects/manage.html.haml

@@ -6,7 +6,11 @@
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
 
-- content_for :left_pane do
+%h2
+  Manage aspects
+  = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
+
+.span-4.append-1.last
   %h3=t('.requests')
 
   .requests
@@ -27,36 +31,34 @@
 
   = render 'shared/invitations', :invites => @invites
 
-%h2 Manage aspects
-= link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
+.span-19.last
+  %ul#aspect_list
+    - for aspect in @aspects
+      %li.aspect
 
-%ul#aspect_list
-  - for aspect in @aspects
-    %li.aspect
+        .aspect_name
+          %span.edit_name_field
+            %h3{:contenteditable => true}= aspect.name
+            %span.tip click to edit
 
-      .aspect_name
-        %span.edit_name_field
-          %h3{:contenteditable => true}= aspect.name
-          %span.tip click to edit
+          %ul.tools
+            %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
+            %li!= remove_link(aspect)
 
-        %ul.tools
-          %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
-          %li!= remove_link(aspect)
+        %ul.dropzone{:id => aspect.id}
 
-      %ul.dropzone{:id => aspect.id}
+          -if aspect.people.size < 1
+            %li.grey Drag to add people
 
-        -if aspect.people.size < 1
-          %li.grey Drag to add people
+          -else
+            -for person in aspect.people
 
-        -else
-          -for person in aspect.people
+              %li.person{:id => person.id, :from_aspect_id => aspect.id}
+                = person_image_tag(person)
+                .name
+                  = link_to person.real_name, person
 
-            %li.person{:id => person.id, :from_aspect_id => aspect.id}
-              = person_image_tag(person)
-              .name
-                = link_to person.real_name, person
-
-        .fancybox_content
-          %div{:id => "add_request_pane_#{aspect.id}"}
-            = render "requests/new_request", :aspect => aspect
+          .fancybox_content
+            %div{:id => "add_request_pane_#{aspect.id}"}
+              = render "requests/new_request", :aspect => aspect
 

app/views/aspects/show.html.haml

@@ -2,16 +2,16 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :left_pane do
+.span-4.append-1.last
   = render "shared/aspect_friends"
 
-= render 'aspects/empty_messages'
+.span-15.last
+  = render 'aspects/empty_messages'
+  = render "shared/publisher"
+  %ul#stream
+    - for post in @posts
+      = render type_partial(post), :post => post unless post.class == Album
 
-= render "shared/publisher"
-%ul#stream
-  - for post in @posts
-    = render type_partial(post), :post => post unless post.class == Album
-
-#pagination
-  = will_paginate @posts
+  #pagination
+    = will_paginate @posts
 

app/views/layouts/application.html.haml

@@ -59,10 +59,7 @@
         = render "shared/aspect_nav"
 
     .container
-      .span-4.append-1.last
-        = yield :left_pane
-
-      .span-15.last
+      .span-24.last
         = yield
 
       .span-19.prepend-5.last

app/views/people/index.html.haml

@@ -2,23 +2,13 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :publish do
-  %h1
-    Search
+.span-15.prepend-5.last
+  %h2
+    search results for
+    %u= params[:q]
 
-  =form_tag '/people', :method => "get" do
-    = text_field_tag :q, params[:q]
-    = submit_tag "search"
+  %ul#stream
+    - for person in @people
+      = render 'people/person', :person => person
 
-- content_for :left_pane do
-  \.
-
-%h1
-  search results for
-  %u= params[:q]
-
-%ul#stream
-  - for person in @people
-    = render 'people/person', :person => person
-
-= will_paginate @people
+  = will_paginate @people

app/views/people/show.html.haml

@@ -5,7 +5,8 @@
 - content_for :page_title do
   profile
 
-- content_for :left_pane do
+.span-4.append-1.last
+  %h2= @person.real_name
   #profile
     .profile_photo
       = person_image_link(@person)
@@ -26,12 +27,12 @@
     - if @person != current_user.person && current_user.friends.include?(@person)
       = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button"
 
-.span-20.last
-  .span-19.last
-    - if @posts
-      %ul#stream
-        - for post in @posts
-          = render type_partial(post), :post => post unless post.class == Album
-        = will_paginate @posts
-    - else
-      %h3=t('no posts to display!')
+.span-15.last
+  - if @posts.count > 0
+    %ul#stream
+      - for post in @posts
+        = render type_partial(post), :post => post unless post.class == Album
+      = will_paginate @posts
+  - else
+    %h3=t('no posts to display!')
+

app/views/photos/show.html.haml

@@ -54,14 +54,12 @@
 
   });//end document ready
 
-= content_for :page_title do
-  = link_to "◂ #{@photo.album.name}", @photo.album
-
-- content_for :left_pane do
+.span-4.append-1.last
   = render "shared/aspect_friends"
 
-- content_for :publish do
-  %h1
+.span-19.last
+  %h3
+    = link_to @photo.album.name, @photo.album
     = @photo.image
 
   = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch'
@@ -70,39 +68,42 @@
   |
   = link_to "#{t('.next')} >>", url_to_next(@photo, @album), :rel => 'prefetch'
 
-  .right
-    -if current_user.owns? @album
-      = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
+  -if current_user.owns? @album
+    = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
+
+  %br
+  %br
+
+  %div{:id => @photo.id}
+    #show_photo
+      = linked_scaled_photo @photo, @album
+      .caption
+        -if current_user.owns? @photo
+          -if @photo.caption and @photo.caption != ""
+            = link_to 'Edit','javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
+        .description
+          = @photo.caption
 
-%div{:id => @photo.id}
-  #show_photo
-    = linked_scaled_photo @photo, @album
-    .caption
       -if current_user.owns? @photo
-        -if @photo.caption and @photo.caption != ""
-          = link_to 'Edit','javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
-      .description
-        = @photo.caption
+        %div{:class => 'clear'}
+        -if !@photo.caption or @photo.caption == ""
+          = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc"
 
-    -if current_user.owns? @photo
-      %div{:class => 'clear'}
-      -if !@photo.caption or @photo.caption == ""
-        = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc"
+      = form_for @photo do |p|
+        = p.text_field :caption, :value => @photo.caption
+        = p.submit
+        %div{:class => 'clear'}
 
-    = form_for @photo do |p|
-      = p.text_field :caption, :value => @photo.caption
-      = p.submit
-      %div{:class => 'clear'}
+    %h4{:class => "show_post_comments"}
+      = "#{t('.comments')} (#{@photo.comments.count})"
+    = render "comments/comments", :post => @photo
 
-  #content_bottom
-    .back
-      = link_to "⇧ #{@album.name}", album_path(@album)
+    #content_bottom
+      .back
+        = link_to "⇧ #{@album.name}", album_path(@album)
 
-    -if current_user.owns? @album
-      .right
-        = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button'
+      -if current_user.owns? @album
+        .right
+          = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button'
 
-  %h4{:class => "show_post_comments"}
-    = "#{t('.comments')} (#{@photo.comments.count})"
-  = render "comments/comments", :post => @photo
 

app/views/users/edit.html.haml

@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 :javascript
-  $("#settings_nav li > a").click( function() {
+  $("#settings_nav li > a").live("click", function() {
     var target = "#"+$(this).attr('class');
     if( !$(target).is(":visible") ) {
       $(".settings_pane").fadeOut(200, function() {
@@ -12,22 +12,20 @@
     }
   });
 
-
-- content_for :publish do
-  %h2="#{t('.editing_profile')}"
-
-- content_for :left_pane do
+%h2
+  Settings
   %ul#settings_nav
     %li=link_to 'Profile', '#', :class => 'profile'
     %li=link_to 'Account', '#', :class => 'account'
     %li=link_to 'Services', '#', :class => 'services'
 
-#profile.settings_pane{:style=>"display:block;"}
-  = render 'users/profile'
+.span-19.prepend-5.last
+  #profile.settings_pane{:style=>"display:block;"}
+    = render 'users/profile'
 
-#account.settings_pane
-  = render 'users/account'
+  #account.settings_pane
+    = render 'users/account'
 
-#services.settings_pane
-  = render 'users/services'
+  #services.settings_pane
+    = render 'users/services'
 

public/stylesheets/sass/application.sass

@@ -941,22 +941,20 @@ h1.big_text
       :opacity 0.9
 
 ul#settings_nav
+  :display inline
   :list
     :style none
   :padding 0
-  :marign 0
-
   :font
-    :size larger
+    :size large
+  :margin
+    :left 5.68em
 
   > li
+    :display inline
+    :margin
+      :right 1em
     a
-      :font
-        :size smaller
-      :display block
-      :height 100%
-      :border
-        :bottom 1px solid #eee
       :padding 2px
 
 
@@ -1036,3 +1034,7 @@ header
 
 .edit_photo
   :display none
+
+#section_header
+  :background
+    :color #aaa