move service icons to right on publisher. swap out RSS for world icon

app/views/shared/_publisher.html.haml

@@ -35,7 +35,7 @@
         = hidden_field_tag 'aspect_ids[]', aspect_id.to_s
 
       .options_and_submit
-        %div.mention_helper
+        .mention_helper
           - if aspect != :profile
             %i= t('.mention_helper_text')
           - else
@@ -43,20 +43,16 @@
               %i= t('.publishing_to')
               = aspect_badges(aspects_with_person, :link => false)
 
-
-        .right
-          = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button'
-
         .public_toggle
           %span#publisher_service_icons
+            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')#, :style=>"display:none;"
             - if aspect == :all || :profile
               = status.hidden_field( :public)
-              = image_tag "social_media_logos/feed-16x16.png", :title => "RSS", :class => 'public_icon dim'
+              = image_tag "icons/globe.png", :title => "Public", :class => 'public_icon dim', :width => 16, :height => 16
             - if current_user.services
               - for service in current_user.services
                 = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider, :class => "service_icon dim", :id =>"#{service.provider}"
-            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')#, :style=>"display:none;"
-
+          = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button'
 
           .facebox_content
             #question_mark_pane

public/stylesheets/sass/application.sass

@@ -904,14 +904,18 @@ label
     input
       :display inline
 
-    .right
-      :top 2px
-
     .public_toggle
-      :font
-        :size smaller
-        :style italic
-      :display inline
+      :text
+        :align right
+
+    #publisher_service_icons
+      :position relative
+      :top 3px
+      :margin
+        :right 10px
+
+    .mention_helper
+      :float left
 
     #fileInfo
       :display inline