show pages now identify content with content creator. publisher now takes a local

app/views/albums/_new_album.haml

@@ -2,14 +2,11 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-.span-12.last
-  .modal_title_bar
-    %h4= t('.add_a_new_album')
 
-  = form_for Album.new do |f|
+= form_for Album.new do |album|
-    = f.error_messages
+  = album.error_messages
-    %p
+  %p
-      = f.label :name
+    = album.label :name
-      = f.text_field :name
+    = album.hidden_field :to, :value => aspect
-      = f.hidden_field :to, :value => aspect
+    = album.text_field :name
-    = f.submit t('.create'), :class => 'button'
+  = album.submit t('.create'), :class => 'button'

app/views/albums/index.html.haml

@@ -8,22 +8,11 @@
       $("#add_album_button").fancybox();
     });
 
-%h2
+.span-4.append-1.last
-  = @aspect
+  = render "shared/aspect_friends"
-  .friend_pictures.horizontal
-    = owner_image_link
-    - for friend in @friends
-      = person_image_link(friend)
 
-.span-24.last
+.span-15.last
-  %h3
+  = render "shared/publisher", :type => :album, :aspect => @aspect.id
-    = @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]
 
   %div
     - for album in @albums

app/views/albums/show.html.haml

@@ -9,15 +9,12 @@
     });
   });
 
-%h2
-  = @aspect
-  .friend_pictures.horizontal
-    = owner_image_link
-    - for friend in @friends
-      = person_image_link(friend)
 
-%h3
+= render 'shared/author_info', :post => @album
-  = link_to "#{@aspect} Albums", albums_path(:aspect => @aspect)
+
+%ul#breadcrumb
+  %li= link_to "Photos", '#'
+  %li= @album.name
 
 
 .span-19.appends-1.last

app/views/aspects/index.html.haml

@@ -7,7 +7,7 @@
 
 .span-15.last
   = render 'aspects/no_friends_message'
-  = render 'shared/publisher'
+  = render 'shared/publisher', :type => :status_message, :aspect => @aspect
   = render 'aspects/no_posts_message'
   %ul#stream
     - for post in @posts

app/views/aspects/show.html.haml

@@ -7,7 +7,7 @@
 
 .span-15.last
   = render 'aspects/no_friends_message'
-  = render 'shared/publisher'
+  = render 'shared/publisher', :type => :status_message, :aspect => @aspect
   = render 'aspects/no_posts_message'
   %ul#stream
     - for post in @posts

app/views/photos/show.html.haml

@@ -55,15 +55,12 @@
 
     });//end document ready
 
-%h2
+= render 'shared/author_info', :post => @photo
-  = @aspect
-  .friend_pictures.horizontal
-    = owner_image_link
-    - for friend in @friends
-      = person_image_link(friend)
 
-%h3
+%ul#breadcrumb
-  = link_to @photo.album.name, @photo.album
+  %li= link_to "Photos", '#'
+  %li= link_to @album.name, album_path(@album)
+  %li= @photo.caption
 
 = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch'
 |

app/views/shared/_author_info.html.haml

@@ -0,0 +1,15 @@
+#author_info
+  = owner_image_link
+  .from
+    %h2
+      = post.person.real_name
+      .aspect
+        ➔
+        %ul
+          - if post.public?
+            the world
+          - else
+            - for aspect in current_user.aspects_with_post( post.id )
+              %li= link_to aspect.name, aspect
+
+    = link_to "view profile", person_path(post.person)

app/views/shared/_publisher.haml

@@ -9,7 +9,7 @@
     }; 
   });
   
-  $("#publisher textarea").live("focus", function(evt){
+  $("#publisher textarea, #publisher input").live("focus", function(evt){
     $("#publisher .options_and_submit").fadeIn(50);
   });
 
@@ -20,28 +20,41 @@
 #publisher
   = owner_image_tag
 
-  = form_for StatusMessage.new, :remote => true do |status|
+  - if( !defined?(type) || type == :status_message )
-    = status.error_messages
+    = form_for StatusMessage.new, :remote => true do |status|
-    %p
+      = status.error_messages
-      = status.label :message, "Post a message to #{@aspect}"
+      %p
-      = status.text_area :message, :rows => 2, :value => params[:prefill]
+        = status.label :message, "Post a message to #{aspect}"
+        = status.text_area :message, :rows => 2, :value => params[:prefill]
 
-    = status.hidden_field :to, :value => (@aspect == :all ? @aspect : @aspect.id)
+      = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
 
-    .options_and_submit
+      .options_and_submit
     
-      - if @aspect == :all
+        - if aspect == :all
-        .public_toggle
+          .public_toggle
-          = status.check_box( :public, :value => false )
+            = status.check_box( :public, :value => false )
-          make public
+            make public
-          = link_to '(?)', "#question_mark_pane", :class => 'question_mark'
+            = link_to '(?)', "#question_mark_pane", :class => 'question_mark'
 
-          .fancybox_content
+            .fancybox_content
-            #question_mark_pane
+              #question_mark_pane
-              = render 'shared/public_explain'
+                = render 'shared/public_explain'
 
-      - if @aspect == :all
+        - if aspect == :all
-        = status.submit t('.share'), :title => "Share with all aspects"
+          = status.submit t('.share'), :title => "Share with all aspects"
-      - else
+        - else
-        = status.submit t('.share'), :title => "Share with #{@aspect}"
+          = status.submit t('.share'), :title => "Share with #{aspect}"
+
+  - else
+    = form_for Album.new do |album|
+      = album.error_messages
+      %p
+        = album.label :name
+        = album.text_field :name
+
+      = album.hidden_field :to, :value => aspect
+
+      .options_and_submit
+        = album.submit "Create", :class => 'button'
 

app/views/status_messages/show.html.haml

@@ -3,17 +3,11 @@
 -#   the COPYRIGHT file.
 
 
-%h2
+= render 'shared/author_info', :post => @status_message
-  = @aspect
-  .friend_pictures.horizontal
-    - for friend in @friends
-      = person_image_link(friend)
 
 .span-14.append-1.last
   #stream
     %h1.show_text
-      = person_image_link(@status_message.person)
-      = link_to @status_message.person.real_name, @status_message.person
       = make_links(@status_message.message)
 
   = "Posted #{how_long_ago(@status_message)} to"

public/stylesheets/sass/application.sass

@@ -202,6 +202,71 @@ header
   .avatar
     :border-radius 5px
 
+
+.from
+  :font
+    :family 'Helvetica neue', Arial, Helvetica, sans-serif
+  :text
+    :shadow 0 1px #fff
+
+  .aspect
+    :cursor default
+    :display inline
+    :color #bbb
+    :font
+      :size 85%
+    a
+      :font
+        :weight normal
+      :color #bbb
+
+      &:hover
+        :text
+          :decoration underline
+      &:active
+        :color #999
+    ul
+      :display inline
+      :margin 0
+      :padding 0
+      :list
+        :style none
+      li
+        :display inline
+        &:after
+          :content ","
+        &:last-child:after
+          :content ""
+
+  a
+    :font
+      :weight bold
+
+#author_info
+  :position relative
+  :padding
+    :left 65px
+  :height 70px
+
+  img
+    :position absolute
+    :top 8px
+    :left 0
+
+  h2
+    :margin
+      :bottom -2px
+  a
+    :font
+      :weight normal
+
+  .from
+    :font
+      :size 14px
+
+  .avatar
+    :border-radius 5px
+
 li.message
   :position relative
   :line-height 19px
@@ -220,44 +285,6 @@ li.message
     :padding
       :left 65px
 
-    .from
-      :font
-        :family 'Helvetica neue', Arial, Helvetica, sans-serif
-      :text
-        :shadow 0 1px #fff
-
-      .aspect
-        :cursor default
-        :display inline
-        :color #bbb
-        :font
-          :size 12px
-        a
-          :font
-            :weight normal
-          :color #bbb
-
-          &:hover
-            :text
-              :decoration underline
-          &:active
-            :color #999
-        ul
-          :display inline
-          :margin 0
-          :padding 0
-          :list
-            :style none
-          li
-            :display inline
-            &:after
-              :content ","
-            &:last-child:after
-              :content ""
-
-      a
-        :font
-          :weight bold
 
     :color #444
     :font
@@ -639,8 +666,11 @@ label
     :position relative
 
   textarea
-    :width 515px
     :height 42px
+
+  input[type='text'],
+  textarea
+    :width 515px
     :margin 0
 
   .options_and_submit
@@ -1136,3 +1166,27 @@ header
     .controls
       :display inline
 
+ul#breadcrumb
+  :list
+    :style none
+  :margin 0
+  :padding 0
+  :font
+    :size 14px
+    :weight bold
+  :line
+    :height 3em
+
+  a
+    :font
+      :weight bold
+
+  > li
+    :display inline
+
+    &:after
+      :content ' ››'
+
+    &:last-child
+      &:after
+        :content ''