Commit a2ca68b5 authored by Steffen van Bergerem's avatar Steffen van Bergerem

Merge branch 'next-minor' into develop

parents 80b53adc ad7d4d77
......@@ -26,6 +26,7 @@
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
## Features
* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
# 0.6.4.0
......
......@@ -28,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({
var streamSelection = $("#stream_selection");
streamSelection.find("[data-stream]").removeClass("selected");
streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");
var activityContainer = streamSelection.find(".my-activity");
activityContainer.removeClass("activity-stream-selected");
if (activeStream === "activity" || activeStream === "liked" || activeStream === "commented") {
activityContainer.addClass("activity-stream-selected");
}
},
initInvitationModal : function() {
......
......@@ -30,16 +30,14 @@
}
}
.all-aspects .hoverable.selected,
.followed-tags-sidebar .hoverable.selected,
.nested-list .hoverable.selected,
.selected > .hoverable {
color: $white;
background: $gray;
border-color: $gray;
}
.all-aspects ul,
.followed-tags-sidebar ul {
.nested-list ul {
background: $left-navbar-drawer-background;
li { padding: 0; }
.entypo-check { visibility: hidden; }
......@@ -59,6 +57,16 @@
.hoverable:hover > .action { visibility: visible; }
}
.my-activity {
ul {
display: none;
}
&.activity-stream-selected ul {
display: block;
}
}
#tags_list {
#new_tag_following {
padding: 10px 20px 10px 30px;
......
......@@ -27,13 +27,19 @@
%ul#stream_selection
%li{data: {stream: "stream"}}
= link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
%li{data: {stream: "activity"}}
%li.nested-list.my-activity{data: {stream: "activity"}}
= link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
%ul
%li{data: {stream: "liked"}}
= link_to t("streams.liked.title"), liked_stream_path, rel: "backbone", class: "hoverable selectable"
%li{data: {stream: "commented"}}
= link_to t("streams.commented.title"), commented_stream_path,
rel: "backbone", class: "hoverable selectable"
%li{data: {stream: "mentions"}}
= link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
%li.all-aspects
%li.nested-list.all-aspects
= render "aspects/aspect_listings", stream: @stream
%li.followed-tags-sidebar
%li.nested-list
= render "tags/followed_tags_listings"
%li{data: {stream: "public"}}
= link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
......
......@@ -1158,6 +1158,12 @@ en:
activity:
title: "My activity"
liked:
title: "Liked posts"
commented:
title: "Commented posts"
users:
edit:
edit_account: "Edit account"
......
......@@ -15,12 +15,22 @@ Feature: The activity stream
Then I should see "Look at this dog"
And I should see "is that a poodle?"
When I go to the commented stream page
Then I should see "Look at this dog"
And I should see "is that a poodle?"
When I go to the liked stream page
Then I should not see "Look at this dog"
When I am on "alice@alice.alice"'s page
And I confirm the alert after I click to delete the first comment
And I go to the activity stream page
Then I should not see "Look at this dog"
When I go to the commented stream page
Then I should not see "Look at this dog"
Scenario: unliking a post
When I sign in as "bob@bob.bob"
And I am on "alice@alice.alice"'s page
......@@ -30,7 +40,16 @@ Feature: The activity stream
And I go to the activity stream page
Then I should see "Look at this dog"
When I go to the commented stream page
Then I should not see "Look at this dog"
When I go to the liked stream page
Then I should see "Look at this dog"
When I am on "alice@alice.alice"'s page
And I unlike the post "Look at this dog" in the stream
And I go to the activity stream page
Then I should not see "Look at this dog"
When I go to the liked stream page
Then I should not see "Look at this dog"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment