moved photos link to the side bar for now

app/views/albums/index.html.haml

@@ -8,9 +8,6 @@
       $("#add_album_button").fancybox();
     });
 
-= content_for :page_title do
-  = link_to "◂ #{t('.home')}", aspects_path, :aspect => params[:aspect]
-
 - content_for :left_pane do
   = render "shared/aspect_friends"
 
@@ -31,6 +28,3 @@
 #pagination
   = will_paginate @albums
 
-#content_bottom
-  .back
-    = link_to "⇧ #{t('.home')}", root_path

app/views/aspects/index.html.haml

@@ -2,9 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :page_title do
-  = link_to t('.photos'), albums_path(:aspect => @aspect)
-
 - content_for :left_pane do
   = render "shared/aspect_friends"
 

app/views/aspects/show.html.haml

@@ -2,9 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :page_title do
-  = link_to t('.photos'), albums_path(:aspect => @aspect)
-
 - content_for :left_pane do
   = render "shared/aspect_friends"
 

app/views/shared/_aspect_friends.haml

@@ -2,30 +2,41 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#friend_pictures
-  = owner_image_link
-  - for friend in @friends
-    = person_image_link(friend)
-  - if @logged_in && (@aspect == :public)
-    %h3 Facebook Friends
-    - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
-    - @fb_friends[:data].each do |friend|
-      = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
-  -unless (@aspect == :all) || (@aspect == :public)
-    = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
 
-    .yo{:style => 'display:none'}
+#left_pane
-      #add_request_pane
+  #friend_pictures
-        = render "requests/new_request", :aspect => @aspect
+    = owner_image_link
-  -else
+    - for friend in @friends
-    .clear
+      = person_image_link(friend)
-      %br
+    - if @logged_in && (@aspect == :public)
-      = link_to t('.add_friends'), aspects_manage_path
+      %h3 Facebook Friends
+      - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
+      - @fb_friends[:data].each do |friend|
+        = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
+    -unless (@aspect == :all) || (@aspect == :public)
+      = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
+
+      .yo{:style => 'display:none'}
+        #add_request_pane
+          = render "requests/new_request", :aspect => @aspect
+    -else
+      .clear
+        %br
+        = link_to t('.add_friends'), aspects_manage_path
+
+  %br
+  %br
+  %ul
+    %li= link_to 'stream', aspect_path(@aspect)
+    %li= link_to t('.photos'), albums_path(:aspect => @aspect)
+
+  %br
+
+  %h4 Invites
+  = link_to "Invite a friend!", "#invite_user_pane", :id => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
+  %br
+  = "You have #{@invites} invites."
+  .yo{ :style => "display:none;"}
+    #invite_user_pane
+      = render "invitations/new"
 
-%br
-= link_to "Invite a friend!", "#invite_user_pane", :id => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
-%br
-= "You have #{@invites} invites."
-.yo{ :style => "display:none;"}
-  #invite_user_pane
-    = render "invitations/new"

config/locales/diaspora/en.yml

@@ -38,6 +38,7 @@ en:
           share: "Share"
       aspect_friends:
           add_friends: "add friends"
+          photos: "photos"
   albums:
       album:
           you: "you"
@@ -69,10 +70,6 @@ en:
           friends_albums: "Friends Albums"
           your_albums: "Your Albums"
   aspects:
-      index:
-          photos: "photos"
-      show:
-          photos: "photos"
       manage:
           add_a_new_aspect: "Add a new aspect"
           add_a_new_friend:  "Add a new friend"

public/stylesheets/application.css

@@ -90,7 +90,7 @@ header {
     padding-top: 5px;
   border-bottom: 1px solid #cccccc; }
   header a {
-    color: #999999; }
+    color: #cccccc; }
     header a:hover {
       background: none;
       color: #eeeeee; }
@@ -564,10 +564,10 @@ h1.big_text {
         line-height: 22px;
         padding: 3px 8px;
           padding-bottom: 3px;
-        color: #999999; }
+        color: #cccccc; }
         #aspect_nav ul > li a:hover {
           background-color: #4e4e4e;
-          color: #cccccc; }
+          color: #eeeeee; }
       #aspect_nav ul > li.selected a {
         -webkit-border-radius: 5px 5px 0 0;
         -moz-border-radius: 5px 5px 0 0;
@@ -742,3 +742,14 @@ ul#settings_nav {
 #aspect_list {
   margin: 0;
   padding: 0; }
+
+#left_pane ul {
+  margin: 0;
+  padding: 0;
+  list-style: none; }
+  #left_pane ul li a {
+    display: block;
+    padding: 3px;
+    border-bottom: 1px solid #cccccc; }
+    #left_pane ul li a:hover:after {
+      content: "        ►"; }

public/stylesheets/sass/application.sass

@@ -964,3 +964,19 @@ ul#settings_nav
 #aspect_list
   :margin 0
   :padding 0
+
+#left_pane
+  ul
+    :margin 0
+    :padding 0
+    :list
+      :style none
+    li a
+      :display block
+      :padding 3px
+      :border
+        :bottom 1px solid #ccc
+
+      &:hover
+        &:after
+          :content "        ►"