diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 25441a651..1046bd66a 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -108,12 +108,6 @@ var app = { evt.preventDefault(); var link = $(this); - if(link.data("stream-title") && link.data("stream-title").length) { - $(".stream-title").text(link.data("stream-title")); - } else { - $(".stream-title").text(link.text()); - } - $("html, body").animate({scrollTop: 0}); // app.router.navigate doesn't tell us if it changed the page, diff --git a/app/assets/javascripts/app/views/aspects_list_view.js b/app/assets/javascripts/app/views/aspects_list_view.js index 0138c20c1..488863d88 100644 --- a/app/assets/javascripts/app/views/aspects_list_view.js +++ b/app/assets/javascripts/app/views/aspects_list_view.js @@ -15,7 +15,6 @@ app.views.AspectsList = app.views.Base.extend({ initialize: function() { this.collection.on("change", this.toggleSelector, this); - this.collection.on("change", this.updateStreamTitle, this); this.collection.on("aspectStreamFetched", this.updateAspectList, this); app.events.on("aspect:create", function(id) { window.location = "/contacts?a_id=" + id }); }, @@ -26,7 +25,6 @@ app.views.AspectsList = app.views.Base.extend({ postRenderTemplate: function() { this.collection.each(this.appendAspect, this); - this.updateStreamTitle(); this.toggleSelector(); }, @@ -58,10 +56,6 @@ app.views.AspectsList = app.views.Base.extend({ } }, - updateStreamTitle: function() { - $(".stream-title").text(this.collection.toSentence()); - }, - updateAspectList: function() { this.collection.each(function(aspect) { var element = this.$("li[data-aspect_id="+aspect.get("id")+"]"); diff --git a/app/assets/stylesheets/stream.scss b/app/assets/stylesheets/stream.scss index 622e4272b..56bc4d5a6 100644 --- a/app/assets/stylesheets/stream.scss +++ b/app/assets/stylesheets/stream.scss @@ -5,6 +5,7 @@ } .main-stream-publisher { + margin-top: 20px; padding: 0; .avatar { diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml index 7aa104d13..62c4a4811 100644 --- a/app/views/aspects/_aspect_stream.haml +++ b/app/views/aspects/_aspect_stream.haml @@ -2,10 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -- if user_signed_in? && @person != current_user.person - %h3.stream-title - = stream.title - .container-fluid.main-stream-publisher .pull-left.hidden-xs = owner_image_link diff --git a/features/desktop/keyboard_navigation.feature b/features/desktop/keyboard_navigation.feature index 7d26aaea3..f153e6e8f 100644 --- a/features/desktop/keyboard_navigation.feature +++ b/features/desktop/keyboard_navigation.feature @@ -25,7 +25,7 @@ Feature: Keyboard navigation Scenario: navigate downwards after changing the stream When I go to the activity stream page And I click on selector "[data-stream='stream'] a" - Then I should see "Stream" within ".stream-title" + Then I should see "Stream" within "#stream_selection .selected" When I press the "J" key somewhere Then post 1 should be highlighted