various. fixed publisher in new layout.

app/views/albums/index.html.haml

@@ -11,11 +11,8 @@
 - content_for :left_pane do
   = render "shared/aspect_friends"
 
-- content_for :publish do
+%h3 Albums
-  %h1
+= link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
-    Albums
-  .right
-    = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"}
 
 .fancybox_content
   #new_album_pane

app/views/albums/show.html.haml

@@ -15,14 +15,12 @@
 - content_for :left_pane do
   = render "shared/aspect_friends"
 
-- content_for :publish do
+%h3
-  -if current_user.owns? @album
+  = @album.name
-    .right
+="#{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'
-  %h1
-    = @album.name
-  ="#{t('.updated')} #{how_long_ago(@album)}"
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
 

app/views/comments/_comment.html.haml

@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 %li.comment{:id => post.id}
-  = person_image_tag(post.person)
+  = person_image_link(post.person)
   .content
     .from
       = link_to post.person.real_name, post.person

app/views/shared/_publisher.haml

@@ -9,6 +9,14 @@
     }; 
   });
   
+  $("#publisher textarea").live("focus", function(evt){
+    $("#publisher .options_and_submit").fadeIn(50);
+  });
+
+  $("#publisher form").live("submit", function(evt){
+    $("#publisher .options_and_submit").hide();
+  });
+
 #publisher
   = owner_image_tag
 
@@ -20,6 +28,8 @@
 
     = status.hidden_field :to, :value => (@aspect == :all ? @aspect : @aspect.id)
 
+    .options_and_submit
+  
       - if @aspect == :all
         .public_toggle
           = status.check_box( :public, :value => false )

public/javascripts/view.js

@@ -64,8 +64,8 @@ $.fn.clearForm = function() {
     return $(':input',this).clearForm();
   if (type == 'text' || type == 'password' || tag == 'textarea')
     this.value = '';
-  //else if (type == 'checkbox' || type == 'radio')
+  else if (type == 'checkbox' || type == 'radio')
-    //this.checked = false;
+    this.checked = false;
   else if (tag == 'select')
     this.selectedIndex = -1;
   $(this).blur();

public/stylesheets/sass/application.sass

@@ -586,7 +586,8 @@ label
 #publisher
   :color #999
   :position relative
-  :height 65px
+  :min-height 65px
+  :max-height 90px
   :width 100%
   :margin
     :bottom 10px
@@ -600,6 +601,8 @@ label
     :margin
       :right 15px
     :border-radius 5px
+    :-webkit-border-radius 5px
+    :-moz-border-radius 5px
 
   p
     :position absolute
@@ -608,26 +611,34 @@ label
 
   form
     :display inline
-
+    :position relative
-    input[type='submit']
-      :float right
-      :margin
-        :right 20px
 
   textarea
     :width 515px
     :height 42px
     :margin 0
 
+  .options_and_submit
+    :display none
+    :padding
+      :top 63px
+      :bottom 5px
+    input[type='submit']
+      :float right
+      :margin
+        :top -4px
+      :width 75px
+
     .public_toggle
       :position absolute
-    :top 53px
+      :bottom 8px
-    :left 460px
       :width 300px
       :font
         :size smaller
         :style italic
-
+      :display inline
+      :margin
+        :left 62px
 
 #image_picker
   .small_photo
@@ -775,25 +786,25 @@ h1.big_text
     > li
       :padding 0
       :display inline
-      :margin
+      :margin 0
-        :right 2px
 
       a
+        :-webkit-border-radius 5px 5px 0 0 
+        :-moz-border-radius 5px 5px 0 0 
+
         :text-shadow 0 1px 0 #444
         :line
           :height 22px
 
-        :padding 3px 8px
+        :padding 3px 10px
-          :bottom 3px
         :color #CCC
 
         &:hover
+          :background
+            :color #000
           :color #eee
 
       &.selected a
-        :-webkit-border-radius 5px 5px 0 0 
-        :-moz-border-radius 5px 5px 0 0 
-
         :text-shadow 0 1px 0 #eee
         :padding
           :top 4px