From 756aae0cf2f58b567d1d9f093ed20b4f61b5ae85 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 10 Sep 2015 15:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83issue=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=B9=B6=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/edit.html.erb | 3 +- app/views/layouts/base_projects.html.erb | 6 +- .../lib/rails_kindeditor/helper.rb | 6 +- public/assets/kindeditor/kindeditor.js | 8 +- public/assets/kindeditor/plugins/code/code.js | 5 +- .../kindeditor/plugins/code/previewcode.css | 76 + public/javascripts/prettify.js | 1655 +++++++++++++++++ public/stylesheets/prettify.css | 77 + 8 files changed, 1824 insertions(+), 12 deletions(-) create mode 100644 public/assets/kindeditor/plugins/code/previewcode.css create mode 100644 public/javascripts/prettify.js create mode 100644 public/stylesheets/prettify.css diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb index da3d19267..554702d97 100644 --- a/app/views/bids/edit.html.erb +++ b/app/views/bids/edit.html.erb @@ -1,4 +1,5 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %> +<%= stylesheet_link_tag 'prettify'%> <%= 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/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 425b720d9..ca1b324a4 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -12,8 +12,8 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2','header' %> - <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %> + <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -21,7 +21,7 @@ - +