Merge pull request #6535 from Flaburgan/stream-modification

Design of stream pages

.gitignore

@@ -42,7 +42,7 @@ public/500.html
 app/assets/images/branding-*.png
 app/assets/images/branding/logos-*.png
 app/assets/images/icons-*.png
-app/assets/images/social_media_logos-*.png
+app/assets/images/social-media-logos-*.png
 
 # Documentation
 .yardoc/

Changelog.md

@@ -94,6 +94,7 @@ Contributions are very welcome, the hard work is done!
 * Optimized the pod up checks [#6727](https://github.com/diaspora/diaspora/pull/6727)
 * Prune and do not create aspect visibilities for public posts [#6732](https://github.com/diaspora/diaspora/pull/6732)
 * Optimized mobile login and registration forms [#6764](https://github.com/diaspora/diaspora/pull/6764)
+* Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/assets/javascripts/app/app.js

@@ -104,9 +104,9 @@ var app = {
       evt.preventDefault();
       var link = $(this);
       if(link.data("stream-title") && link.data("stream-title").length) {
-        $(".stream_title").text(link.data("stream-title"));
+        $(".stream-title").text(link.data("stream-title"));
       } else {
-        $(".stream_title").text(link.text());
+        $(".stream-title").text(link.text());
       }
 
       $("html, body").animate({scrollTop: 0});

app/assets/javascripts/app/views/aspects_list_view.js

@@ -59,7 +59,7 @@ app.views.AspectsList = app.views.Base.extend({
   },
 
   updateStreamTitle: function() {
-    $('.stream_title').text(this.collection.toSentence());
+    $(".stream-title").text(this.collection.toSentence());
   },
 
   updateAspectList: function() {

app/assets/javascripts/app/views/publisher/getting_started_view.js

@@ -20,15 +20,13 @@ app.views.PublisherGettingStarted = Backbone.View.extend({
   show: function() {
     this._addPopover(this.firstMessage, {
       trigger: "manual",
-      offset: 30,
       id: "first_message_explain",
-      placement: "right",
+      placement: "left",
       html: true,
       container: "body"
     }, 600);
     this._addPopover(this.visibility, {
       trigger: "manual",
-      offset: 10,
       id: "message_visibility_explain",
       placement: "bottom",
       html: true,
@@ -36,7 +34,6 @@ app.views.PublisherGettingStarted = Backbone.View.extend({
     }, 1000);
     this._addPopover(this.stream, {
       trigger: "manual",
-      offset: -5,
       id: "stream_explain",
       placement: "left",
       html: true,
@@ -77,4 +74,3 @@ app.views.PublisherGettingStarted = Backbone.View.extend({
   }
 });
 // @license-end
-

app/assets/javascripts/app/views/publisher_view.js

@@ -121,7 +121,7 @@ app.views.Publisher = Backbone.View.extend({
     this.viewGettingStarted = new app.views.PublisherGettingStarted({
       firstMessageEl:  this.inputEl,
       visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),
-      streamEl:     $("#gs-shim")
+      streamEl:     $("#main_stream")
     });
 
     this.viewUploader = new app.views.PublisherUploader({

app/assets/javascripts/app/views/sidebar.js

 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
 app.views.Sidebar = app.views.Base.extend({
-  el: ".rightbar",
+  el: ".info-bar",
 
   events: {
-    "click input#invite_code": "selectInputText"
+    "click input#invite_code": "selectInputText",
+    "click .section .title": "toggleSection"
   },
 
   selectInputText: function(event) {
     event.target.select();
+  },
+
+  toggleSection: function(e) {
+    $(e.target).closest(".section").toggleClass("collapsed");
   }
 });
 // @license-end
-