visual tweaks on header. moved upload a file button to header on album#show

app/helpers/application_helper.rb

@@ -28,7 +28,7 @@ module ApplicationHelper
   end
 
   def how_long_ago(obj)
-    "#{time_ago_in_words(obj.created_at)} ago."
+    "#{time_ago_in_words(obj.created_at)} ago"
   end
 
   def person_url(person)

app/views/albums/show.html.haml

@@ -17,11 +17,16 @@
   = render "shared/aspect_friends"
 
 - content_for :publish do
+  -if current_user.owns? @album
+    .right
+      =render 'photos/new_photo'
+      = link_to 'Edit Album', edit_album_path(@album), :class => 'button'
   %h1
     = @album.name
   ="updated #{how_long_ago(@album)}"
 
 
+
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
 -unless current_user.owns? @album
@@ -31,13 +36,8 @@
   - for photo in @album_photos
     .image_thumb
       = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
-  -if current_user.owns? @album
-    =render 'photos/new_photo'
 
 #content_bottom
   .back
     = link_to "⇧ albums", albums_path
 
-  -if current_user.owns? @album
-    .right
-      = link_to 'Edit Album', edit_album_path(@album), :class => 'button'

app/views/status_messages/_status_message.html.haml

@@ -13,13 +13,12 @@
       = auto_link sanitize post.message
       
     .info
-      = link_to(how_long_ago(post), object_path(post))
+      %span.time= link_to(how_long_ago(post), object_path(post))
       \--
       = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
 
     = render   "comments/comments", :post => post 
 
-
   - if current_user.owns?(post)
     .destroy_link
       = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"

public/javascripts/stream.js

@@ -14,14 +14,6 @@ $(document).ready(function(){
   });
 });//end document ready
 
-$("#stream li").live('mouseover',function() {
-  $(this).children(".destroy_link").fadeIn(0);
-});
-
-$("#stream li").live('mouseout',function() {
-  $(this).children(".destroy_link").fadeOut(0);
-});
-
 $(".show_post_comments").live('click', function(event) {
   event.preventDefault();
 

public/stylesheets/application.css

@@ -118,7 +118,6 @@ header {
         header #session_action ul li:last-child {
           margin-right: 0; }
   header #aspect_header {
-    z-index: 5;
     background-color: #eeeeee;
     border-top: 1px solid white;
     padding: 20px 0; }
@@ -129,7 +128,7 @@ header {
       color: #111111; }
       header #aspect_header a:hover {
         background: none;
-        color: #333333; }
+        color: #999999; }
     header #aspect_header .page_title {
       text-transform: uppercase;
       text-shadow: 0 2px 0 white;
@@ -143,8 +142,10 @@ ul#stream {
     list-style: none;
     padding: 12px 0;
     border-bottom: 1px solid #eeeeee; }
-  ul#stream > li:first-child {
-    padding-top: 0; }
+    ul#stream > li:hover {
+      background-color: #fafafa; }
+      ul#stream > li:hover .destroy_link {
+        display: inline; }
   ul#stream .right {
     top: 0; }
 
@@ -167,6 +168,8 @@ li.message {
     li.message .content div.info {
       color: #bababa;
       font-size: 70%; }
+      li.message .content div.info .time a {
+        color: #666666; }
 
 form {
   position: relative;
@@ -262,7 +265,7 @@ ul.comment_set {
 
 .destroy_link, .request_button {
   position: absolute;
-  right: 0;
+  right: 2em;
   bottom: 15px; }
   .destroy_link a, .request_button a {
     color: #999999;
@@ -458,7 +461,7 @@ h1.big_text {
     #aspect_nav ul > li {
       padding: 0;
       display: inline;
-      margin-right: 0.5em; }
+      margin-right: 0.2em; }
       #aspect_nav ul > li a {
         line-height: 22px;
         background-color: #444444;
@@ -470,12 +473,17 @@ h1.big_text {
           background-color: #4e4e4e;
           color: #cccccc; }
       #aspect_nav ul > li.selected a {
+        z-index: 50;
+        -webkit-box-shadow: 0px -4px 6px -2px #777777;
+        -moz-box-shadow: 0px -4px 6px -2px #777777;
         text-shadow: 0 2px 0 white;
         padding-top: 4px;
         padding-bottom: 5px;
         line-height: 18px;
         font-weight: bold;
         background-color: #eeeeee;
+        background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#eeeeee));
+        background: -moz-linear-gradient(19% 75% 90deg, #eeeeee, white);
         border: 1px solid white;
           border-bottom: 1px solid #eeeeee;
         color: black; }

public/stylesheets/sass/application.sass

@@ -146,7 +146,6 @@ header
             :right 0
 
   #aspect_header
-    :z-index 5
     :background
       :color #eee
     :border
@@ -162,7 +161,7 @@ header
       :color #111
       &:hover
         :background none
-        :color #333
+        :color #999
 
     .page_title
       :text
@@ -182,9 +181,12 @@ ul#stream
     :border
       :bottom 1px solid #eee
 
-  > li:first-child
-    :padding
-      :top 0
+    &:hover
+      :background
+        :color #fafafa
+
+      .destroy_link
+        :display inline
 
   .right
     :top 0
@@ -219,6 +221,10 @@ li.message
       :color #bababa
       :font-size 70%
 
+      .time
+        a
+          :color #666
+
 
 form
   :position relative
@@ -348,7 +354,7 @@ ul.comment_set
   
 .destroy_link, .request_button
   :position absolute
-  :right 0
+  :right 2em
   :bottom 15px
   a
     :color #999
@@ -604,13 +610,14 @@ h1.big_text
       :padding 0
       :display inline
       :margin
-        :right 0.5em
+        :right 0.2em
 
       a
         :line
           :height 22px
         :background
           :color #444
+
         :border 1px solid #555
 
         :padding 3px 8px
@@ -623,6 +630,10 @@ h1.big_text
           :color #ccc
 
       &.selected a
+        :z-index 50
+        :-webkit-box-shadow 0px -4px 6px -2px #777
+        :-moz-box-shadow 0px -4px 6px -2px #777
+
         :text-shadow 0 2px 0 #fff
         :padding
           :top 4px
@@ -633,6 +644,10 @@ h1.big_text
           :weight bold
         :background
           :color #eee
+
+        :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#eee))
+        :background -moz-linear-gradient(19% 75% 90deg, #eee, #fff)
+
         :border 1px solid #fff
           :bottom 1px solid #eee
         :color #000