From 674a8e003566ca58b64c55cc4c1e97351d556a5b Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jan 2016 16:16:02 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8D=95=E8=AF=8D=E6=8A=98=E8=A1=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/show.html.erb | 4 +- .../organizations/_show_home_page.html.erb | 142 +++++++++--------- app/views/users/_intro_content.html.erb | 24 +-- db/schema.rb | 1 + 4 files changed, 86 insertions(+), 85 deletions(-) diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 405631369..62075dc92 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -150,9 +150,9 @@ \ No newline at end of file diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb index 668a26cec..53d556e86 100644 --- a/app/views/users/_intro_content.html.erb +++ b/app/views/users/_intro_content.html.erb @@ -1,13 +1,13 @@ -
-
- <%= content.to_s.html_safe%> -
-
- \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index b2c74a96c..29a9329a3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1217,6 +1217,7 @@ ActiveRecord::Schema.define(:version => 20160122143138) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" + t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end From 3aaa078a4bad4a0976d1c4bc3ce50b7399072547 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 29 Jan 2016 16:26:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_activities.html.erb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index deb0af842..7fc5c347c 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -1,4 +1,4 @@ -<%= import_ke(enable_at: true, prettify: false, init_activity: true) %> +<%= import_ke(enable_at: true,init_activity: true) %> <% unless forge_acts.empty? %> <% forge_acts.each do |activity| -%> @@ -68,7 +68,7 @@ } $(function () { - init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>"); + sd_create_editor_from_data(<%= activity.id %>, null, "100%", "<%= activity.class.to_s %>"); }); From dc3278274d5e7ae262a809047ef7a7625ef5dc30 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 29 Jan 2016 16:55:07 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9kindeditor=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../_simple_ke_reply_form.html.erb | 2 +- app/views/blog_comments/quote.js.erb | 2 +- app/views/blog_comments/reply.js.erb | 2 +- app/views/blog_comments/show.html.erb | 2 +- app/views/blogs/_article.html.erb | 2 +- app/views/blogs/_article_list.html.erb | 22 +++++++++---------- app/views/boards/_course_show_detail.html.erb | 2 +- .../boards/_project_show_detail.html.erb | 2 +- app/views/comments/create.js.erb | 2 +- app/views/courses/_course_activity.html.erb | 2 +- app/views/courses/_courses_jours.html.erb | 2 +- app/views/courses/syllabus.html.erb | 4 ++-- .../set_evaluation_attr.js.erb | 4 ++-- .../start_anonymous_comment.js.erb | 4 ++-- .../stop_anonymous_comment.js.erb | 4 ++-- app/views/issues/_list.html.erb | 2 +- app/views/issues/add_journal.js.erb | 3 ++- app/views/issues/add_journal_in_org.js.erb | 2 +- app/views/memos/show.html.erb | 4 ++-- app/views/messages/_course_show.html.erb | 4 ++-- .../messages/_org_subfield_show.html.erb | 2 +- app/views/messages/_project_show.html.erb | 2 +- app/views/messages/_reply_message.html.erb | 2 +- app/views/messages/quote.js.erb | 2 +- app/views/messages/reply.js.erb | 2 +- app/views/news/_course_news_detail.html.erb | 2 +- app/views/news/_project_news_detail.html.erb | 2 +- .../_reply_form.html.erb | 2 +- .../_simple_ke_reply_form.html.erb | 2 +- .../org_document_comments/add_reply.js.erb | 2 +- .../org_document_comments/index.html.erb | 2 +- app/views/org_document_comments/quote.js.erb | 2 +- app/views/org_document_comments/show.html.erb | 2 +- .../org_subfields/_show_details.html.erb | 2 +- .../organizations/_org_activities.html.erb | 2 +- .../_org_course_homework.html.erb | 2 +- .../_org_course_message.html.erb | 2 +- .../organizations/_org_course_news.html.erb | 2 +- .../organizations/_org_project_issue.html.erb | 2 +- .../_org_subfield_message.html.erb | 2 +- .../organizations/_org_subfield_news.html.erb | 2 +- .../organizations/_project_message.html.erb | 2 +- .../organizations/_show_org_document.html.erb | 3 +-- app/views/organizations/show.html.erb | 2 +- .../projects/_project_activities.html.erb | 2 +- app/views/projects/_project_news.html.erb | 2 +- .../student_work/cancel_relate_project.js.erb | 4 ++-- .../forbidden_anonymous_comment.js.erb | 4 ++-- app/views/student_work/set_score_rule.js.erb | 4 ++-- .../student_work/student_work_project.js.erb | 4 ++-- app/views/users/_course_homework.html.erb | 2 +- .../users/_course_journalsformessage.html.erb | 2 +- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_project_issue_reply.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/_project_news.html.erb | 2 +- app/views/users/_user_activities.html.erb | 21 +++++++++--------- app/views/users/_user_blog.html.erb | 2 +- .../users/_user_homework_detail.html.erb | 2 +- app/views/users/_user_homework_list.html.erb | 2 +- .../users/_user_journalsformessage.html.erb | 2 +- app/views/users/_user_jours_list.html.erb | 20 ++++++++--------- app/views/words/create_reply.js.erb | 2 +- app/views/words/destroy.js.erb | 4 ++-- app/views/words/leave_homework_message.js.erb | 4 ++-- 67 files changed, 109 insertions(+), 108 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3a0808bdd..ab091b61c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2808,7 +2808,7 @@ int main(int argc, char** argv){ end if opt[:init_activity] - ss += javascript_include_tag "init_activity_KindEditor" + ss += javascript_include_tag "create_kindeditor" end ss.html_safe diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb index 61669058b..292587cad 100644 --- a/app/views/blog_comments/_simple_ke_reply_form.html.erb +++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb @@ -21,8 +21,8 @@ <% end %> +
-

diff --git a/app/views/blog_comments/quote.js.erb b/app/views/blog_comments/quote.js.erb index cd53707d5..9bd226ce1 100644 --- a/app/views/blog_comments/quote.js.erb +++ b/app/views/blog_comments/quote.js.erb @@ -3,7 +3,7 @@ if($("#reply_message_<%= @blogComment.id%>").length > 0) { $(function(){ $('#reply_subject').val("<%= raw escape_javascript(@subject) %>"); $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>"); - init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%", "<%=@blogComment.class.to_s%>"); + sd_create_editor_from_data(<%= @blogComment.id%>,null,"100%", "<%=@blogComment.class.to_s%>"); }); }else if($("#reply_to_message_<%= @blogComment.id%>").length >0) { $("#reply_to_message_<%= @blogComment.id%>").replaceWith("

"); diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb index 2a4e71f1c..915ab892d 100644 --- a/app/views/blog_comments/reply.js.erb +++ b/app/views/blog_comments/reply.js.erb @@ -5,4 +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'); \ No newline at end of file +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity'); \ No newline at end of file diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 4a407089f..e6d8be24e 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -27,7 +27,7 @@ } } $(function() { - init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>'); + sd_create_editor_from_data(<%= @article.id%>,null,"100%", '<%=@article.class.to_s%>'); showNormalImage('message_description_<%= @article.id %>'); }); diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 4ca86e7ae..05f69055f 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -198,8 +198,8 @@ +
-

diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index ca85c0ba2..f3fd1aa61 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -1,19 +1,19 @@ <%= content_for(:header_tags) do %> <%= import_ke(enable_at: false, prettify: false) %> - <%= javascript_include_tag "init_activity_KindEditor" %> + <%= javascript_include_tag "create_kindeditor" %> <% end %> <% if topic %> diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index 1898fce02..88fd7d224 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -40,7 +40,7 @@ } $(function () { - init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>"); + sd_create_editor_from_data(<%= topic.id%>, null, "100%", "<%=topic.class.to_s%>"); }); <% if topic %> diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb index 367f0552c..fc24dfd09 100644 --- a/app/views/boards/_project_show_detail.html.erb +++ b/app/views/boards/_project_show_detail.html.erb @@ -39,7 +39,7 @@ } $(function () { - init_activity_KindEditor_data(<%= topic.id%>, null, "87%"); + sd_create_editor_from_data(<%= topic.id%>, null, "100%"); }); <% if topic %> diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index f94eda065..0814b5f50 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -5,4 +5,4 @@ <% else %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% end %> -init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity"); +sd_create_editor_from_data('<%= @user_activity_id%>',"","100%", "UserActivity"); diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 1b0d5330d..65aa142af 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -107,7 +107,7 @@ } $(function () { - init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>"); + sd_create_editor_from_data(<%= activity.id%>, null, "100%", "<%= activity.class.to_s %>"); }); <% if activity && activity.course_act%> diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 0c4f4c1e0..c7e4a7428 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -32,9 +32,9 @@
<%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_course_message'}, :html=>{:id => "course_feedback_new"},:method => "post") do |f|%> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> +

-
取消 留言 <% end %> diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index c9d333e6d..3bace514b 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -40,7 +40,7 @@ } } $(function() { - init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>"); + sd_create_editor_from_data(<%= @article.id%>,null,"100%", "<%=@article.class.to_s%>"); showNormalImage('message_description_<%= @article.id %>'); }); @@ -201,8 +201,8 @@ +
-

diff --git a/app/views/homework_common/set_evaluation_attr.js.erb b/app/views/homework_common/set_evaluation_attr.js.erb index 73436750c..987abd351 100644 --- a/app/views/homework_common/set_evaluation_attr.js.erb +++ b/app/views/homework_common/set_evaluation_attr.js.erb @@ -1,8 +1,8 @@ clickCanel(); <% if @user_activity_id != -1 %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>"); -init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity"); +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% else %> $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>"); -init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>"); +sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); <% end %> \ No newline at end of file diff --git a/app/views/homework_common/start_anonymous_comment.js.erb b/app/views/homework_common/start_anonymous_comment.js.erb index 8b2e9ed04..91a68011e 100644 --- a/app/views/homework_common/start_anonymous_comment.js.erb +++ b/app/views/homework_common/start_anonymous_comment.js.erb @@ -3,11 +3,11 @@ <% if @user_activity_id == -1 %> $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); $("#evaluation_start_time_<%=@homework.id %>").html("匿评开启时间：<%=format_time(Time.now) %>"); - init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>"); + sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); <% else %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>"); - init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity"); + sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% end %> /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/ <% elsif @statue == 2 %> diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb index 2f8d8c6d6..874374476 100644 --- a/app/views/homework_common/stop_anonymous_comment.js.erb +++ b/app/views/homework_common/stop_anonymous_comment.js.erb @@ -2,11 +2,11 @@ alert('关闭成功'); <% if @user_activity_id == -1 %> $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); $("#evaluation_end_time_<%=@homework.id %>").html("匿评关闭时间：<%=format_time(Time.now) %>"); -init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>"); +sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); <% else %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); $("#evaluation_end_time_<%=@user_activity_id %>").html("匿评关闭时间：<%=format_time(Time.now) %>"); -init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity'); +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity'); <% end %> /* $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/ diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 2a1ae56d4..3ee20ee2a 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -18,7 +18,7 @@ } $(function () { - init_activity_KindEditor_data(<%= issue.id%>, null, "87%", "<%= issue.class.name %>"); + sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>"); }); <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %> diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb index 9099c31b6..43d7f741b 100644 --- a/app/views/issues/add_journal.js.erb +++ b/app/views/issues/add_journal.js.erb @@ -21,6 +21,7 @@ sd_create_editor_from_data(<%= @issue.id %>, null, "100%"); <%else%> $("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>"); - init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity'); + sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity"); +//init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity'); // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%"); <%end %> diff --git a/app/views/issues/add_journal_in_org.js.erb b/app/views/issues/add_journal_in_org.js.erb index 34e874f13..ed4666d0c 100644 --- a/app/views/issues/add_journal_in_org.js.erb +++ b/app/views/issues/add_journal_in_org.js.erb @@ -1,3 +1,3 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>"); -init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity"); \ No newline at end of file +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); \ No newline at end of file diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 3028f3369..e59c8359d 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -34,7 +34,7 @@ } } $(function() { - init_activity_KindEditor_data(<%= @memo.id%>,null,"87%", "<%=@memo.class.to_s%>"); + sd_create_editor_from_data(<%= @memo.id%>,null,"100%", "<%=@memo.class.to_s%>"); }); function del_confirm(){ @@ -124,8 +124,8 @@ <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %> +
-

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 022b8c76b..00f22cc95 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -27,7 +27,7 @@ } } $(function() { - init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>"); + sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>"); showNormalImage('message_description_<%= @topic.id %>'); }); @@ -175,4 +175,4 @@ postContent = postContent.replace(/ /g," "); $("#message_description_<%= @topic.id %>").html(postContent); }); - + diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb index fab0f752e..5fc7ed746 100644 --- a/app/views/messages/_org_subfield_show.html.erb +++ b/app/views/messages/_org_subfield_show.html.erb @@ -58,7 +58,7 @@ } $(function() { - init_activity_KindEditor_data(<%= @topic.id%>,null,"94%", "<%=@topic.class.to_s%>"); + sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>"); showNormalImage('message_description_<%= @topic.id %>'); }); diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index a0e9db171..2009c7133 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -88,7 +88,7 @@ } } $(function() { - init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>"); + sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>"); showNormalImage('message_description_<%= @topic.id %>'); }); diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb index a859a088a..15cb465de 100644 --- a/app/views/messages/_reply_message.html.erb +++ b/app/views/messages/_reply_message.html.erb @@ -18,8 +18,8 @@ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %> +
-

diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb index b0e8ecb85..89f953bb9 100644 --- a/app/views/messages/quote.js.erb +++ b/app/views/messages/quote.js.erb @@ -11,7 +11,7 @@ if($("#reply_message_<%= @message.id%>").length > 0) { $(function(){ $('#reply_subject').val("<%= raw escape_javascript(@subject) %>"); $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>"); - init_activity_KindEditor_data(<%= @message.id%>,null,"85%", "<%=@message.class.to_s%>"); + sd_create_editor_from_data(<%= @message.id%>,null,"100%", "<%=@message.class.to_s%>"); }); }else if($("#reply_to_message_<%= @message.id%>").length >0) { $("#reply_to_message_<%= @message.id%>").replaceWith("

"); diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index f61de74f0..385a49a82 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -5,4 +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"); \ No newline at end of file +sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); \ No newline at end of file diff --git a/app/views/news/_course_news_detail.html.erb b/app/views/news/_course_news_detail.html.erb index 954f7dbf1..6092a8590 100644 --- a/app/views/news/_course_news_detail.html.erb +++ b/app/views/news/_course_news_detail.html.erb @@ -40,7 +40,7 @@ } $(function () { - init_activity_KindEditor_data(<%= news.id%>, null, "87%"); + sd_create_editor_from_data(<%= news.id%>, null, "100%"); showNormalImage('activity_description_<%= news.id %>'); }); diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb index fdb035bf5..a0610ae63 100644 --- a/app/views/news/_project_news_detail.html.erb +++ b/app/views/news/_project_news_detail.html.erb @@ -40,7 +40,7 @@ } $(function () { - init_activity_KindEditor_data(<%= news.id%>, null, "87%"); + sd_create_editor_from_data(<%= news.id%>, null, "100%"); showNormalImage('activity_description_<%= news.id %>'); }); diff --git a/app/views/org_document_comments/_reply_form.html.erb b/app/views/org_document_comments/_reply_form.html.erb index 8808ff8b7..60db259c6 100644 --- a/app/views/org_document_comments/_reply_form.html.erb +++ b/app/views/org_document_comments/_reply_form.html.erb @@ -1,2 +1,2 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); -init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity"); +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); diff --git a/app/views/org_document_comments/_simple_ke_reply_form.html.erb b/app/views/org_document_comments/_simple_ke_reply_form.html.erb index cfa197ff4..c0166f5ce 100644 --- a/app/views/org_document_comments/_simple_ke_reply_form.html.erb +++ b/app/views/org_document_comments/_simple_ke_reply_form.html.erb @@ -18,8 +18,8 @@ <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %> +
-

diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb index 968d7295d..79858dd03 100644 --- a/app/views/org_document_comments/add_reply.js.erb +++ b/app/views/org_document_comments/add_reply.js.erb @@ -1,2 +1,2 @@ $("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>"); -init_activity_KindEditor_data(<%= @act.id %>,"","87%", "<%=@act.class.to_s%>"); +sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>"); diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index 7734a2853..7dba82d9a 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -19,7 +19,7 @@ <% @documents.each do |document| %> <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %> diff --git a/app/views/org_document_comments/quote.js.erb b/app/views/org_document_comments/quote.js.erb index 7ea5daf7b..53d22eb58 100644 --- a/app/views/org_document_comments/quote.js.erb +++ b/app/views/org_document_comments/quote.js.erb @@ -3,7 +3,7 @@ if($("#reply_message_<%= @org_comment.id%>").length > 0) { $(function(){ $('#reply_subject').val("<%= raw escape_javascript(@subject) %>"); $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>"); - init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%", "<%=@org_comment.class.to_s%>"); + sd_create_editor_from_data(<%= @org_comment.id%>,null,"100%", "<%=@org_comment.class.to_s%>"); }); }else if($("#reply_to_message_<%= @org_comment.id %>").length >0) { $("#reply_to_message_<%= @org_comment.id%>").replaceWith("

"); diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 405631369..561364d64 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -1,7 +1,7 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %> diff --git a/app/views/org_subfields/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb index eda9c9d57..3a605f75d 100644 --- a/app/views/org_subfields/_show_details.html.erb +++ b/app/views/org_subfields/_show_details.html.erb @@ -38,7 +38,7 @@ <% org_activities.each do |act| %> <% if act.container_type == 'Organization' %> diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index 6579ccbca..20b98ffa0 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -38,7 +38,7 @@ <% org_activities.each do |act| %> <% if act.container_type == 'Organization' %> diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 3dccdcc2b..b5e3c6958 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -326,8 +326,8 @@ <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%> <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %> <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %> +
-

diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb index 339ff8b26..4f13e1b4f 100644 --- a/app/views/organizations/_org_course_message.html.erb +++ b/app/views/organizations/_org_course_message.html.erb @@ -142,8 +142,8 @@ <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb index b6e2f74ef..665f5c1ae 100644 --- a/app/views/organizations/_org_course_news.html.erb +++ b/app/views/organizations/_org_course_news.html.erb @@ -108,8 +108,8 @@
<%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index 763a76d5e..2495e0044 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -125,8 +125,8 @@
<%= form_for('new_form',:url => add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index a14138903..4763089a0 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -143,8 +143,8 @@ <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb index 41eb473e8..891ad14a7 100644 --- a/app/views/organizations/_org_subfield_news.html.erb +++ b/app/views/organizations/_org_subfield_news.html.erb @@ -128,8 +128,8 @@
<%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index baa687107..6cc3f5740 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -120,8 +120,8 @@ <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%> +
-

diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index b29bac7d1..da458636a 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -117,9 +117,8 @@
<%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %> +
- -
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 78fb12279..a271abe02 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -61,7 +61,7 @@ <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %> <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %> diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index 7fc5c347c..062d64096 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -1,4 +1,4 @@ -<%= import_ke(enable_at: true,init_activity: true) %> +<%= import_ke(enable_at: true, prettify: false, init_activity: true) %> <% user_activities.each do |user_activity| if user_activities %> @@ -74,7 +75,7 @@ } $(function() { - init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%", "<%=user_activity.class.to_s%>"); + sd_create_editor_from_data(<%= user_activity.id %>, null, "100%", "<%= user_activity.class.to_s %>"); }); <% 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 7658bc581..244951dfa 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -120,8 +120,8 @@ +
-

diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 36b2be34f..01673d164 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -328,8 +328,8 @@ <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%> <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %> <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %> +
-

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index 36f823a9a..e55065c52 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -17,7 +17,7 @@ <% homework_commons.each do |homework_common|%> <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %> diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index d4d9a2cd7..285866f9d 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -5,7 +5,7 @@ <% else %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); <% end %> - init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity"); + sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity"); <% else %> <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %> $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>"); diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb index 6a56249a3..cd48ae74c 100644 --- a/app/views/words/destroy.js.erb +++ b/app/views/words/destroy.js.erb @@ -19,10 +19,10 @@ <% elsif @homework%> <% if @user_activity_id == -1 %> $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); - init_activity_KindEditor_data(<%= @homework.id%>,"","87%"); + sd_create_editor_from_data(<%= @homework.id%>,"","100%"); <% else %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); - init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); + sd_create_editor_from_data(<%= @user_activity_id%>,"","100%"); <% end %> <% end %> var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>') diff --git a/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb index 5eeb9ce64..acb16be50 100644 --- a/app/views/words/leave_homework_message.js.erb +++ b/app/views/words/leave_homework_message.js.erb @@ -1,7 +1,7 @@ <% if @user_activity_id %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>"); - init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity"); + sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% elsif @homework_common_id && @is_in_course %> $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>"); - init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%", "HomeworkCommon"); + sd_create_editor_from_data(<%= @homework_common_id%>,"","100%", "HomeworkCommon"); <% end %> From 83a3c879d4b40b5858a8ce01ee0174a491761b65 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 1 Feb 2016 10:40:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=A7=81=E4=BF=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- public/images/hwork_icon.png | Bin 10436 -> 10537 bytes public/stylesheets/new_user.css | 2 ++ public/stylesheets/public.css | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3a0808bdd..9f516ae1a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -51,7 +51,7 @@ module ApplicationHelper def link_to_user_version(version, options = {}) return '' unless version && version.is_a?(Version) - link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => " f16 fb c_dblue " + link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue" end # 判断课程是否为精品课程 diff --git a/public/images/hwork_icon.png b/public/images/hwork_icon.png index 8ae87460fd13f21c15c187d31792b29d6d0ae6dd..f531c3d4c4c2881b535f5eabf341d5c071102b70 100644 GIT binary patch delta 9339 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 z%0D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 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index d31c1ee0c..bc7922194 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -693,6 +693,8 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} +.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} +.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:33px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index be9d51799..a3135b78e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -611,6 +611,8 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} +.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;} +.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} /*a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}*/ /*a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}*/ .homepagePostReplyPortrait {float:left; width:45px;} From cdd997e45ef4ab1d7de64403de5d4eedf0a21603 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 1 Feb 2016 14:50:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?kindeditor=E5=9B=9E=E5=A4=8D=E6=A1=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 2 +- app/views/boards/_course_show_detail.html.erb | 20 ++++---- .../boards/_project_show_detail.html.erb | 20 ++++---- app/views/courses/_course_activity.html.erb | 48 ------------------- app/views/issues/index.html.erb | 18 +++---- app/views/news/_course_news_detail.html.erb | 20 ++++---- app/views/news/_project_news_detail.html.erb | 20 ++++---- .../org_document_comments/index.html.erb | 12 ----- app/views/org_document_comments/show.html.erb | 2 +- .../org_subfields/_show_post_type.html.erb | 13 ----- app/views/organizations/show.html.erb | 12 ----- app/views/users/_user_homework_list.html.erb | 12 ----- 12 files changed, 51 insertions(+), 148 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index e6d8be24e..856a122d3 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -1,6 +1,6 @@ <%= content_for(:header_tags) do %> <%= import_ke(enable_at: false, prettify: false) %> - <%= javascript_include_tag "init_activity_KindEditor",'blog' %> + <%= javascript_include_tag "create_kindeditor",'blog' %> <% end %> <% course_activities.each do |activity| if course_activities %> \ No newline at end of file From 105393548bac00e33d238221f7525282c9b7eeae Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 2 Feb 2016 11:23:17 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 441 ++++++++--------- app/views/courses/syllabus.html.erb | 451 +++++++++--------- app/views/memos/show.html.erb | 11 +- app/views/messages/_course_show.html.erb | 13 +- .../messages/_org_subfield_show.html.erb | 421 ++++++++-------- app/views/messages/_project_show.html.erb | 11 +- app/views/news/_course_show.html.erb | 11 +- app/views/news/_organization_show.html.erb | 367 +++++++------- app/views/news/_project_show.html.erb | 11 +- 9 files changed, 891 insertions(+), 846 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 4a407089f..51df656f0 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -1,218 +1,223 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: false, prettify: false) %> - <%= javascript_include_tag "init_activity_KindEditor",'blog' %> -<% end %> - - - -
-
-
- <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> -
-
- <% if @article.author.id == User.current.id%> - - <%end%> -
- 主题: <%= @article.title%> -
-
- -
- <% if @article.try(:author).try(:realname) == ' ' %> - <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% else %> - <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% end %> -
-
<%= format_time( @article.created_on)%>
-
-
- <%= @article.content.html_safe%> -
-
-
- <%#= link_to_attachments_course @topic, :author => false %> - <% if @article.attachments.any?%> - <% options = {:author => true, :deletable => false} %> - <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %> - <% end %> -
-
-
-
-
- <% count=0 %> - <% if @article.parent %> - <% count=@article.parent.children.count%> - <% else %> - <% count=@article.children.count%> - <% end %> -
- <%# unless count == 0 %> -
-
回复 - <%= count>0 ? "（#{count}）" : "" %>▪ - - <% if @article.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%> - <% end %> - -
-
- -
-
- <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %> - -
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
-
-
- <% if reply.try(:author).try(:realname) == ' ' %> - <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% else %> - <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% end %> -
-
- <%= reply.content.html_safe%> -
-
- <%= format_time(reply.created_on) %> - - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> - - -
-

-
-
-
- <% end %> -
- - <%# end %> -
- <% if !@article.locked? && User.current.logged?%> -
- -
-
- <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> - <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> - <% end %> -
-
-
- <% end %> -
-
- +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> + <%= javascript_include_tag "init_activity_KindEditor",'blog' %> +<% end %> + + + +
+
+
+ <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> +
+
+ <% if @article.author.id == User.current.id%> + + <%end%> +
+ 主题: <%= @article.title%> +
+
+ +
+ <% if @article.try(:author).try(:realname) == ' ' %> + <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% else %> + <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% end %> +
+
<%= format_time( @article.created_on)%>
+
+
+ <%= @article.content.html_safe%> +
+
+
+ <%#= link_to_attachments_course @topic, :author => false %> + <% if @article.attachments.any?%> + <% options = {:author => true, :deletable => false} %> + <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %> + <% end %> +
+
+
+
+
+ <% count=0 %> + <% if @article.parent %> + <% count=@article.parent.children.count%> + <% else %> + <% count=@article.children.count%> + <% end %> +
+ <%# unless count == 0 %> +
+
回复 + <%= count>0 ? "（#{count}）" : "" %>▪ + + <% if @article.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%> + <% end %> + +
+
+ +
+
+ <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %> + +
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% end %> +
+
+ <%= reply.content.html_safe%> +
+
+ <%= format_time(reply.created_on) %> + + <% if reply.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> + <% end %> + + +
+

+
+
+
+ <% end %> +
+ + <%# end %> +
+ <% if !@article.locked? && User.current.logged?%> +
+ +
+
+ <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> + <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> + <% end %> +
+
+
+ <% end %> +
+
+ diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index c9d333e6d..aedf62eaf 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -1,224 +1,229 @@ - -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: true, prettify: false, init_activity: true) %> - <%= javascript_include_tag 'blog' %> -<% end %> - - - - -
-
-
- <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> -
-
- <% if User.current && @article.author.id == User.current.id%> -
-
    -
  • -
      -
    • - 重设大纲 -
      • -
    • - <%= link_to( - '取消大纲', - {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id}, - :method => :delete, - :data => {:confirm => '您确定要取消么？'}, - :class => 'postOptionLink' - ) if User.current && User.current.id == @article.author.id %> -
      • -
    -
    • -
-
- - - - - - - - - <%end%> -
- 主题: <%= @article.title%> -
-
- -
- <% if @article.try(:author).try(:realname) == ' ' %> - <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% else %> - <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% end %> -
-
<%= format_time( @article.created_on)%>
-
-
- <%= @article.content.html_safe%> -
-
-
- <%#= link_to_attachments_course @topic, :author => false %> - <% if @article.attachments.any?%> - <% options = {:author => true, :deletable => false} %> - <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %> - <% end %> -
-
-
-
-
- <% count=0 %> - <% if @article.parent %> - <% count=@article.parent.children.count%> - <% else %> - <% count=@article.children.count%> - <% end %> -
- <% unless count == 0 %> -
-
回复（<%=count %>）
-
- -
-
- <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %> - -
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
-
-
- <% if reply.try(:author).try(:realname) == ' ' %> - <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% else %> - <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% end %> -
-
- <%= reply.content.html_safe%> -
-
- <%= format_time(reply.created_on) %> - -
-

-
-
-
- <% end %> -
- - <% end %> -
- <% if !@article.locked? && User.current.logged?%> - - - - - - - - - - - - - -
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %>
-
-
- <%= form_for 'blog_comment',:url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%> - - - - - - -
- -
-

- <% end%> -
-
-
-
-
- <% end %> -
-
- + +
+
+
+ <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> +
+
+ <% if User.current && @article.author.id == User.current.id%> +
+
    +
  • +
      +
    • + 重设大纲 +
      • +
    • + <%= link_to( + '取消大纲', + {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id}, + :method => :delete, + :data => {:confirm => '您确定要取消么？'}, + :class => 'postOptionLink' + ) if User.current && User.current.id == @article.author.id %> +
      • +
    +
    • +
+
+ + + + + + + + + <%end%> +
+ 主题: <%= @article.title%> +
+
+ +
+ <% if @article.try(:author).try(:realname) == ' ' %> + <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% else %> + <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% end %> +
+
<%= format_time( @article.created_on)%>
+
+
+ <%= @article.content.html_safe%> +
+
+
+ <%#= link_to_attachments_course @topic, :author => false %> + <% if @article.attachments.any?%> + <% options = {:author => true, :deletable => false} %> + <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %> + <% end %> +
+
+
+
+
+ <% count=0 %> + <% if @article.parent %> + <% count=@article.parent.children.count%> + <% else %> + <% count=@article.children.count%> + <% end %> +
+ <% unless count == 0 %> +
+
回复（<%=count %>）
+
+ +
+
+ <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %> + +
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% end %> +
+
+ <%= reply.content.html_safe%> +
+
+ <%= format_time(reply.created_on) %> + +
+

+
+
+
+ <% end %> +
+ + <% end %> +
+ <% if !@article.locked? && User.current.logged?%> + + + + + + + + + + + + + +
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for 'blog_comment',:url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%> + + + + + + +
+ +
+

+ <% end%> +
+
+
+
+
+ <% end %> +
+
+ \ No newline at end of file diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 3028f3369..f5b171d8b 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -139,8 +139,13 @@
\ No newline at end of file diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 022b8c76b..57a75dde6 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -171,8 +171,13 @@
+ diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb index fab0f752e..7cc60abf9 100644 --- a/app/views/messages/_org_subfield_show.html.erb +++ b/app/views/messages/_org_subfield_show.html.erb @@ -1,208 +1,213 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> -<% end %> - - - - -
-
-
- <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %> -
-
- <% if User.current.logged? %> - - <%end%> -
- 主题: <%= @topic.subject%> -
-
- -
- <% if @topic.try(:author).try(:realname) == ' ' %> - <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% else %> - <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% end %> -
-
<%= format_time( @topic.created_on)%>
-
-
- <%= @topic.content.html_safe%> -
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %> -
-
-
-
-
-
- <% unless @replies.empty? %> -
-
回复（<%=@reply_count %>）
-
- -
-
- <% @replies.each_with_index do |reply,i| %> - -
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
-
-
- <% if reply.try(:author).try(:realname) == ' ' %> - <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% else %> - <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% end %> -
-
- <%= reply.content.html_safe%> -
-
- <%= format_time(reply.created_on) %> - -
-

-
-
-
- <% end %> -
- - <% end %> -
- <% if !@topic.locked? && authorize_for_course('messages', 'reply') %> -
- -
-
- <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %> - <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %> - <% end %> -
-
-
- <% end %> -
-
- +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> + + + + +
+
+
+ <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %> +
+
+ <% if User.current.logged? %> + + <%end%> +
+ 主题: <%= @topic.subject%> +
+
+ +
+ <% if @topic.try(:author).try(:realname) == ' ' %> + <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% else %> + <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% end %> +
+
<%= format_time( @topic.created_on)%>
+
+
+ <%= @topic.content.html_safe%> +
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %> +
+
+
+
+
+
+ <% unless @replies.empty? %> +
+
回复（<%=@reply_count %>）
+
+ +
+
+ <% @replies.each_with_index do |reply,i| %> + +
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% end %> +
+
+ <%= reply.content.html_safe%> +
+
+ <%= format_time(reply.created_on) %> + +
+

+
+
+
+ <% end %> +
+ + <% end %> +
+ <% if !@topic.locked? && authorize_for_course('messages', 'reply') %> +
+ +
+
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %> + <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %> + <% end %> +
+
+
+ <% end %> +
+
+ diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index a0e9db171..988902b81 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -227,8 +227,13 @@
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 05a430d57..3236aa6a0 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -184,8 +184,13 @@
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb index 3189b03bf..0a7770ac0 100644 --- a/app/views/news/_organization_show.html.erb +++ b/app/views/news/_organization_show.html.erb @@ -1,181 +1,186 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> -<% end %> - - - - -
-
-
- <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %> -
-
- <% if User.current.logged? %> - - <%end%> -
- 通知: <%= @news.title%> -
-
- -
- <% if @news.try(:author).try(:realname) == ' ' %> - <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% else %> - <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> - <% end %> -
-
<%= format_time( @news.created_on)%>
-
-
- <%= @news.description.html_safe%> -
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %> -
-
-
-
-
-
- <% unless @comments.empty? %> -
-
回复（<%=@comments.count %>）
-
-
-
- <% @comments.each_with_index do |reply,i| %> - -
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
-
-
- <% if reply.try(:author).try(:realname) == ' ' %> - <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% else %> - <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% end %> -
-
- <%= reply.comments.html_safe%> -
-
- <%= format_time(reply.created_on) %> - -
-

-
-
-
- <% end %> -
- - <% end %> -
- <% if @news.commentable? %> -
- -
-
- <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %> -
- <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%= f.kindeditor :comments, :editor_id => 'comment_editor', - :owner_id => @comment.nil? ? 0: @comment.id, - :owner_type => OwnerTypeHelper::COMMENT, - :width => '99%', - :height => 100, - :minHeight=>100, - :input_html => { :id => 'comment_content', - :class => 'talk_text fl', - :maxlength => 5000 }%> -
-

-

- - <%= l(:label_cancel_with_space) %> - - - <%= l(:label_comment_with_space) %> - -

- <% end %> -
-
-
- <% end %> -
-
- +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> + + + + +
+
+
+ <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %> +
+
+ <% if User.current.logged? %> + + <%end%> +
+ 通知: <%= @news.title%> +
+
+ +
+ <% if @news.try(:author).try(:realname) == ' ' %> + <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% else %> + <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% end %> +
+
<%= format_time( @news.created_on)%>
+
+
+ <%= @news.description.html_safe%> +
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %> +
+
+
+
+
+
+ <% unless @comments.empty? %> +
+
回复（<%=@comments.count %>）
+
+
+
+ <% @comments.each_with_index do |reply,i| %> + +
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% end %> +
+
+ <%= reply.comments.html_safe%> +
+
+ <%= format_time(reply.created_on) %> + +
+

+
+
+
+ <% end %> +
+ + <% end %> +
+ <% if @news.commentable? %> +
+ +
+
+ <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %> +
+ <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + <%= f.kindeditor :comments, :editor_id => 'comment_editor', + :owner_id => @comment.nil? ? 0: @comment.id, + :owner_type => OwnerTypeHelper::COMMENT, + :width => '99%', + :height => 100, + :minHeight=>100, + :input_html => { :id => 'comment_content', + :class => 'talk_text fl', + :maxlength => 5000 }%> +
+

+

+ + <%= l(:label_cancel_with_space) %> + + + <%= l(:label_comment_with_space) %> + +

+ <% end %> +
+
+
+ <% end %> +
+
+ diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index 144b93b28..74378e3fd 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -184,8 +184,13 @@
From dab99eb044f06ce78db5d809228706ae5a65209a Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 2 Feb 2016 13:38:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index e59c8359d..3d52206a4 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -3,19 +3,6 @@ <%= javascript_include_tag 'forum' %> <% end %> - - \ No newline at end of file diff --git a/app/views/users/user_import_homeworks.js.erb b/app/views/users/user_import_homeworks.js.erb index 3be46e119..ac6665800 100644 --- a/app/views/users/user_import_homeworks.js.erb +++ b/app/views/users/user_import_homeworks.js.erb @@ -1,4 +1,6 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>'); showModal('ajax-modal', '1040px'); $('#ajax-modal').siblings().remove(); -$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9"); \ No newline at end of file +var mTop = ($(window).height()-646)/2; +var mLeft = ($(window).width()-1054)/2; +$('#ajax-modal').parent().css("border","3px solid #269ac9").css("top","mTop").css("left","mLeft").css("position","fixed"); \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 32370c4a7..8951e8c1f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1374,7 +1374,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do t.integer "changeset_num", :default => 0 t.integer "board_message_num", :default => 0 t.integer "board_num", :default => 0 - t.integer "act_num", :default => 0 t.integer "attach_num", :default => 0 t.datetime "commit_time" end @@ -1863,25 +1862,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" - create_table "user_wechats", :force => true do |t| - t.integer "subscribe" - t.string "openid" - t.string "nickname" - t.integer "sex" - t.string "language" - t.string "city" - t.string "province" - t.string "country" - t.string "headimgurl" - t.string "subscribe_time" - t.string "unionid" - t.string "remark" - t.integer "groupid" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "users", :force => true do |t| t.string "login", :default => "", :null => false t.string "hashed_password", :limit => 40, :default => "", :null => false @@ -1957,14 +1937,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do t.datetime "updated_at", :null => false end - create_table "wechat_logs", :force => true do |t| - t.string "openid", :null => false - t.text "request_raw" - t.text "response_raw" - t.text "session_raw" - t.datetime "created_at", :null => false - end - create_table "wiki_content_versions", :force => true do |t| t.integer "wiki_content_id", :null => false t.integer "page_id", :null => false