Unverified Commit 8deef544 authored by Jonne Haß's avatar Jonne Haß

Merge pull request #6974 from svbergerem/empty-stream

Add 'no posts yet' message to empty streams
parents 780c521b eae9e01f
......@@ -190,6 +190,7 @@ The command will report queues that still have jobs and launch sidekiq process f
* Properly support pluralization in timeago strings [#6926](https://github.com/diaspora/diaspora/pull/6926)
* Return all contacts in people search [#6951](https://github.com/diaspora/diaspora/pull/6951)
* Make screenreaders read alerts [#6973](https://github.com/diaspora/diaspora/pull/6973)
* Display message when there are no posts in a stream [#6974](https://github.com/diaspora/diaspora/pull/6974)
# 0.5.10.2
......
......@@ -16,6 +16,7 @@ app.views.InfScroll = app.views.Base.extend({
this.showLoader();
this.bind("loadMore", this.fetchAndshowLoader, this);
this.stream.bind("fetched", this.finishedLoading, this);
this.stream.bind("allItemsLoaded", this.showNoPostsInfo, this);
this.stream.bind("allItemsLoaded", this.unbindInfScroll, this);
this.collection.bind("add", this.addPostView, this);
......@@ -50,6 +51,13 @@ app.views.InfScroll = app.views.Base.extend({
}
},
showNoPostsInfo: function() {
if (this.postViews.length === 0) {
var noPostsInfo = new app.views.NoPostsInfo();
this.$el.append(noPostsInfo.render().el);
}
},
unbindInfScroll : function() {
$(window).unbind("scroll");
},
......
app.views.NoPostsInfo = app.views.Base.extend({
templateName: "no_posts_info"
});
......@@ -189,4 +189,9 @@
.leaflet-control-zoom {
display: block;
}
.no-posts-info {
margin-bottom: 10px;
margin-top: 10px;
}
}
<div class="stream_element">
<div class="no-posts-info text-center">
<strong>{{ t "stream.no_posts_yet" }}</strong>
</div>
</div>
......@@ -236,6 +236,7 @@ en:
disable_post_notifications: "Disable notifications for this post"
permalink: "Permalink"
via: "via <%= provider %>"
no_posts_yet: "There are no posts yet."
likes:
zero: "<%= count %> Likes"
......
......@@ -41,3 +41,7 @@ Feature: posting
When I go to the followed tags stream page
And I unfollow the "boss" tag
Then I should not see "#tag-following-boss" within "#tags_list"
Scenario: Go to a tags page with no posts
When I go to the tag page for "NoPosts"
Then I should not see any posts in my stream
......@@ -15,6 +15,7 @@ Feature: new user registration
Then I should be on the stream page
And I close the publisher
And I should not see "awesome_button"
And I should not see any posts in my stream
Scenario: new user tries to XSS itself
When I fill in the following:
......
......@@ -7,7 +7,7 @@ Then /^the first comment field should be open/ do
end
Then /^the first comment field should be closed$/ do
page.should have_css(".stream_element")
page.should have_css(".stream_element .media")
page.should_not have_selector("#main_stream .stream_element .new_comment", match: :first)
end
......
......@@ -15,8 +15,9 @@ Then /^I should not see an uploaded image within the photo drop zone$/ do
end
Then /^I should not see any posts in my stream$/ do
page.assert_selector("#paginate .loader", visible: :hidden)
page.assert_selector(".stream_element", count: 0)
expect(page).not_to have_selector("#paginate .loader")
expect(page).not_to have_selector(".stream_element .media")
expect(page).to have_selector(".stream_element .no-posts-info")
end
Then /^I should not see any picture in my stream$/ do
......
......@@ -113,10 +113,6 @@ module PublishingCukeHelpers
end
end
def stream_posts
all('.stream_element')
end
def comment_on_show_page(comment_text)
within("#single-post-interactions") do
make_comment(comment_text)
......
describe("app.views.NoPostsInfo", function() {
describe("render", function() {
beforeEach(function() {
this.view = new app.views.NoPostsInfo();
});
it("renders the no posts info message", function() {
expect(this.view.render().$el.text().trim()).toBe(Diaspora.I18n.t("stream.no_posts_yet"));
});
});
});
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