From 7d663ce66fc053c08249846c1419c49b8fc0ace6 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 8 Jan 2016 14:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=86=85=E5=AE=B9=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/reply.js.erb | 18 +--------- app/views/blogs/_article.html.erb | 5 ++- app/views/blogs/_article_list.html.erb | 16 --------- app/views/boards/_course_show_detail.html.erb | 16 --------- .../boards/_project_show_detail.html.erb | 16 --------- app/views/courses/_course_activity.html.erb | 16 --------- app/views/issues/_list.html.erb | 16 --------- app/views/messages/reply.js.erb | 18 +--------- .../_org_course_homework.html.erb | 7 ++-- .../_org_course_message.html.erb | 5 ++- .../organizations/_org_course_news.html.erb | 7 ++-- .../organizations/_org_course_poll.html.erb | 7 ++-- .../organizations/_org_project_issue.html.erb | 5 ++- .../_org_subfield_message.html.erb | 7 ++-- .../organizations/_project_message.html.erb | 7 ++-- app/views/projects/_attachment_acts.html.erb | 7 ++-- .../projects/_project_activities.html.erb | 16 --------- app/views/projects/_project_news.html.erb | 7 ++-- app/views/users/_course_homework.html.erb | 7 ++-- app/views/users/_course_message.html.erb | 5 ++- app/views/users/_course_news.html.erb | 7 ++-- app/views/users/_course_poll.html.erb | 7 ++-- app/views/users/_project_issue.html.erb | 5 ++- app/views/users/_project_message.html.erb | 9 ++--- app/views/users/_user_activities.html.erb | 16 --------- app/views/users/_user_blog.html.erb | 7 ++-- .../users/_user_homework_detail.html.erb | 7 ++-- app/views/users/_user_homework_list.html.erb | 16 --------- public/javascripts/application.js | 35 +++++++++++++++++++ 29 files changed, 122 insertions(+), 195 deletions(-) diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb index fe46d870c..2a4e71f1c 100644 --- a/app/views/blog_comments/reply.js.erb +++ b/app/views/blog_comments/reply.js.erb @@ -5,20 +5,4 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); //init_activity_KindEditor_data(<%#= @user_activity_id%>,"","87%", 'UserActivity'); <% end %> -init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity'); -showNormalImage('activity_description_<%= @user_activity_id %>'); -if($("#intro_content_<%= @user_activity_id %>").height() > 810) { - $("#intro_content_show_<%= @user_activity_id %>").show(); -} -$("#intro_content_show_<%= @user_activity_id %>").click(function(){ - $("#activity_description_<%= @user_activity_id %>").toggleClass("maxh360"); - $("#activity_description_<%= @user_activity_id%>").toggleClass("lh18"); - $("#intro_content_show_<%= @user_activity_id %>").hide(); - $("#intro_content_hide_<%= @user_activity_id %>").show(); -}); -$("#intro_content_hide_<%= @user_activity_id %>").click(function(){ - $("#activity_description_<%= @user_activity_id %>").toggleClass("maxh360"); - $("#activity_description_<%= @user_activity_id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= @user_activity_id %>").hide(); - $("#intro_content_show_<%= @user_activity_id %>").show(); -}); \ No newline at end of file +init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity'); \ No newline at end of file diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 99c743a96..8d366a05a 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -57,7 +57,7 @@
发帖时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -176,3 +176,6 @@ <% end %>
+ diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index 62f1391b0..534c33609 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -75,22 +75,6 @@ $(function () { init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>"); - showNormalImage('activity_description_<%= topic.id %>'); - if($("#intro_content_<%= topic.id %>").height() > 810) { - $("#intro_content_show_<%= topic.id %>").show(); - } - $("#intro_content_show_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= topic.id %>").hide(); - $("#intro_content_hide_<%= topic.id %>").show(); - }); - $("#intro_content_hide_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= topic.id %>").hide(); - $("#intro_content_show_<%= topic.id %>").show(); - }); }); <% if topic %> diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index 8f50905c6..804f6543e 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -41,22 +41,6 @@ $(function () { init_activity_KindEditor_data(<%= topic.id%>, null, "87%"); - showNormalImage('activity_description_<%= topic.id %>'); - if($("#intro_content_<%= topic.id %>").height() > 810) { - $("#intro_content_show_<%= topic.id %>").show(); - } - $("#intro_content_show_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= topic.id %>").hide(); - $("#intro_content_hide_<%= topic.id %>").show(); - }); - $("#intro_content_hide_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= topic.id %>").hide(); - $("#intro_content_show_<%= topic.id %>").show(); - }); }); <% if topic %> diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb index 5b266b90c..367f0552c 100644 --- a/app/views/boards/_project_show_detail.html.erb +++ b/app/views/boards/_project_show_detail.html.erb @@ -40,22 +40,6 @@ $(function () { init_activity_KindEditor_data(<%= topic.id%>, null, "87%"); - showNormalImage('activity_description_<%= topic.id %>'); - if($("#intro_content_<%= topic.id %>").height() > 810) { - $("#intro_content_show_<%= topic.id %>").show(); - } - $("#intro_content_show_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= topic.id %>").hide(); - $("#intro_content_hide_<%= topic.id %>").show(); - }); - $("#intro_content_hide_<%= topic.id %>").click(function(){ - $("#activity_description_<%= topic.id %>").toggleClass("maxh360"); - $("#activity_description_<%= topic.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= topic.id %>").hide(); - $("#intro_content_show_<%= topic.id %>").show(); - }); }); <% if topic %> diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index ea41787d5..f0ae33996 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -73,22 +73,6 @@ $(function () { init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>"); - showNormalImage('activity_description_<%= activity.id %>'); - if($("#intro_content_<%= activity.id %>").height() > 360) { - $("#intro_content_show_<%= activity.id %>").show(); - } - $("#intro_content_show_<%= activity.id %>").click(function(){ - $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= activity.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= activity.id %>").hide(); - $("#intro_content_hide_<%= activity.id %>").show(); - }); - $("#intro_content_hide_<%= activity.id %>").click(function(){ - $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= activity.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= activity.id %>").hide(); - $("#intro_content_show_<%= activity.id %>").show(); - }); }); <% if activity && activity.course_act%> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 58fbda6d6..e47967099 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -19,22 +19,6 @@ $(function () { init_activity_KindEditor_data(<%= issue.id%>, null, "87%", "<%= issue.class.name %>"); - showNormalImage('activity_description_<%= issue.id %>'); - if ($("#intro_content_<%= issue.id %>").height() > 360) { - $("#intro_content_show_<%= issue.id %>").show(); - } - $("#intro_content_show_<%= issue.id %>").click(function () { - $("#activity_description_<%= issue.id %>").toggleClass("maxh360"); - $("#activity_description_<%= issue.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= issue.id %>").hide(); - $("#intro_content_hide_<%= issue.id %>").show(); - }); - $("#intro_content_hide_<%= issue.id %>").click(function () { - $("#activity_description_<%= issue.id %>").toggleClass("maxh360"); - $("#activity_description_<%= issue.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= issue.id %>").hide(); - $("#intro_content_show_<%= issue.id %>").show(); - }); }); <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %> diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index ea848439f..f61de74f0 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -5,20 +5,4 @@ <% elsif @org_subfield %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%end%> -init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", "UserActivity"); -showNormalImage('activity_description_<%= @user_activity_id %>'); -if($("#intro_content_<%= @user_activity_id %>").height() > 810) { - $("#intro_content_show_<%= @user_activity_id %>").show(); -} -$("#intro_content_show_<%= @user_activity_id %>").click(function(){ - $("#activity_description_<%= @user_activity_id %>").toggleClass("maxh360"); - $("#activity_description_<%= @user_activity_id %>").toggleClass("lh18"); - $("#intro_content_show_<%= @user_activity_id %>").hide(); - $("#intro_content_hide_<%= @user_activity_id %>").show(); -}); -$("#intro_content_hide_<%= @user_activity_id %>").click(function(){ - $("#activity_description_<%= @user_activity_id %>").toggleClass("maxh360"); - $("#activity_description_<%= @user_activity_id %>").toggleClass("lh18"); - $("#intro_content_hide_<%= @user_activity_id %>").hide(); - $("#intro_content_show_<%= @user_activity_id %>").show(); -}); \ No newline at end of file +init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", "UserActivity"); \ No newline at end of file diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 41e392b33..de87c5fdf 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -92,7 +92,7 @@
匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
<% end %>
-
+
<%= activity.description.html_safe %>
@@ -291,4 +291,7 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb index 9ca8f5d10..aec4754a0 100644 --- a/app/views/organizations/_org_course_message.html.erb +++ b/app/views/organizations/_org_course_message.html.erb @@ -30,7 +30,7 @@
发帖时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -138,3 +138,6 @@ <% end %>
+ diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb index 475a982e5..abb984efe 100644 --- a/app/views/organizations/_org_course_news.html.erb +++ b/app/views/organizations/_org_course_news.html.erb @@ -22,7 +22,7 @@
发布时间：<%= format_time(activity.created_on) %>
-
+
<%= activity.description.html_safe %>
@@ -103,4 +103,7 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb index c363909d9..d8907f4a9 100644 --- a/app/views/organizations/_org_course_poll.html.erb +++ b/app/views/organizations/_org_course_poll.html.erb @@ -29,7 +29,7 @@
发布时间：<%= format_time(activity.published_at) %>
-
+
<%= activity.polls_description.html_safe %>
@@ -53,4 +53,7 @@
-<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index e29994967..681b604f8 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -33,7 +33,7 @@ <%=format_time(activity.created_on) %> -
+
<% if activity.description? %> <%= textAreailizable activity, :description, :attachments => activity.attachments %> @@ -150,3 +150,6 @@
+ diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index e6bee8000..7ffdfda6b 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -26,7 +26,7 @@
时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -115,4 +115,7 @@
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index 037dfe61b..cac3c8dec 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -26,7 +26,7 @@
时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -115,4 +115,7 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb index bb62eee55..737473e76 100644 --- a/app/views/projects/_attachment_acts.html.erb +++ b/app/views/projects/_attachment_acts.html.erb @@ -21,7 +21,7 @@ 发布时间：<%= format_time(activity.created_on) %>

<%= textAreailizable activity, :description %>

-
+
<%#= activity.description.html_safe %>
@@ -32,4 +32,7 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index 781b65810..2926747e4 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -33,22 +33,6 @@ $(function () { init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>"); - showNormalImage('activity_description_<%= activity.id %>'); - if ($("#intro_content_<%= activity.id %>").height() > 810) { - $("#intro_content_show_<%= activity.id %>").show(); - } - $("#intro_content_show_<%= activity.id %>").click(function () { - $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= activity.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= activity.id %>").hide(); - $("#intro_content_hide_<%= activity.id %>").show(); - }); - $("#intro_content_hide_<%= activity.id %>").click(function () { - $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= activity.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= activity.id %>").hide(); - $("#intro_content_show_<%= activity.id %>").show(); - }); }); diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb index 919abc11e..fe35d2698 100644 --- a/app/views/projects/_project_news.html.erb +++ b/app/views/projects/_project_news.html.erb @@ -22,7 +22,7 @@
发布时间：<%= format_time(activity.created_on) %>
-
+
<%= activity.description.html_safe %>
@@ -103,4 +103,7 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 33b61923e..17d2ace69 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -92,7 +92,7 @@
匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
<% end %> -
+
<%= activity.description.html_safe %>
@@ -298,4 +298,7 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 22a4bcf57..562427c43 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -30,7 +30,7 @@
发帖时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -159,3 +159,6 @@ <% end %>
+ diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 475a982e5..abb984efe 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -22,7 +22,7 @@
发布时间：<%= format_time(activity.created_on) %>
-
+
<%= activity.description.html_safe %>
@@ -103,4 +103,7 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 48ab5d2f2..6ecd72cfb 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -29,7 +29,7 @@
发布时间：<%= format_time(activity.published_at) %>
-
+
<%= activity.polls_description.html_safe %>
@@ -53,4 +53,7 @@
-<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index cd9704186..a83258737 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -45,7 +45,7 @@ <%=format_time(activity.created_on) %> -
+
<% if activity.description? %> <%= textAreailizable activity, :description, :attachments => activity.attachments %> @@ -163,3 +163,6 @@
+ diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 5a9f7e398..d248eb845 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -31,7 +31,7 @@
发帖时间：<%= format_time(activity.created_on) %>
-
+
<% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> @@ -146,7 +146,8 @@
- -
-
\ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index bb1a42f58..2941394da 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -40,22 +40,6 @@ $(function() { init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%", "<%=user_activity.class.to_s%>"); - showNormalImage('activity_description_<%= user_activity.id %>'); - if($("#intro_content_<%= user_activity.id %>").height() > 360) { - $("#intro_content_show_<%= user_activity.id %>").show(); - } - $("#intro_content_show_<%= user_activity.id %>").click(function(){ - $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= user_activity.id%>").toggleClass("lh18"); - $("#intro_content_show_<%= user_activity.id %>").hide(); - $("#intro_content_hide_<%= user_activity.id %>").show(); - }); - $("#intro_content_hide_<%= user_activity.id %>").click(function(){ - $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360"); - $("#activity_description_<%= user_activity.id%>").toggleClass("lh18"); - $("#intro_content_hide_<%= user_activity.id %>").hide(); - $("#intro_content_show_<%= user_activity.id %>").show(); - }); }); <% unless user_activity.act_type == "ProjectCreateInfo" %> diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index c1219eb25..50bddb65f 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -28,7 +28,7 @@
发布时间：<%= format_time(activity.created_on) %>
-
+
<%= activity.content.html_safe %>
@@ -116,4 +116,7 @@
<% end %>
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index b644d562b..af0db004f 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -95,7 +95,7 @@ <% end %> -
+
<%= homework_common.description.html_safe %>
@@ -301,4 +301,7 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index f00900488..efe9216df 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -18,22 +18,6 @@