diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 871aa7e39..783531027 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -26,14 +26,15 @@ var btn = $(btnid); if (btn.data('init') == '0') { btn.data('init', 1); - btn.html('收起回复(' + btn.data('count') + ')'); + btn.html('收起回复'); target.show(); } else { btn.data('init', 0); - btn.html('展开更多(' + btn.data('count') + ')'); + btn.html('展开更多'); target.hide(); target.eq(0).show(); target.eq(1).show(); + target.eq(2).show(); } } diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 4f022261f..84e25974a 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -209,11 +209,11 @@ btn.click(function(){ if($(this).data('init')=='0'){ $(this).data('init',1); - $(this).html('收起回复('+$(this).data('count')+')'); + $(this).html('收起回复'); target.show(); }else{ $(this).data('init',0); - $(this).html('展开回复('+$(this).data('count')+')'); + $(this).html('展开回复'+$(this).data('count')+')'); target.hide(); target.eq(0).show(); target.eq(1).show(); diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 44b72868d..74856197e 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -56,14 +56,15 @@ var btn = $(btnid); if (btn.data('init') == '0') { btn.data('init', 1); - btn.html('收起回复(' + btn.data('count') + ')'); + btn.html('收起回复'); target.show(); } else { btn.data('init', 0); - btn.html('展开更多(' + btn.data('count') + ')'); + btn.html('展开更多'); target.hide(); target.eq(0).show(); target.eq(1).show(); + target.eq(2).show(); } } diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index d6acabd9e..53b972025 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -17,14 +17,15 @@ var btn = $(btnid); if(btn.data('init')=='0'){ btn.data('init',1); - btn.html('收起回复('+btn.data('count')+')'); + btn.html('收起回复'); target.show(); }else{ btn.data('init',0); - btn.html('展开更多('+btn.data('count')+')'); + btn.html('展开更多'); target.hide(); target.eq(0).show(); target.eq(1).show(); + target.eq(2).show(); } } $(function() { diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 1c603caf6..f9822f70c 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -12,14 +12,15 @@ var btn = $(btnid); if(btn.data('init')=='0'){ btn.data('init',1); - btn.html('收起回复('+btn.data('count')+')'); + btn.html('收起回复'); target.show(); }else{ btn.data('init',0); - btn.html('展开更多('+btn.data('count')+')'); + btn.html('展开更多'); target.hide(); target.eq(0).show(); target.eq(1).show(); + target.eq(2).show(); } } $(function() { diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index ac4652a32..93e7f0c29 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -34,7 +34,7 @@ 回复(<%= count %>)
- <%if count>2 %> + <%if count>3 %>