Merge branch 'master' of github.com:diaspora/diaspora_rails

app/helpers/dashboards_helper.rb

@@ -2,9 +2,9 @@ module DashboardsHelper
 
   def title_for_page
     if params[:action] =='ostatus'
-      'OStatus Dashboard'
+      'OStatus home'
     else
-      'Dashboard'
+      'home'
     end
   end
 end

app/views/albums/new.html.haml

+%h1.big_text
+  =link_to 'albums', albums_path
+  >>
+  new album
+
 = form_for @album do |f|
   = f.error_messages
   %p

app/views/albums/show.html.haml

-%h3= @album.name 
+%h1.big_text
+  = link_to 'albums', albums_path
+  >>
+  = @album.name 
 -unless mine? @album
   %h4= 'by ' + @album.person.real_name
 -if mine? @album
@@ -9,5 +12,3 @@
 -if mine? @album
   %p
     = link_to "Destroy", @album, :confirm => 'Are you sure?', :method => :delete
-  |
-  = link_to "View All", albums_path

app/views/dashboards/index.html.haml

+- if user_signed_in?
+  %h1#user_name
+    = link_to current_user.real_name, root_path
+    %span.description
+      = my_latest_message
 
 %h1= title_for_page
+= render "shared/publisher"
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post

app/views/layouts/application.html.haml

@@ -39,24 +39,25 @@
             = link_to "logout", destroy_user_session_path
           - else
             = link_to "login", new_user_session_path
+    .container
+      = link_to "home", root_path
+      |
+      = link_to "photos", albums_path
+      |
+      = link_to "ostatus", ostatus_path
+      %br
+      %br
 
-
-    = render "shared/publisher"
     .container
       .span-24.last
-        .span-3.append-1.last
+        .span-3.append-2.last
           = link_to person_image_tag(User.owner), root_path
           = link_to "Edit your profile", edit_user_path(current_user)
           %br
           %br
           = render 'people/sidebar' if user_signed_in?
-
-        .span-20.last
-          - if user_signed_in?
-            %h1#user_name
-              = link_to current_user.real_name, root_path
-              %span.description
-                = my_latest_message
+        .span-19.last
           = yield
 
+        .span-24.last
           = render "posts/debug"

app/views/photos/show.html.haml

@@ -10,9 +10,10 @@
     = linked_scaled_photo @photo, @album
 
   #photo_pagination
-    = link_to_prev @photo, @album
-    |
-    = link_to_next @photo, @album
+    %center
+      = link_to_prev @photo, @album
+      |
+      = link_to_next @photo, @album
 
   -if mine?(@photo)
     %p

app/views/requests/new.html.haml

-- title "New Request"
+%h1 requests
 
 = render 'form'
 

app/views/shared/_publisher.haml

 #publisher
-  .container
-    %sp
-      Post a new 
-    %ul#publisher_content_pickers
-      %li{ :class => "status_message" }= link_to "status message", "#"
-      %li{ :class => "bookmark" }= link_to "bookmark", "#"
-      %li{ :class => "blog" }= link_to "blog", "#"
-      %li= link_to "photos", albums_path
-      %li= link_to "ostatus", ostatus_path
+  %sp
+    Post a new 
+  %ul#publisher_content_pickers
+    %li{ :class => "status_message selected" }= link_to "status message", "#"
+    %li{ :class => "bookmark" }= link_to "bookmark", "#"
+    %li{ :class => "blog" }= link_to "blog", "#"
 
-    #publisher_form
-      = form_for StatusMessage.new, :remote => true do |f|
-        = f.error_messages
-        %p
-          %label{:for => "status_message_message"} Message
-          = f.text_area :message, :rows => 2
-        %p
-          = f.submit "Post"
+  #publisher_form
+    = form_for StatusMessage.new, :remote => true do |f|
+      = f.error_messages
+      %p
+        %label{:for => "status_message_message"} Message
+        = f.text_area :message, :rows => 2
+      %p
+        = f.submit "Post"
 
-      = form_for Bookmark.new, :remote => true do |f|
-        = f.error_messages
-        %p
-          %label{:for => "bookmark_title"} Title
-          = f.text_field :title
-        %p
-          %label{:for => "bookmark_link"} Link
-          = f.text_field :link
-        %p
-          = f.submit "Post"
+    = form_for Bookmark.new, :remote => true do |f|
+      = f.error_messages
+      %p
+        %label{:for => "bookmark_title"} Title
+        = f.text_field :title
+      %p
+        %label{:for => "bookmark_link"} Link
+        = f.text_field :link
+      %p
+        = f.submit "Post"
 
-      = form_for Blog.new, :remote => true do |f|
-        = f.error_messages
-        %p
-          %label{:for => "blog_title"} Title
-          = f.text_field :title
-        %p
-          %label{:for => "blog_body"} Body
-          = f.text_area :body
-        %p
-          = f.submit "Post"
+    = form_for Blog.new, :remote => true do |f|
+      = f.error_messages
+      %p
+        %label{:for => "blog_title"} Title
+        = f.text_field :title
+      %p
+        %label{:for => "blog_body"} Body
+        = f.text_area :body
+      %p
+        = f.submit "Post"

app/views/users/show.html.haml

-%h1 user page!
 .span-20.last
   %h1= "#{@user.real_name}"
 - if @user_profile

public/javascripts/publisher.js

@@ -14,9 +14,6 @@
 
         $(this).toggleClass("selected");
         $(form_id).delay(50).fadeIn(200);
-      } else {
-        $("#publisher_content_pickers").children("li").removeClass("selected");
-        $("#publisher_form form").fadeOut(200);
       }
     }
   });

public/stylesheets/application.css

@@ -64,18 +64,14 @@ a {
 header {
   position: relative;
   margin: -2em;
-    margin-bottom: 0;
-  height: 50px;
+    margin-bottom: 1em;
   color: #555555;
-  background-color: black;
-  background-color: -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(black));
-  background-color: #414545;
   background-color: #2b2726;
   border-bottom: 1px solid #444444;
-  padding-top: 20px;
-  box-shadow: 0 2px 10px black;
-  -webkit-box-shadow: 0 2px 10px black;
-  -moz-box-shadow: 0 2px 10px black; }
+  padding: 8px 0;
+  box-shadow: 0 2px 2px black;
+  -webkit-box-shadow: 0 2px 2px black;
+  -moz-box-shadow: 0 2px 2px black; }
   header #diaspora_text {
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 24px;
@@ -84,7 +80,7 @@ header {
     color: white;
     text-shadow: 0 2px 0 black; }
     header #diaspora_text a {
-      color: white; }
+      color: #666666; }
     header #diaspora_text span.sub_text {
       color: black;
       text-shadow: none; }
@@ -160,6 +156,7 @@ form {
   margin-left: 0em; }
 
 #user_name {
+  display: inline;
   margin-bottom: 1em; }
   #user_name a {
     color: black; }
@@ -201,7 +198,8 @@ img.person_picture {
   display: inline block; }
 
 li.message > img.person_picture,
-li.comment > img.person_picture {
+li.comment > img.person_picture,
+#session_action > img.person_picture {
   height: 30px;
   display: absolute;
   float: left;
@@ -269,42 +267,30 @@ label {
   left: 0.48em; }
 
 #publisher {
-  padding: 0.5em 0;
-  background-color: #f2f8fc;
-  background-color: #333333;
-  border-bottom: 1px #eaeaea solid;
-  margin: 0 -2em;
-    margin-bottom: 2em;
+  background-color: rgba(10, 81, 109, 0.05);
+  border-bottom: 2px #999999 solid;
   color: #999999;
-  box-shadow: 0 2px 20px #999999;
-  -webkit-box-shadow: 0 2px 20px #999999;
-  -moz-box-shadow: 0 2px 20px #999999; }
-  #publisher sp {
-    text-shadow: 0 2px 0 black; }
-  #publisher textarea, #publisher input {
-    box-shadow: 0 0px 3px black;
-    -webkit-box-shadow: 0 0px 3px black;
-    -moz-box-shadow: 0 0px 3px #999999; }
+  padding: 20px 1em;
+    padding-top: 10px; }
 
 #new_blog,
-#new_bookmark,
-#new_status_message {
+#new_bookmark {
   display: none; }
 
 ul#publisher_content_pickers {
   display: inline;
   margin: 0 -10px;
   padding: 0;
-  margin-left: 10px;
-  text-shadow: 0 2px 0 black; }
+  margin-left: 10px; }
 
 ul#publisher_content_pickers li {
   display: inline;
   padding: 5px 10px;
   margin-right: 5px; }
 
-#publisher.selected {
-  border-bottom: 3px solid #999999; }
+#publisher .selected {
+  border-bottom: 3px solid #999999;
+  background-color: rgba(10, 81, 109, 0.1); }
 
 #image_picker .small_photo {
   height: 100px;

public/stylesheets/sass/application.sass

@@ -68,21 +68,16 @@ a
 header
   :position relative
   :margin -2em
-    :bottom 0
-  :height 50px
+    :bottom 1em
   :color #555
   :background
-    :color #000
-    :color -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(#000000))
-    :color rgb(65,69,69)
     :color #2B2726
   :border
     :bottom 1px solid #444
-  :padding
-    :top 20px
-  :box-shadow 0 2px 10px #000
-  :-webkit-box-shadow 0 2px 10px #000
-  :-moz-box-shadow 0 2px 10px #000
+  :padding 8px 0
+  :box-shadow 0 2px 2px #000
+  :-webkit-box-shadow 0 2px 2px #000
+  :-moz-box-shadow 0 2px 2px #000
 
   #diaspora_text
     :font
@@ -94,7 +89,7 @@ header
     :text
       :shadow 0 2px 0 #000
     a
-      :color #fff
+      :color #666
 
     span.sub_text
       :color #000
@@ -187,6 +182,7 @@ form
 
   
 #user_name
+  :display inline
   :margin
     :bottom 1em
   a
@@ -239,7 +235,8 @@ img.person_picture
   :display inline block
 
 li.message > img.person_picture,
-li.comment > img.person_picture
+li.comment > img.person_picture,
+#session_action > img.person_picture
   :height 30px
   :display absolute
   :float left
@@ -317,30 +314,16 @@ label
   :left 0.48em
 
 #publisher
-  :padding 0.5em 0
   :background
-    :color #F2F8FC
-    :color #333
+    :color rgba(10,81,109,0.05)
   :border
-    :bottom 1px #eaeaea solid
-  :margin 0 -2em
-    :bottom 2em
+    :bottom 2px #999 solid
   :color #999
-  :box-shadow 0 2px 20px #999
-  :-webkit-box-shadow 0 2px 20px #999
-  :-moz-box-shadow 0 2px 20px #999
-
-  sp
-    :text-shadow 0 2px 0 #000
-
-  textarea, input
-    :box-shadow 0 0px 3px #000
-    :-webkit-box-shadow 0 0px 3px #000
-    :-moz-box-shadow 0 0px 3px #999
+  :padding 20px 1em
+    :top 10px
 
 #new_blog, 
-#new_bookmark,
-#new_status_message
+#new_bookmark
   :display none
 
 ul#publisher_content_pickers
@@ -349,7 +332,6 @@ ul#publisher_content_pickers
   :padding 0
   :margin
     :left 10px
-  :text-shadow 0 2px 0 #000
 
 ul#publisher_content_pickers li
   :display inline
@@ -357,9 +339,11 @@ ul#publisher_content_pickers li
   :margin
     :right 5px
 
-#publisher.selected
+#publisher .selected
   :border
     :bottom 3px solid #999
+  :background
+    :color rgba(10,81,109,0.1)
 
 #image_picker
   .small_photo