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

Merge pull request #6974 from svbergerem/empty-stream 

Add 'no posts yet' message to empty streams
parents 780c521b eae9e01f

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -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

app/assets/javascripts/app/views/infinite_stream_view.js

+8 −0
Original line number Diff line number Diff line
@@ -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/assets/javascripts/app/views/no_posts_info_view.js

0 → 100644
+3 −0
Original line number Diff line number Diff line 
app.views.NoPostsInfo = app.views.Base.extend({

  templateName: "no_posts_info"

});

app/assets/stylesheets/stream_element.scss

+5 −0
Original line number Diff line number Diff line
@@ -189,4 +189,9 @@ 
  .leaflet-control-zoom {

    display: block;

  }



  .no-posts-info {

    margin-bottom: 10px;

    margin-top: 10px;

  }

}

app/assets/templates/no_posts_info_tpl.jst.hbs

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<div class="stream_element">

  <div class="no-posts-info text-center">

    <strong>{{ t "stream.no_posts_yet" }}</strong>

  </div>

</div>