diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index be12ea3db..159f92300 100644
--- a/app/views/aspects/index.html.haml
+++ b/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
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 7551a55c6..2fe28aa78 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -5,63 +5,76 @@
- content_for :head do
:javascript
- $("div.public_toggle input").live("click", function(evt){
- if($(this).attr('checked') == true){
- $(".question_mark").click();
- };
- });
-
- $("#publisher textarea, #publisher input").live("focus", function(evt){
- $("#publisher .options_and_submit").fadeIn(50);
- });
+ $(document).ready(function(){
+ $("div.public_toggle input").live("click", function(evt){
+ if($(this).attr('checked') == true){
+ $(".question_mark").click();
+ };
+ });
+
+ $("#publisher textarea, #publisher input").live("focus", function(evt){
+ $("#publisher .options_and_submit").fadeIn(50);
+ });
- $("#publisher form").live("submit", function(evt){
- $("#photodropzone").find('li').remove();
- $("#publisher .options_and_submit").hide();
+ $("#publisher form").live("submit", function(evt){
+ $("#photodropzone").find('li').remove();
+ $("#publisher .options_and_submit").hide();
+ });
+
+ $("#content_creation_button").bind("click", function(evt){
+ $("#publisher").find(".content_creation").show();
+ $("#publisher").find("textarea").focus();
+ });
});
#publisher
- = owner_image_link
- = form_for(StatusMessage.new, :remote => true) do |status|
- %ul#photodropzone
- = status.error_messages
- #file-upload.button
- = t('.add_photos')
+ - if aspect == :all
+ #content_creation_button
+ = image_tag 'icons/monotone_chat_talk.png', :id => 'share_bubble'
+ %h4 share across all of your aspects
- %p
- %params
- = status.label :message, t('.post_a_message_to', :aspect => (aspect == :all ? t('.all_contacts') : aspect))
- = status.text_area :message, :rows => 2, :value => params[:prefill]
+ .content_creation{:style=>("display:none;" if aspect == :all)}
+ = form_for(StatusMessage.new, :remote => true) do |status|
+ %ul#photodropzone
+ = status.error_messages
+ #file-upload.button
+ = t('.add_photos')
- = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
+ %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]
- .options_and_submit
+ = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
+
+ .options_and_submit
+
+ .right
+ #fileInfo
+ = image_tag 'ajax-loader.gif', :class => 'hidden', :id => "publisher_spinner"
+ - if aspect == :all
+ = status.submit t('.share'), :title => t('.share_with_all'), :disable_with => t('.posting')
+ - else
+ = status.submit t('.share'), :title => t('.share_with', :aspect => aspect), :disable_with => t('.posting')
- .right
- #fileInfo
- = image_tag 'ajax-loader.gif', :class => 'hidden', :id => "publisher_spinner"
- if aspect == :all
- = status.submit t('.share'), :title => t('.share_with_all'), :disable_with => t('.posting')
- - else
- = status.submit t('.share'), :title => t('.share_with', :aspect => aspect), :disable_with => t('.posting')
+ .public_toggle
+ %p.checkbox_select
+ = status.check_box( :public, {}, true, false )
+ = status.label :public, "make public"
+ = link_to (image_tag "social_media_logos/feed-16x16.png", :title => "RSS"), current_user.public_url
+ - if current_user.services
+ - for service in current_user.services
+ = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider
- - if aspect == :all
- .public_toggle
- %p.checkbox_select
- = status.check_box( :public, {}, true, false )
- = status.label :public, "make public"
- = link_to (image_tag "social_media_logos/feed-16x16.png", :title => "RSS"), current_user.public_url
- - if current_user.services
- - for service in current_user.services
- = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider
+ = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"
- = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"
+ .fancybox_content
+ #question_mark_pane
+ = render 'shared/public_explain'
- .fancybox_content
- #question_mark_pane
- = render 'shared/public_explain'
-
-#publisher_photo_upload
- = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
+ #publisher_photo_upload
+ = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
diff --git a/public/images/icons/monotone_chat_talk.png b/public/images/icons/monotone_chat_talk.png
new file mode 100644
index 000000000..3fd86d27d
Binary files /dev/null and b/public/images/icons/monotone_chat_talk.png differ
diff --git a/public/images/icons/monotone_pen_write.png b/public/images/icons/monotone_pen_write.png
new file mode 100644
index 000000000..c7f7756fe
Binary files /dev/null and b/public/images/icons/monotone_pen_write.png differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 09152a66d..7100f57ad 100644
--- a/public/stylesheets/sass/application.sass
+++ b/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