nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed content expander in comments; comments have a smaller limit than posts

Browse source
This commit is contained in:
danielgrippi 2011-07-03 22:06:58 -07:00
parent d2b7168195
commit 403d18bac4
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_stream_element.html.haml
View file

@ -16,7 +16,7 @@
= person_image_link(post.author, :size => :thumb_small) = person_image_link(post.author, :size => :thumb_small)
.content .content
%div %div.post_initial_info
%span.from %span.from
= person_link(post.author, :class => 'author') = person_link(post.author, :class => 'author')
%time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i} %time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i}

11
public/javascripts/stream.js
View file

@ -18,13 +18,21 @@ var Stream = {
Stream.setUpAudioLinks(); Stream.setUpAudioLinks();
//Stream.setUpImageLinks(); //Stream.setUpImageLinks();
// collapse long comments // collapse long posts
$(".content p", this.selector).expander({ $(".content p", this.selector).expander({
slicePoint: 400, slicePoint: 400,
widow: 12, widow: 12,
expandText: Diaspora.widgets.i18n.t("show_more"), expandText: Diaspora.widgets.i18n.t("show_more"),
userCollapse: false userCollapse: false
}); });
// collapse long comments
$(".comment .content span", this.selector).expander({
slicePoint: 200,
widow: 12,
expandText: Diaspora.widgets.i18n.t("show_more"),
userCollapse: false
});
}, },
initializeLives: function(){ initializeLives: function(){
@ -41,7 +49,6 @@ var Stream = {
}); });
this.setUpComments(); this.setUpComments();
}, },
setUpComments: function(){ setUpComments: function(){

5
public/stylesheets/sass/application.sass
View file

@ -477,8 +477,9 @@ ul.dropdown
:bottom 5px :bottom 5px
.details .post_initial_info
:color #aaa .details
:color #aaa
.time, .time,
.timeago, .timeago,