collapse the sidebars to the side of the screen even on big screens

Drop right side bar, move content to left side bar

Move user avatar and name from the left nav bar to the left of the publisher

4 files changed, 123 insertions, 113 deletions

diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 69999e701..f26a2dd17 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -3,10 +3,14 @@
 -#   the COPYRIGHT file.
 
 - if user_signed_in? && @person != current_user.person
-  %h3#aspect_stream_header.stream_title
+  %h3.stream-title
     = stream.title
 
-= render 'publisher/publisher', publisher_aspects_for(stream)
+.container-fluid.main-stream-publisher
+  .pull-left
+    = owner_image_link
+  = render "publisher/publisher", publisher_aspects_for(stream)
+= render "aspects/no_posts_message"
 
 #gs-shim{:title => popover_with_close_html("3. #{t('.stay_updated')}"), 'data-content' => t('.stay_updated_explanation')}
 
diff --git a/app/views/publisher/_publisher.mobile.haml b/app/views/publisher/_publisher.mobile.haml
index 8040a152d..4399b7c13 100644
--- a/app/views/publisher/_publisher.mobile.haml
+++ b/app/views/publisher/_publisher.mobile.haml
@@ -11,7 +11,9 @@
     %span#publisher-service-icons
       - if current_user.services
         - for service in current_user.services
-          = image_tag "social_media_logos/#{service.provider}-32x32.png", title: service.provider.titleize, class: "service_icon dim", id:"#{service.provider}", maxchar: "#{service.class::MAX_CHARACTERS}"
+          = image_tag "social-media-logos/#{service.provider}-32x32.png",
+            title: service.provider.titleize, class: "service_icon dim",
+            id: "#{service.provider}", maxchar: "#{service.class::MAX_CHARACTERS}"
 
     %select{id: "aspect_ids_", class: "form-control", name: "aspect_ids[]"}
       %option{value: 'public'}
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
deleted file mode 100644
index e8fd5b013..000000000
--- a/app/views/shared/_right_sections.html.haml
+++ /dev/null
@@ -1,94 +0,0 @@
--#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-.right-sidebar-padder
-
-  - if AppConfig.settings.invitations.open?
-    .section
-      .title
-        %h5.title-header
-          = t('shared.invitations.invite_your_friends')
-      .content
-        = render "shared/invitations"
-
-  .section
-    .title
-      %h5.title-header
-        = t('aspects.index.new_here.title')
-    .content
-      != t('aspects.index.new_here.follow', link: link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(name: t('shared.publisher.new_user_prefill.newhere'))))
-      %br
-      = link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
-
-  .section
-    .title
-      %h5.title-header
-        = t('aspects.index.help.need_help')
-    .content
-      %p
-        = t('aspects.index.help.here_to_help')
-      %p
-        = t('aspects.index.help.do_you')
-      %ul
-        %li
-          != t('aspects.index.help.have_a_question', :link => link_to("#"+t('aspects.index.help.tag_question'), tag_path(:name => t('aspects.index.help.tag_question'))))
-        %li
-          != t('aspects.index.help.find_a_bug', :link => link_to("#"+t('aspects.index.help.tag_bug'), tag_path(:name => t('aspects.index.help.tag_bug'))))
-        %li
-          != t('aspects.index.help.feature_suggestion', :link => link_to("#"+t('aspects.index.help.tag_feature'), tag_path(:name => t('aspects.index.help.tag_feature'))))
-      %p
-        != t('aspects.index.help.tutorials_and_wiki',
-             :faq => link_to(t('_help'), help_path),
-             :tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/tutorials", :target => '_blank'),
-             :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
-
-  - unless AppConfig.configured_services.blank? || all_services_connected?
-    .section
-      .title
-        %h5.title-header
-          = t('aspects.index.services.heading')
-      .content
-        %div
-          = t('aspects.index.services.content')
-
-        #right_service_icons
-          - AppConfig.configured_services.each do |service|
-            - if AppConfig.show_service?(service, current_user)
-              - unless current_user.services.any?{|x| x.provider == service}
-                = link_to(content_tag(:div, nil, :class => "social_media_logos-#{service.to_s.downcase}-24x24", :title => service.to_s.titleize), "/auth/#{service}")
-
-  .section
-    .title
-      %h5.title-header
-        = t('bookmarklet.heading')
-    .content
-      != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
-
-  - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
-    .section
-      .title
-        %h5.title-header
-          = t('aspects.index.donate')
-      .content
-        %p
-          = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
-        = render 'shared/donatepod'
-
-  - if AppConfig.admins.podmin_email.present?
-    .section
-      .title
-        %h5.title-header
-          = t('aspects.index.help.any_problem')
-      .content
-        %p
-          = t('aspects.index.help.contact_podmin')
-        %p
-          = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
-
-  .section
-    .title
-    .content
-      %ul
-        = render "shared/links"
-
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index cb3bb5d5f..539600275 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -20,16 +20,10 @@
           .pull-right
             = link_to '×'.html_safe, getting_started_completed_path, id: "gs-skip-x", class: "close"
 
-%div.container-fluid
+.container-fluid
   .row
-    .left-navbar-fixed-sub-background.col-lg-1.visible-lg
-    .left-navbar-fixed-background.col-lg-offset-1.col-lg-2.col-md-3.hidden-sm.hidden-xs
-    .left-navbar.col-lg-offset-1.col-lg-2.col-md-3
-      #home_user_badge
-        = owner_image_link
-        %h4
-          = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
-
+    .left-navbar-fixed-background.col-lg-2.col-sm-3.hidden-sm.hidden-xs
+    .left-navbar.col-lg-2.col-sm-3
       %ul#stream_selection
         %li{data: {stream: "stream"}}
           = link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
@@ -44,14 +38,118 @@
         %li{data: {stream: "public"}}
           = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
 
-    .col-md-6
-      #aspect_stream_container.stream_container
-        = render 'aspects/aspect_stream', stream: @stream
+      .info-bar.hidden-xs
+        .section#selected_aspect_contacts
+          .title
+            %h5.stream-title
+              = @stream.title
+          .content
+
+        - if AppConfig.settings.invitations.open?
+          .section
+            .title
+              %h5.title-header
+                = t("shared.invitations.invite_your_friends")
+            .content
+              = render "shared/invitations"
+
+        .section
+          .title
+            %h5.title-header
+              = t("aspects.index.new_here.title")
+          .content
+            != t("aspects.index.new_here.follow",
+              link: link_to("#" + t("shared.publisher.new_user_prefill.newhere"),
+              tag_path(name: t("shared.publisher.new_user_prefill.newhere"))))
+            %br
+            = link_to(t("aspects.index.new_here.learn_more"),
+              "http://wiki.diasporafoundation.org/Welcoming_Committee")
+
+        .section
+          .title
+            %h5.title-header
+              = t("aspects.index.help.need_help")
+          .content
+            %p
+              = t("aspects.index.help.here_to_help")
+            %p
+              = t("aspects.index.help.do_you")
+            %ul
+              %li
+                != t("aspects.index.help.have_a_question",
+                  link: link_to("#" + t("aspects.index.help.tag_question"),
+                  tag_path(name: t("aspects.index.help.tag_question"))))
+              %li
+                != t("aspects.index.help.find_a_bug",
+                  link: link_to("#" + t("aspects.index.help.tag_bug"),
+                  tag_path(name: t("aspects.index.help.tag_bug"))))
+              %li
+                != t("aspects.index.help.feature_suggestion",
+                  link: link_to("#" + t("aspects.index.help.tag_feature"),
+                  tag_path(name: t("aspects.index.help.tag_feature"))))
+            %p
+              != t("aspects.index.help.tutorials_and_wiki",
+                faq: link_to(t("_help"), help_path),
+                tutorial: link_to(t("aspects.index.help.tutorial_link_text"),
+                  "https://diasporafoundation.org/tutorials", target: "_blank"),
+                wiki: link_to("Wiki", "http://wiki.diasporafoundation.org",
+                  target: "_blank"),
+                target: "_blank")
+
+        - unless AppConfig.configured_services.blank? || all_services_connected?
+          .section
+            .title
+              %h5.title-header
+                = t("aspects.index.services.heading")
+            .content
+              %div
+                = t("aspects.index.services.content")
+
+              .right-service-icons
+                - AppConfig.configured_services.each do |service|
+                  - if AppConfig.show_service?(service, current_user)
+                    - unless current_user.services.any? {|x| x.provider == service }
+                      = link_to(content_tag(:div, nil,
+                        class: "social-media-logos-#{service.to_s.downcase}-24x24",
+                        title: service.to_s.titleize), "/auth/#{service}")
+
+        .section
+          .title
+            %h5.title-header
+              = t("bookmarklet.heading")
+          .content
+            != t("bookmarklet.explanation", link: link_to(t("bookmarklet.post_something"), bookmarklet_code))
+
+        - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
+          .section
+            .title
+              %h5.title-header
+                = t("aspects.index.donate")
+            .content
+              %p
+                = t("aspects.index.keep_pod_running", pod: AppConfig.pod_uri.host)
+              = render "shared/donatepod"
+
+        - if AppConfig.admins.podmin_email.present?
+          .section
+            .title
+              %h5.title-header
+                = t("aspects.index.help.any_problem")
+            .content
+              %p
+                = t("aspects.index.help.contact_podmin")
+              %p
+                = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
+
+        .section
+          .title
+          .content
+            %ul
+              = render "shared/links"
 
-    .right-sidebar-fixed-sub-background.col-lg-3.visible-lg
-    .right-sidebar-fixed-background.col-md-3.col-lg-2.hidden-sm.hidden-xs
-    .col-md-3.col-lg-2.hidden-xs.hidden-sm.rightbar
-      = render 'shared/right_sections'
+    .col-lg-10.col-sm-9
+      .stream_container#aspect_stream_container
+        = render "aspects/aspect_stream", stream: @stream
 
       %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         ⇧