diff --git a/app/views/templates/comment.jst b/app/views/templates/comment.jst index 519ba69ac..d6b355387 100644 --- a/app/views/templates/comment.jst +++ b/app/views/templates/comment.jst @@ -18,7 +18,7 @@ -

+

<%= text %>

diff --git a/app/views/templates/reshare.jst b/app/views/templates/reshare.jst index e5382e6bf..e5e6ecd79 100644 --- a/app/views/templates/reshare.jst +++ b/app/views/templates/reshare.jst @@ -37,7 +37,7 @@ <% } %> <% } %> -

+

<%= root.text %>

diff --git a/app/views/templates/status_message.jst b/app/views/templates/status_message.jst index ce2dc34c9..f22cde937 100644 --- a/app/views/templates/status_message.jst +++ b/app/views/templates/status_message.jst @@ -12,7 +12,7 @@ <% } %> <% } %> -

+

<%= text %>

diff --git a/app/views/templates/stream_element.jst b/app/views/templates/stream_element.jst index c10c7b8a2..3e898e14b 100644 --- a/app/views/templates/stream_element.jst +++ b/app/views/templates/stream_element.jst @@ -1,8 +1,12 @@
<% if(author.id != current_user.id) { %> - Ignoreuser + + Ignoreuser + <% } else { %> - + + + <% } %>
diff --git a/public/javascripts/app/views/comment_view.js b/public/javascripts/app/views/comment_view.js index eb1cc0dbe..00c645ec6 100644 --- a/public/javascripts/app/views/comment_view.js +++ b/public/javascripts/app/views/comment_view.js @@ -14,9 +14,5 @@ app.views.Comment = app.views.StreamObject.extend({ $(this.el).attr("id", this.model.get("guid")); return this; - }, - - postRenderTemplate : function(){ - this.$("time").timeago(); } }); diff --git a/public/javascripts/app/views/post_view.js b/public/javascripts/app/views/post_view.js index 0827ffc70..0e20a7779 100644 --- a/public/javascripts/app/views/post_view.js +++ b/public/javascripts/app/views/post_view.js @@ -47,8 +47,7 @@ app.views.Post = app.views.StreamObject.extend({ postRenderTemplate : function() { this.renderPostContent() .initializeTooltips() - .$(".details time") - .timeago(); + .$("time").timeago(); return this; }, diff --git a/public/javascripts/app/views/stream_object_view.js b/public/javascripts/app/views/stream_object_view.js index 6a708985b..36121ba2a 100644 --- a/public/javascripts/app/views/stream_object_view.js +++ b/public/javascripts/app/views/stream_object_view.js @@ -5,6 +5,20 @@ app.views.StreamObject = app.views.Base.extend({ this.model.bind('change', this.render, this); }, + postRenderTemplate : function(){ + // time + this.$("time").timeago(); + + // collapse long posts + this.$(".collapsible").expander({ + slicePoint: 400, + widow: 12, + expandText: Diaspora.I18n.t("show_more"), + userCollapse: false + }); + + }, + destroyModel: function(evt){ if(evt){ evt.preventDefault(); } if(!confirm(Diaspora.I18n.t("confirm_dialog"))) { return }