From 3d2ac4b59f8447ddb6fbd0965ca4197fffc8a7c0 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Sun, 6 Dec 2015 15:03:36 +0800 Subject: [PATCH] =?UTF-8?q?KE=E5=BC=95=E7=94=A8=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8import=5Fke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/messages.html.erb | 4 +++- app/views/bids/edit.html.erb | 6 ++++-- app/views/blog_comments/_edit.html.erb | 8 ++++++-- app/views/blog_comments/_new.html.erb | 5 ++++- app/views/blog_comments/_reply_form.html.erb | 4 +++- app/views/blog_comments/show.html.erb | 5 ++++- app/views/blogs/_article_list.html.erb | 6 +++++- app/views/blogs/index.html.erb | 3 +-- app/views/boards/_course_new.html.erb | 5 ++++- app/views/boards/_course_show.html.erb | 6 +++++- app/views/boards/show.html.erb | 5 +++-- app/views/courses/_course_activity.html.erb | 5 ++++- app/views/courses/_courses_jours.html.erb | 6 +++++- app/views/courses/syllabus.html.erb | 7 ++++++- app/views/forums/edit.html.erb | 5 ++++- app/views/forums/new.html.erb | 3 ++- app/views/forums/show.html.erb | 6 +++++- app/views/issues/_edit.html.erb | 6 +++++- app/views/issues/new.html.erb | 6 +++++- app/views/layouts/base_forums.html.erb | 5 ++++- app/views/layouts/base_projects.html.erb | 1 + app/views/memos/edit.html.erb | 7 ++++++- app/views/memos/new.html.erb | 8 ++++++-- app/views/memos/show.html.erb | 7 ++++++- app/views/messages/_course_show.html.erb | 5 ++++- app/views/messages/_form_course.html.erb | 5 ++++- app/views/news/_course_form.html.erb | 5 ++++- app/views/news/_course_show.html.erb | 5 ++++- app/views/news/_project_form.html.erb | 5 ++++- app/views/news/edit.html.erb | 5 ++++- app/views/org_document_comments/_new.html.erb | 5 ++++- app/views/org_document_comments/edit.html.erb | 5 ++++- app/views/org_document_comments/index.html.erb | 5 ++++- app/views/org_document_comments/new.html.erb | 5 ++++- app/views/org_document_comments/show.html.erb | 6 +++++- app/views/organizations/show.html.erb | 6 +++++- app/views/projects/_project_jours.html.erb | 5 ++++- app/views/users/_user_activities.html.erb | 5 ++++- app/views/users/_user_homework_form.html.erb | 3 ++- app/views/users/_user_homework_list.html.erb | 5 ++++- app/views/users/_user_jours.html.erb | 5 ++++- app/views/users/user_newfeedback.html.erb | 6 +++++- 42 files changed, 174 insertions(+), 46 deletions(-) diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb index f87741dd9..e4d053d49 100644 --- a/app/views/admin/messages.html.erb +++ b/app/views/admin/messages.html.erb @@ -1,4 +1,6 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false) %> +<% end %>

<%=l(:label_system_message)%>


diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb index 554702d97..9fb8cbc59 100644 --- a/app/views/bids/edit.html.erb +++ b/app/views/bids/edit.html.erb @@ -1,5 +1,7 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %> -<%= stylesheet_link_tag 'prettify'%> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: true) %> +<% end %> + <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %> <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %> <% end %> diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb index 375c948d4..c7065ece4 100644 --- a/app/views/blog_comments/_edit.html.erb +++ b/app/views/blog_comments/_edit.html.erb @@ -1,9 +1,13 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> + <%= javascript_include_tag 'blog' %> +<% end %> +
- +

diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb index 48f152c4e..863760b35 100644 --- a/app/views/blog_comments/_new.html.erb +++ b/app/views/blog_comments/_new.html.erb @@ -1,4 +1,7 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> + <%= javascript_include_tag 'blog' %> +<% end %>
diff --git a/app/views/blog_comments/_reply_form.html.erb b/app/views/blog_comments/_reply_form.html.erb index cc4c0e952..32f4333c2 100644 --- a/app/views/blog_comments/_reply_form.html.erb +++ b/app/views/blog_comments/_reply_form.html.erb @@ -1,4 +1,6 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> +<% end %>
  • <%= f.text_field :title, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge({ hidden: "hidden"}) %>
    diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index cf24f0f2d..e46a7249f 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -1,4 +1,7 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> + <%= javascript_include_tag "init_activity_KindEditor",'blog' %> +<% end %> -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %> +<%= import_ke(enable_at: false, prettify: false) %> <%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %> diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 61bbb85d2..e4cf57ae3 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -1,4 +1,7 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> +<% end %> + <%= error_messages_for 'message' %>
    diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 3fb97bd9d..306a0c7ce 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -1,4 +1,8 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false) %> + <%= javascript_include_tag "init_activity_KindEditor" %> +<% end %> + -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> + + diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index bb3421cba..229419b60 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -1,4 +1,9 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %> + +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> + <%= javascript_include_tag 'blog' %> +<% end %> + -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> +
    <% reply_allow = JournalsForMessage.create_by_user? User.current %>

    <%= l(:label_user_response) %>

    diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 669953afa..4f1d3a5d8 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -1,4 +1,7 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> + -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> +
    <% reply_allow = JournalsForMessage.create_by_user? User.current %> diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index b94e33b16..2eef799e7 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -1,4 +1,8 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> + <%= javascript_include_tag "user" %> +<% end %> +