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

app/views/aspects/index.html.haml

@@ -4,7 +4,7 @@
 
 .span-24.last
   %h2{:style => "position:relative;"}
-    = t('_home')
+    = current_user.real_name
     .right
       %span.description
         = current_user.diaspora_handle

app/views/shared/_publisher.haml

@@ -5,6 +5,7 @@
 
 - content_for :head do
   :javascript
+    $(document).ready(function(){
       $("div.public_toggle input").live("click", function(evt){
         if($(this).attr('checked') == true){
           $(".question_mark").click(); 
@@ -20,9 +21,20 @@
         $("#publisher .options_and_submit").hide();
       });
 
-#publisher
+      $("#content_creation_button").bind("click", function(evt){
-  = owner_image_link
+        $("#publisher").find(".content_creation").show();
+        $("#publisher").find("textarea").focus();
+      });
+    });
 
+#publisher
+
+  - if aspect == :all
+    #content_creation_button
+      = image_tag 'icons/monotone_chat_talk.png', :id => 'share_bubble'
+      %h4 share across all of your aspects
+
+  .content_creation{:style=>("display:none;" if aspect == :all)}
     = form_for(StatusMessage.new, :remote => true) do |status|
       %ul#photodropzone
       = status.error_messages
@@ -31,6 +43,7 @@
 
       %p
         %params
+          - unless aspect == :all
             = status.label :message, t('.post_a_message_to', :aspect => (aspect == :all ? t('.all_contacts') : aspect))
           = status.text_area :message, :rows => 2, :value => params[:prefill]
 
@@ -62,6 +75,6 @@
               #question_mark_pane
                 = render 'shared/public_explain'
 
-#publisher_photo_upload
+    #publisher_photo_upload
       = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
 

public/stylesheets/sass/application.sass

@@ -806,14 +806,15 @@ label
 
 
 #publisher
+  :background
+    :color #eee
   :color #999
   :position relative
-  :min-height 53px
   :margin
     :bottom 10px
     :top 0
   :padding 12px
-    :top 0
+    :top 1px
   :top 0
 
   :border
@@ -830,8 +831,6 @@ label
 
   form
     :position relative
-    :margin
-      :left 65px
     :top 0
 
     ul
@@ -848,7 +847,7 @@ label
 
   input[type='text'],
   textarea
-    :width 400px
+    :width 460px
     :margin 0
 
   .options_and_submit
@@ -873,6 +872,40 @@ label
 
     #fileInfo
       :display inline
+
+  .content_creation
+    :margin
+      :top 12px
+
+  #content_creation_button
+    :padding 10px
+      :left 5px
+      :top 15px
+      :bottom 5px
+    :position relative
+    :background
+      :color #eee
+    :margin
+      :bottom -12px
+
+    &:hover
+      :cursor pointer
+
+    h4
+      :margin
+        :left 40px
+      :font
+        :weight bold
+      :text-shadow 0 1px 0 #fff
+
+    #share_bubble
+      :height 40px
+      :width 40px
+      :display inline
+      :position absolute
+      :top 5px
+
+
 #image_picker
   :margin
     :top 5px