From 97f9d4fa60ea0ea1934fc7c988e2797a3bf69e20 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 10 Sep 2015 10:26:16 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E5=B8=88?= =?UTF-8?q?=E8=8A=82=E7=A5=9D=E7=A6=8F=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 + app/views/users/show.html.erb | 66 +++++++++++------------ public/images/TeachersDay.jpg | Bin 0 -> 34823 bytes public/stylesheets/new_user.css | 5 +- 4 files changed, 38 insertions(+), 35 deletions(-) create mode 100644 public/images/TeachersDay.jpg diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index ae8fd774e..3ab40d101 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -27,6 +27,8 @@
+
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 13f2518e1..aab715b16 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,41 +1,41 @@ -
+
最新动态
    -
  • -
      -
    • -
        -
      • 课程动态
        • -
      • <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> -
        • -
      • <%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%> - -
      • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%> -
      • <%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> - - -
      -
      • -
    • -
        -
      • 项目动态
        • -
      • <%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> -
      • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> - -
      -
      • -
    • -
        -
      • 更多
        • -
      • <%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%> -
      • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%> -
      -
      • +
    • +
        +
      • +
          +
        • 课程动态
          • +
        • <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> +
          • +
        • <%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%> + +
        • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%> +
        • <%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> + + +
        +
        • +
      • +
          +
        • 项目动态
          • +
        • <%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> +
        • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> + +
        +
        • +
      • +
          +
        • 更多
          • +
        • <%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%> +
        • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
      -
+ + +
<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> diff --git a/public/images/TeachersDay.jpg b/public/images/TeachersDay.jpg new file mode 100644 index 0000000000000000000000000000000000000000..036a6f7299e301b3b7796e7ab8aa0d2ca336204a GIT binary patch literal 34823 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 fgDea#T+l&eXQ5rOxxqsjjQ&)sXx literal 0 HcmV?d00001 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 0515da364..b6e1919f2 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -465,8 +465,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- /*.navHomepageProfile ul li ul {display:none;} .navHomepageProfile ul li:hover ul {display:block;}*/ .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} -.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;} -.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;} +.homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;} +.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px;} .homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;} .homepagePortraitImage:hover {border:1px solid #269ac9;} .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} @@ -505,6 +505,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} .homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;} +.homepageRightBannerImg{width:1000px; margin:0px auto; height: 60px; margin-top: 10px; background:url(../images/TeachersDay.jpg)} .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} From fce5405c419d717a200c72e7e381350164876fc7 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 10 Sep 2015 14:44:25 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 ++-- public/stylesheets/new_user.css | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 4af5742a9..949fb7f83 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -5,7 +5,7 @@

- +

@@ -34,7 +34,7 @@
- <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %> + <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index b6e1919f2..a37123d76 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -856,6 +856,8 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;} .w708{width: 708px;} .w712{width:712px;max-width:712px;min-width: 712px;} .w720{width:721px;} +.w709{width: 709px;} +.w701{width: 701px;} a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;} a.FilesBtn{ background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} 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 03/18] =?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 @@ - +
<% if User.current.logged? %> <%= render :partial => 'layouts/logined_header' %> diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb index 6ed45d92e..f30ee2236 100644 --- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb +++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb @@ -9,7 +9,8 @@ module RailsKindeditor output << text_area_tag(name, content, input_html) output << javascript_tag(js_replace(id, options.merge(window_onload: 'true', :autoHeightMode=>true, - afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'))) + afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})' + ))) end def kindeditor(name, method, options = {}) @@ -20,7 +21,8 @@ module RailsKindeditor output_buffer << build_text_area_tag(name, method, self, options, input_html) output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true', :autoHeightMode=>true, - afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'))) + afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})' + ))) end def kindeditor_upload_json_path(*args) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 26cd088c4..bc45cd91f 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -258,13 +258,13 @@ K.options = { fullscreenShortcut : false, bodyClass : 'ke-content', indentChar : '\t', - cssPath : '', + cssPath : K.basePath +'plugins/code/previewcode.css', cssData : '', minWidth : 650, minHeight : 100, minChangeSize : 50, zIndex : 811213, - items : [ 'emoticons', + items : ['code', 'emoticons', 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'media',"more" @@ -4986,7 +4986,7 @@ KEditor.prototype = { htmlList.unshift('
') htmlList.push('
') var htmlListFull = []; - var fullItems = [ + var fullItems = ['code', 'emoticons', 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', @@ -5069,6 +5069,7 @@ KEditor.prototype = { } self.updateState(); self.addBookmark(); + prettyPrint("",self.edit.doc.body); if (self.options.afterChange) { self.options.afterChange.call(self); } @@ -5550,6 +5551,7 @@ _plugin('core', function(K) { self.afterSetHtml(function() { if (self.options.afterChange) { self.options.afterChange.call(self); + } }); self.afterCreate(function() { diff --git a/public/assets/kindeditor/plugins/code/code.js b/public/assets/kindeditor/plugins/code/code.js index 85e42259b..760f20bc7 100644 --- a/public/assets/kindeditor/plugins/code/code.js +++ b/public/assets/kindeditor/plugins/code/code.js @@ -23,10 +23,9 @@ KindEditor.plugin('code', function(K) { '', '', '', - '', '', '', - '', + '', '', '', '', @@ -46,7 +45,7 @@ KindEditor.plugin('code', function(K) { var type = K('.ke-code-type', dialog.div).val(), code = textarea.val(), cls = type === '' ? '' : ' lang-' + type, - html = '
\n' + K.escape(code) + '
'; + html = '
\n' + K.escape(code) + '
'; if (K.trim(code) === '') { alert(lang.pleaseInput); textarea[0].focus(); diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css new file mode 100644 index 000000000..ce3084a7c --- /dev/null +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -0,0 +1,76 @@ +/* Pretty printing styles. Used with prettify.js. */ + +/* SPAN elements with the classes below are added by prettyprint. */ +.pln { color: #000 } /* plain text */ + +@media screen { + .str { color: #080 } /* string content */ + .kwd { color: #008 } /* a keyword */ + .com { color: #800 } /* a comment */ + .typ { color: #606 } /* a type name */ + .lit { color: #066 } /* a literal value */ + /* punctuation, lisp open bracket, lisp close bracket */ + .pun, .opn, .clo { color: #660 } + .tag { color: #008 } /* a markup tag name */ + .atn { color: #606 } /* a markup attribute name */ + .atv { color: #080 } /* a markup attribute value */ + .dec, .var { color: #606 } /* a declaration; a variable name */ + .fun { color: red } /* a function name */ +} + +/* Use higher contrast and text-weight for printable form. */ +@media print, projection { + .str { color: #060 } + .kwd { color: #006; font-weight: bold } + .com { color: #600; font-style: italic } + .typ { color: #404; font-weight: bold } + .lit { color: #044 } + .pun, .opn, .clo { color: #440 } + .tag { color: #006; font-weight: bold } + .atn { color: #404 } + .atv { color: #060 } +} + +/* Put a border around prettyprinted code snippets. */ +pre.prettyprint { padding: 2px; + border-left:1px solid #ccc; + border-bottom: 1px solid #ccc; + border-right: 1px solid #ccc, +border-top: 1px solid #ccc } + +pre li,ul,ol { + list-style-type: none; +} +/* Specify class=linenums on a pre to get line numbering */ +ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */ +li.L0, +li.L1, +li.L2, +li.L3, +li.L5, +li.L6, +li.L7, +li.L8 { list-style-type: none } +/* Alternate shading for lines */ +li.L1, +li.L3, +li.L5, +li.L7, +li.L9 { background: #eee } + +.prettyprint *{font-family:'courier new',monospace;} +/*.prettyprint .com { color: #93a1a1; }*/ +/*.prettyprint .lit { color: #AE81FF; }*/ +/*.prettyprint .pun,*/ +/*.prettyprint .opn,*/ +/*.prettyprint .clo { color: #F8F8F2; }*/ +/*.prettyprint .fun { color: #dc322f; }*/ +/*.prettyprint .str,*/ +/*.prettyprint .atv { color: #E6DB74; }*/ +/*.prettyprint .kwd,*/ +/*.prettyprint .tag { color: #F92659; }*/ +/*.prettyprint .typ,*/ +/*.prettyprint .atn,*/ +/*.prettyprint .dec,*/ +/*.prettyprint .var { color: #A6E22E; }*/ +/*.prettyprint .pln { color: #66D9EF; }*/ diff --git a/public/javascripts/prettify.js b/public/javascripts/prettify.js new file mode 100644 index 000000000..10c9fb73d --- /dev/null +++ b/public/javascripts/prettify.js @@ -0,0 +1,1655 @@ +// Copyright (C) 2006 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +/** + * @fileoverview + * some functions for browser-side pretty printing of code contained in html. + * + *

+ * For a fairly comprehensive set of languages see the + * README + * file that came with this source. At a minimum, the lexer should work on a + * number of languages including C and friends, Java, Python, Bash, SQL, HTML, + * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk + * and a subset of Perl, but, because of commenting conventions, doesn't work on + * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. + *

+ * Usage:

    + *
  1. include this source file in an html page via + * {@code } + *
  2. define style rules. See the example page for examples. + *
  3. mark the {@code 
    } and {@code } tags in your source with
+ *    {@code class=prettyprint.}
+ *    You can also use the (html deprecated) {@code } tag, but the pretty
+ *    printer needs to do more substantial DOM manipulations to support that, so
+ *    some css styles may not be preserved.
+ * </ol>
+ * That's it.  I wanted to keep the API as simple as possible, so there's no
+ * need to specify which language the code is in, but if you wish, you can add
+ * another class to the {@code <pre>} or {@code <code>} element to specify the
+ * language, as in {@code <pre class="prettyprint lang-java">}.  Any class that
+ * starts with "lang-" followed by a file extension, specifies the file type.
+ * See the "lang-*.js" files in this directory for code that implements
+ * per-language file handlers.
+ * <p>
+ * Change log:<br>
+ * cbeust, 2006/08/22
+ * <blockquote>
+ *   Java annotations (start with "@") are now captured as literals ("lit")
+ * </blockquote>
+ * @requires console
+ */
+
+// JSLint declarations
+/*global console, document, navigator, setTimeout, window, define */
+
+/** @define {boolean} */
+var IN_GLOBAL_SCOPE = true;
+
+/**
+ * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
+ * UI events.
+ * If set to {@code false}, {@code prettyPrint()} is synchronous.
+ */
+window['PR_SHOULD_USE_CONTINUATION'] = true;
+
+/**
+ * Pretty print a chunk of code.
+ * @param {string} sourceCodeHtml The HTML to pretty print.
+ * @param {string} opt_langExtension The language name to use.
+ *     Typically, a filename extension like 'cpp' or 'java'.
+ * @param {number|boolean} opt_numberLines True to number lines,
+ *     or the 1-indexed number of the first line in sourceCodeHtml.
+ * @return {string} code as html, but prettier
+ */
+var prettyPrintOne;
+/**
+ * Find all the {@code <pre>} and {@code <code>} tags in the DOM with
+ * {@code class=prettyprint} and prettify them.
+ *
+ * @param {Function} opt_whenDone called when prettifying is done.
+ * @param {HTMLElement|HTMLDocument} opt_root an element or document
+ *   containing all the elements to pretty print.
+ *   Defaults to {@code document.body}.
+ */
+var prettyPrint;
+
+
+(function () {
+  var win = window;
+  // Keyword lists for various languages.
+  // We use things that coerce to strings to make them compact when minified
+  // and to defeat aggressive optimizers that fold large string constants.
+  var FLOW_CONTROL_KEYWORDS = ["break,continue,do,else,for,if,return,while"];
+  var C_KEYWORDS = [FLOW_CONTROL_KEYWORDS,"auto,case,char,const,default," + 
+      "double,enum,extern,float,goto,inline,int,long,register,short,signed," +
+      "sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];
+  var COMMON_KEYWORDS = [C_KEYWORDS,"catch,class,delete,false,import," +
+      "new,operator,private,protected,public,this,throw,true,try,typeof"];
+  var CPP_KEYWORDS = [COMMON_KEYWORDS,"alignof,align_union,asm,axiom,bool," +
+      "concept,concept_map,const_cast,constexpr,decltype,delegate," +
+      "dynamic_cast,explicit,export,friend,generic,late_check," +
+      "mutable,namespace,nullptr,property,reinterpret_cast,static_assert," +
+      "static_cast,template,typeid,typename,using,virtual,where"];
+  var JAVA_KEYWORDS = [COMMON_KEYWORDS,
+      "abstract,assert,boolean,byte,extends,final,finally,implements,import," +
+      "instanceof,interface,null,native,package,strictfp,super,synchronized," +
+      "throws,transient"];
+  var CSHARP_KEYWORDS = [JAVA_KEYWORDS,
+      "as,base,by,checked,decimal,delegate,descending,dynamic,event," +
+      "fixed,foreach,from,group,implicit,in,internal,into,is,let," +
+      "lock,object,out,override,orderby,params,partial,readonly,ref,sbyte," +
+      "sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort," +
+      "var,virtual,where"];
+  var COFFEE_KEYWORDS = "all,and,by,catch,class,else,extends,false,finally," +
+      "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
+      "throw,true,try,unless,until,when,while,yes";
+  var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
+      "debugger,eval,export,function,get,null,set,undefined,var,with," +
+      "Infinity,NaN"];
+  var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +
+      "goto,if,import,last,local,my,next,no,our,print,package,redo,require," +
+      "sub,undef,unless,until,use,wantarray,while,BEGIN,END";
+  var PYTHON_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "and,as,assert,class,def,del," +
+      "elif,except,exec,finally,from,global,import,in,is,lambda," +
+      "nonlocal,not,or,pass,print,raise,try,with,yield," +
+      "False,True,None"];
+  var RUBY_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "alias,and,begin,case,class," +
+      "def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo," +
+      "rescue,retry,self,super,then,true,undef,unless,until,when,yield," +
+      "BEGIN,END"];
+   var RUST_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "as,assert,const,copy,drop," +
+      "enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv," +
+      "pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"];
+  var SH_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "case,done,elif,esac,eval,fi," +
+      "function,in,local,set,then,until"];
+  var ALL_KEYWORDS = [
+      CPP_KEYWORDS, CSHARP_KEYWORDS, JSCRIPT_KEYWORDS, PERL_KEYWORDS,
+      PYTHON_KEYWORDS, RUBY_KEYWORDS, SH_KEYWORDS];
+  var C_TYPES = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;
+
+  // token style names.  correspond to css classes
+  /**
+   * token style for a string literal
+   * @const
+   */
+  var PR_STRING = 'str';
+  /**
+   * token style for a keyword
+   * @const
+   */
+  var PR_KEYWORD = 'kwd';
+  /**
+   * token style for a comment
+   * @const
+   */
+  var PR_COMMENT = 'com';
+  /**
+   * token style for a type
+   * @const
+   */
+  var PR_TYPE = 'typ';
+  /**
+   * token style for a literal value.  e.g. 1, null, true.
+   * @const
+   */
+  var PR_LITERAL = 'lit';
+  /**
+   * token style for a punctuation string.
+   * @const
+   */
+  var PR_PUNCTUATION = 'pun';
+  /**
+   * token style for plain text.
+   * @const
+   */
+  var PR_PLAIN = 'pln';
+
+  /**
+   * token style for an sgml tag.
+   * @const
+   */
+  var PR_TAG = 'tag';
+  /**
+   * token style for a markup declaration such as a DOCTYPE.
+   * @const
+   */
+  var PR_DECLARATION = 'dec';
+  /**
+   * token style for embedded source.
+   * @const
+   */
+  var PR_SOURCE = 'src';
+  /**
+   * token style for an sgml attribute name.
+   * @const
+   */
+  var PR_ATTRIB_NAME = 'atn';
+  /**
+   * token style for an sgml attribute value.
+   * @const
+   */
+  var PR_ATTRIB_VALUE = 'atv';
+
+  /**
+   * A class that indicates a section of markup that is not code, e.g. to allow
+   * embedding of line numbers within code listings.
+   * @const
+   */
+  var PR_NOCODE = 'nocode';
+
+  
+  
+  /**
+   * A set of tokens that can precede a regular expression literal in
+   * javascript
+   * http://web.archive.org/web/20070717142515/http://www.mozilla.org/js/language/js20/rationale/syntax.html
+   * has the full list, but I've removed ones that might be problematic when
+   * seen in languages that don't support regular expression literals.
+   *
+   * <p>Specifically, I've removed any keywords that can't precede a regexp
+   * literal in a syntactically legal javascript program, and I've removed the
+   * "in" keyword since it's not a keyword in many languages, and might be used
+   * as a count of inches.
+   *
+   * <p>The link above does not accurately describe EcmaScript rules since
+   * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works
+   * very well in practice.
+   *
+   * @private
+   * @const
+   */
+  var REGEXP_PRECEDER_PATTERN = '(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*';
+  
+  // CAVEAT: this does not properly handle the case where a regular
+  // expression immediately follows another since a regular expression may
+  // have flags for case-sensitivity and the like.  Having regexp tokens
+  // adjacent is not valid in any language I'm aware of, so I'm punting.
+  // TODO: maybe style special characters inside a regexp as punctuation.
+
+  /**
+   * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally
+   * matches the union of the sets of strings matched by the input RegExp.
+   * Since it matches globally, if the input strings have a start-of-input
+   * anchor (/^.../), it is ignored for the purposes of unioning.
+   * @param {Array.<RegExp>} regexs non multiline, non-global regexs.
+   * @return {RegExp} a global regex.
+   */
+  function combinePrefixPatterns(regexs) {
+    var capturedGroupIndex = 0;
+  
+    var needToFoldCase = false;
+    var ignoreCase = false;
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.ignoreCase) {
+        ignoreCase = true;
+      } else if (/[a-z]/i.test(regex.source.replace(
+                     /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) {
+        needToFoldCase = true;
+        ignoreCase = false;
+        break;
+      }
+    }
+  
+    var escapeCharToCodeUnit = {
+      'b': 8,
+      't': 9,
+      'n': 0xa,
+      'v': 0xb,
+      'f': 0xc,
+      'r': 0xd
+    };
+  
+    function decodeEscape(charsetPart) {
+      var cc0 = charsetPart.charCodeAt(0);
+      if (cc0 !== 92 /* \\ */) {
+        return cc0;
+      }
+      var c1 = charsetPart.charAt(1);
+      cc0 = escapeCharToCodeUnit[c1];
+      if (cc0) {
+        return cc0;
+      } else if ('0' <= c1 && c1 <= '7') {
+        return parseInt(charsetPart.substring(1), 8);
+      } else if (c1 === 'u' || c1 === 'x') {
+        return parseInt(charsetPart.substring(2), 16);
+      } else {
+        return charsetPart.charCodeAt(1);
+      }
+    }
+  
+    function encodeEscape(charCode) {
+      if (charCode < 0x20) {
+        return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16);
+      }
+      var ch = String.fromCharCode(charCode);
+      return (ch === '\\' || ch === '-' || ch === ']' || ch === '^')
+          ? "\\" + ch : ch;
+    }
+  
+    function caseFoldCharset(charSet) {
+      var charsetParts = charSet.substring(1, charSet.length - 1).match(
+          new RegExp(
+              '\\\\u[0-9A-Fa-f]{4}'
+              + '|\\\\x[0-9A-Fa-f]{2}'
+              + '|\\\\[0-3][0-7]{0,2}'
+              + '|\\\\[0-7]{1,2}'
+              + '|\\\\[\\s\\S]'
+              + '|-'
+              + '|[^-\\\\]',
+              'g'));
+      var ranges = [];
+      var inverse = charsetParts[0] === '^';
+  
+      var out = ['['];
+      if (inverse) { out.push('^'); }
+  
+      for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) {
+        var p = charsetParts[i];
+        if (/\\[bdsw]/i.test(p)) {  // Don't muck with named groups.
+          out.push(p);
+        } else {
+          var start = decodeEscape(p);
+          var end;
+          if (i + 2 < n && '-' === charsetParts[i + 1]) {
+            end = decodeEscape(charsetParts[i + 2]);
+            i += 2;
+          } else {
+            end = start;
+          }
+          ranges.push([start, end]);
+          // If the range might intersect letters, then expand it.
+          // This case handling is too simplistic.
+          // It does not deal with non-latin case folding.
+          // It works for latin source code identifiers though.
+          if (!(end < 65 || start > 122)) {
+            if (!(end < 65 || start > 90)) {
+              ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]);
+            }
+            if (!(end < 97 || start > 122)) {
+              ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]);
+            }
+          }
+        }
+      }
+  
+      // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
+      // -> [[1, 12], [14, 14], [16, 17]]
+      ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1]  - a[1]); });
+      var consolidatedRanges = [];
+      var lastRange = [];
+      for (var i = 0; i < ranges.length; ++i) {
+        var range = ranges[i];
+        if (range[0] <= lastRange[1] + 1) {
+          lastRange[1] = Math.max(lastRange[1], range[1]);
+        } else {
+          consolidatedRanges.push(lastRange = range);
+        }
+      }
+  
+      for (var i = 0; i < consolidatedRanges.length; ++i) {
+        var range = consolidatedRanges[i];
+        out.push(encodeEscape(range[0]));
+        if (range[1] > range[0]) {
+          if (range[1] + 1 > range[0]) { out.push('-'); }
+          out.push(encodeEscape(range[1]));
+        }
+      }
+      out.push(']');
+      return out.join('');
+    }
+  
+    function allowAnywhereFoldCaseAndRenumberGroups(regex) {
+      // Split into character sets, escape sequences, punctuation strings
+      // like ('(', '(?:', ')', '^'), and runs of characters that do not
+      // include any of the above.
+      var parts = regex.source.match(
+          new RegExp(
+              '(?:'
+              + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]'  // a character set
+              + '|\\\\u[A-Fa-f0-9]{4}'  // a unicode escape
+              + '|\\\\x[A-Fa-f0-9]{2}'  // a hex escape
+              + '|\\\\[0-9]+'  // a back-reference or octal escape
+              + '|\\\\[^ux0-9]'  // other escape sequence
+              + '|\\(\\?[:!=]'  // start of a non-capturing group
+              + '|[\\(\\)\\^]'  // start/end of a group, or line start
+              + '|[^\\x5B\\x5C\\(\\)\\^]+'  // run of other characters
+              + ')',
+              'g'));
+      var n = parts.length;
+  
+      // Maps captured group numbers to the number they will occupy in
+      // the output or to -1 if that has not been determined, or to
+      // undefined if they need not be capturing in the output.
+      var capturedGroups = [];
+  
+      // Walk over and identify back references to build the capturedGroups
+      // mapping.
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          // groups are 1-indexed, so max group index is count of '('
+          ++groupIndex;
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue) {
+            if (decimalValue <= groupIndex) {
+              capturedGroups[decimalValue] = -1;
+            } else {
+              // Replace with an unambiguous escape sequence so that
+              // an octal escape sequence does not turn into a backreference
+              // to a capturing group from an earlier regex.
+              parts[i] = encodeEscape(decimalValue);
+            }
+          }
+        }
+      }
+  
+      // Renumber groups and reduce capturing groups to non-capturing groups
+      // where possible.
+      for (var i = 1; i < capturedGroups.length; ++i) {
+        if (-1 === capturedGroups[i]) {
+          capturedGroups[i] = ++capturedGroupIndex;
+        }
+      }
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          ++groupIndex;
+          if (!capturedGroups[groupIndex]) {
+            parts[i] = '(?:';
+          }
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue && decimalValue <= groupIndex) {
+            parts[i] = '\\' + capturedGroups[decimalValue];
+          }
+        }
+      }
+  
+      // Remove any prefix anchors so that the output will match anywhere.
+      // ^^ really does mean an anchored match though.
+      for (var i = 0; i < n; ++i) {
+        if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; }
+      }
+  
+      // Expand letters to groups to handle mixing of case-sensitive and
+      // case-insensitive patterns if necessary.
+      if (regex.ignoreCase && needToFoldCase) {
+        for (var i = 0; i < n; ++i) {
+          var p = parts[i];
+          var ch0 = p.charAt(0);
+          if (p.length >= 2 && ch0 === '[') {
+            parts[i] = caseFoldCharset(p);
+          } else if (ch0 !== '\\') {
+            // TODO: handle letters in numeric escapes.
+            parts[i] = p.replace(
+                /[a-zA-Z]/g,
+                function (ch) {
+                  var cc = ch.charCodeAt(0);
+                  return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']';
+                });
+          }
+        }
+      }
+  
+      return parts.join('');
+    }
+  
+    var rewritten = [];
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.global || regex.multiline) { throw new Error('' + regex); }
+      rewritten.push(
+          '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')');
+    }
+  
+    return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g');
+  }
+
+  /**
+   * Split markup into a string of source code and an array mapping ranges in
+   * that string to the text nodes in which they appear.
+   *
+   * <p>
+   * The HTML DOM structure:</p>
+   * <pre>
+   * (Element   "p"
+   *   (Element "b"
+   *     (Text  "print "))       ; #1
+   *   (Text    "'Hello '")      ; #2
+   *   (Element "br")            ; #3
+   *   (Text    "  + 'World';")) ; #4
+   * </pre>
+   * <p>
+   * corresponds to the HTML
+   * {@code <p><b>print </b>'Hello '<br>  + 'World';</p>}.</p>
+   *
+   * <p>
+   * It will produce the output:</p>
+   * <pre>
+   * {
+   *   sourceCode: "print 'Hello '\n  + 'World';",
+   *   //                     1          2
+   *   //           012345678901234 5678901234567
+   *   spans: [0, #1, 6, #2, 14, #3, 15, #4]
+   * }
+   * </pre>
+   * <p>
+   * where #1 is a reference to the {@code "print "} text node above, and so
+   * on for the other text nodes.
+   * </p>
+   *
+   * <p>
+   * The {@code} spans array is an array of pairs.  Even elements are the start
+   * indices of substrings, and odd elements are the text nodes (or BR elements)
+   * that contain the text for those substrings.
+   * Substrings continue until the next index or the end of the source.
+   * </p>
+   *
+   * @param {Node} node an HTML DOM subtree containing source-code.
+   * @param {boolean} isPreformatted true if white-space in text nodes should
+   *    be considered significant.
+   * @return {Object} source code and the text nodes in which they occur.
+   */
+  function extractSourceSpans(node, isPreformatted) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+  
+    var chunks = [];
+    var length = 0;
+    var spans = [];
+    var k = 0;
+  
+    function walk(node) {
+      var type = node.nodeType;
+      if (type == 1) {  // Element
+        if (nocode.test(node.className)) { return; }
+        for (var child = node.firstChild; child; child = child.nextSibling) {
+          walk(child);
+        }
+        var nodeName = node.nodeName.toLowerCase();
+        if ('br' === nodeName || 'li' === nodeName) {
+          chunks[k] = '\n';
+          spans[k << 1] = length++;
+          spans[(k++ << 1) | 1] = node;
+        }
+      } else if (type == 3 || type == 4) {  // Text
+        var text = node.nodeValue;
+        if (text.length) {
+          if (!isPreformatted) {
+            text = text.replace(/[ \t\r\n]+/g, ' ');
+          } else {
+            text = text.replace(/\r\n?/g, '\n');  // Normalize newlines.
+          }
+          // TODO: handle tabs here?
+          chunks[k] = text;
+          spans[k << 1] = length;
+          length += text.length;
+          spans[(k++ << 1) | 1] = node;
+        }
+      }
+    }
+  
+    walk(node);
+  
+    return {
+      sourceCode: chunks.join('').replace(/\n$/, ''),
+      spans: spans
+    };
+  }
+
+  /**
+   * Apply the given language handler to sourceCode and add the resulting
+   * decorations to out.
+   * @param {number} basePos the index of sourceCode within the chunk of source
+   *    whose decorations are already present on out.
+   */
+  function appendDecorations(basePos, sourceCode, langHandler, out) {
+    if (!sourceCode) { return; }
+    var job = {
+      sourceCode: sourceCode,
+      basePos: basePos
+    };
+    langHandler(job);
+    out.push.apply(out, job.decorations);
+  }
+
+  var notWs = /\S/;
+
+  /**
+   * Given an element, if it contains only one child element and any text nodes
+   * it contains contain only space characters, return the sole child element.
+   * Otherwise returns undefined.
+   * <p>
+   * This is meant to return the CODE element in {@code <pre><code ...>} when
+   * there is a single child element that contains all the non-space textual
+   * content, but not to return anything where there are multiple child elements
+   * as in {@code <pre><code>...</code><code>...</code></pre>} or when there
+   * is textual content.
+   */
+  function childContentWrapper(element) {
+    var wrapper = undefined;
+    for (var c = element.firstChild; c; c = c.nextSibling) {
+      var type = c.nodeType;
+      wrapper = (type === 1)  // Element Node
+          ? (wrapper ? element : c)
+          : (type === 3)  // Text Node
+          ? (notWs.test(c.nodeValue) ? element : wrapper)
+          : wrapper;
+    }
+    return wrapper === element ? undefined : wrapper;
+  }
+
+  /** Given triples of [style, pattern, context] returns a lexing function,
+    * The lexing function interprets the patterns to find token boundaries and
+    * returns a decoration list of the form
+    * [index_0, style_0, index_1, style_1, ..., index_n, style_n]
+    * where index_n is an index into the sourceCode, and style_n is a style
+    * constant like PR_PLAIN.  index_n-1 <= index_n, and style_n-1 applies to
+    * all characters in sourceCode[index_n-1:index_n].
+    *
+    * The stylePatterns is a list whose elements have the form
+    * [style : string, pattern : RegExp, DEPRECATED, shortcut : string].
+    *
+    * Style is a style constant like PR_PLAIN, or can be a string of the
+    * form 'lang-FOO', where FOO is a language extension describing the
+    * language of the portion of the token in $1 after pattern executes.
+    * E.g., if style is 'lang-lisp', and group 1 contains the text
+    * '(hello (world))', then that portion of the token will be passed to the
+    * registered lisp handler for formatting.
+    * The text before and after group 1 will be restyled using this decorator
+    * so decorators should take care that this doesn't result in infinite
+    * recursion.  For example, the HTML lexer rule for SCRIPT elements looks
+    * something like ['lang-js', /<[s]cript>(.+?)<\/script>/].  This may match
+    * '<script>foo()<\/script>', which would cause the current decorator to
+    * be called with '<script>' which would not match the same rule since
+    * group 1 must not be empty, so it would be instead styled as PR_TAG by
+    * the generic tag rule.  The handler registered for the 'js' extension would
+    * then be called with 'foo()', and finally, the current decorator would
+    * be called with '<\/script>' which would not match the original rule and
+    * so the generic tag rule would identify it as a tag.
+    *
+    * Pattern must only match prefixes, and if it matches a prefix, then that
+    * match is considered a token with the same style.
+    *
+    * Context is applied to the last non-whitespace, non-comment token
+    * recognized.
+    *
+    * Shortcut is an optional string of characters, any of which, if the first
+    * character, gurantee that this pattern and only this pattern matches.
+    *
+    * @param {Array} shortcutStylePatterns patterns that always start with
+    *   a known character.  Must have a shortcut string.
+    * @param {Array} fallthroughStylePatterns patterns that will be tried in
+    *   order if the shortcut ones fail.  May have shortcuts.
+    *
+    * @return {function (Object)} a
+    *   function that takes source code and returns a list of decorations.
+    */
+  function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) {
+    var shortcuts = {};
+    var tokenizer;
+    (function () {
+      var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns);
+      var allRegexs = [];
+      var regexKeys = {};
+      for (var i = 0, n = allPatterns.length; i < n; ++i) {
+        var patternParts = allPatterns[i];
+        var shortcutChars = patternParts[3];
+        if (shortcutChars) {
+          for (var c = shortcutChars.length; --c >= 0;) {
+            shortcuts[shortcutChars.charAt(c)] = patternParts;
+          }
+        }
+        var regex = patternParts[1];
+        var k = '' + regex;
+        if (!regexKeys.hasOwnProperty(k)) {
+          allRegexs.push(regex);
+          regexKeys[k] = null;
+        }
+      }
+      allRegexs.push(/[\0-\uffff]/);
+      tokenizer = combinePrefixPatterns(allRegexs);
+    })();
+
+    var nPatterns = fallthroughStylePatterns.length;
+
+    /**
+     * Lexes job.sourceCode and produces an output array job.decorations of
+     * style classes preceded by the position at which they start in
+     * job.sourceCode in order.
+     *
+     * @param {Object} job an object like <pre>{
+     *    sourceCode: {string} sourceText plain text,
+     *    basePos: {int} position of job.sourceCode in the larger chunk of
+     *        sourceCode.
+     * }</pre>
+     */
+    var decorate = function (job) {
+      var sourceCode = job.sourceCode, basePos = job.basePos;
+      /** Even entries are positions in source in ascending order.  Odd enties
+        * are style markers (e.g., PR_COMMENT) that run from that position until
+        * the end.
+        * @type {Array.<number|string>}
+        */
+      var decorations = [basePos, PR_PLAIN];
+      var pos = 0;  // index into sourceCode
+      var tokens = sourceCode.match(tokenizer) || [];
+      var styleCache = {};
+
+      for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) {
+        var token = tokens[ti];
+        var style = styleCache[token];
+        var match = void 0;
+
+        var isEmbedded;
+        if (typeof style === 'string') {
+          isEmbedded = false;
+        } else {
+          var patternParts = shortcuts[token.charAt(0)];
+          if (patternParts) {
+            match = token.match(patternParts[1]);
+            style = patternParts[0];
+          } else {
+            for (var i = 0; i < nPatterns; ++i) {
+              patternParts = fallthroughStylePatterns[i];
+              match = token.match(patternParts[1]);
+              if (match) {
+                style = patternParts[0];
+                break;
+              }
+            }
+
+            if (!match) {  // make sure that we make progress
+              style = PR_PLAIN;
+            }
+          }
+
+          isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5);
+          if (isEmbedded && !(match && typeof match[1] === 'string')) {
+            isEmbedded = false;
+            style = PR_SOURCE;
+          }
+
+          if (!isEmbedded) { styleCache[token] = style; }
+        }
+
+        var tokenStart = pos;
+        pos += token.length;
+
+        if (!isEmbedded) {
+          decorations.push(basePos + tokenStart, style);
+        } else {  // Treat group 1 as an embedded block of source code.
+          var embeddedSource = match[1];
+          var embeddedSourceStart = token.indexOf(embeddedSource);
+          var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length;
+          if (match[2]) {
+            // If embeddedSource can be blank, then it would match at the
+            // beginning which would cause us to infinitely recurse on the
+            // entire token, so we catch the right context in match[2].
+            embeddedSourceEnd = token.length - match[2].length;
+            embeddedSourceStart = embeddedSourceEnd - embeddedSource.length;
+          }
+          var lang = style.substring(5);
+          // Decorate the left of the embedded source
+          appendDecorations(
+              basePos + tokenStart,
+              token.substring(0, embeddedSourceStart),
+              decorate, decorations);
+          // Decorate the embedded source
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceStart,
+              embeddedSource,
+              langHandlerForExtension(lang, embeddedSource),
+              decorations);
+          // Decorate the right of the embedded section
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceEnd,
+              token.substring(embeddedSourceEnd),
+              decorate, decorations);
+        }
+      }
+      job.decorations = decorations;
+    };
+    return decorate;
+  }
+
+  /** returns a function that produces a list of decorations from source text.
+    *
+    * This code treats ", ', and ` as string delimiters, and \ as a string
+    * escape.  It does not recognize perl's qq() style strings.
+    * It has no special handling for double delimiter escapes as in basic, or
+    * the tripled delimiters used in python, but should work on those regardless
+    * although in those cases a single string literal may be broken up into
+    * multiple adjacent string literals.
+    *
+    * It recognizes C, C++, and shell style comments.
+    *
+    * @param {Object} options a set of optional parameters.
+    * @return {function (Object)} a function that examines the source code
+    *     in the input job and builds the decoration list.
+    */
+  function sourceDecorator(options) {
+    var shortcutStylePatterns = [], fallthroughStylePatterns = [];
+    if (options['tripleQuotedStrings']) {
+      // '''multi-line-string''', 'single-line-string', and double-quoted
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
+           null, '\'"']);
+    } else if (options['multiLineStrings']) {
+      // 'multi-line-string', "multi-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,
+           null, '\'"`']);
+    } else {
+      // 'single-line-string', "single-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,
+           /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,
+           null, '"\'']);
+    }
+    if (options['verbatimStrings']) {
+      // verbatim-string-literal production from the C# grammar.  See issue 93.
+      fallthroughStylePatterns.push(
+          [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]);
+    }
+    var hc = options['hashComments'];
+    if (hc) {
+      if (options['cStyleComments']) {
+        if (hc > 1) {  // multiline hash comments
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, '#']);
+        } else {
+          // Stop C preprocessor declarations at an unclosed open comment
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,
+               null, '#']);
+        }
+        // #include <stdio.h>
+        fallthroughStylePatterns.push(
+            [PR_STRING,
+             /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,
+             null]);
+      } else {
+        shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
+      }
+    }
+    if (options['cStyleComments']) {
+      fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
+      fallthroughStylePatterns.push(
+          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
+    }
+    var regexLiterals = options['regexLiterals'];
+    if (regexLiterals) {
+      /**
+       * @const
+       */
+      var regexExcls = regexLiterals > 1
+        ? ''  // Multiline regex literals
+        : '\n\r';
+      /**
+       * @const
+       */
+      var regexAny = regexExcls ? '.' : '[\\S\\s]';
+      /**
+       * @const
+       */
+      var REGEX_LITERAL = (
+          // A regular expression literal starts with a slash that is
+          // not followed by * or / so that it is not confused with
+          // comments.
+          '/(?=[^/*' + regexExcls + '])'
+          // and then contains any number of raw characters,
+          + '(?:[^/\\x5B\\x5C' + regexExcls + ']'
+          // escape sequences (\x5C),
+          +    '|\\x5C' + regexAny
+          // or non-nesting character sets (\x5B\x5D);
+          +    '|\\x5B(?:[^\\x5C\\x5D' + regexExcls + ']'
+          +             '|\\x5C' + regexAny + ')*(?:\\x5D|$))+'
+          // finally closed by a /.
+          + '/');
+      fallthroughStylePatterns.push(
+          ['lang-regex',
+           RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')')
+           ]);
+    }
+
+    var types = options['types'];
+    if (types) {
+      fallthroughStylePatterns.push([PR_TYPE, types]);
+    }
+
+    var keywords = ("" + options['keywords']).replace(/^ | $/g, '');
+    if (keywords.length) {
+      fallthroughStylePatterns.push(
+          [PR_KEYWORD,
+           new RegExp('^(?:' + keywords.replace(/[\s,]+/g, '|') + ')\\b'),
+           null]);
+    }
+
+    shortcutStylePatterns.push([PR_PLAIN,       /^\s+/, null, ' \r\n\t\xA0']);
+
+    var punctuation =
+      // The Bash man page says
+
+      // A word is a sequence of characters considered as a single
+      // unit by GRUB. Words are separated by metacharacters,
+      // which are the following plus space, tab, and newline: { }
+      // | & $ ; < >
+      // ...
+      
+      // A word beginning with # causes that word and all remaining
+      // characters on that line to be ignored.
+
+      // which means that only a '#' after /(?:^|[{}|&$;<>\s])/ starts a
+      // comment but empirically
+      // $ echo {#}
+      // {#}
+      // $ echo \$#
+      // $#
+      // $ echo }#
+      // }#
+
+      // so /(?:^|[|&;<>\s])/ is more appropriate.
+
+      // http://gcc.gnu.org/onlinedocs/gcc-2.95.3/cpp_1.html#SEC3
+      // suggests that this definition is compatible with a
+      // default mode that tries to use a single token definition
+      // to recognize both bash/python style comments and C
+      // preprocessor directives.
+
+      // This definition of punctuation does not include # in the list of
+      // follow-on exclusions, so # will not be broken before if preceeded
+      // by a punctuation character.  We could try to exclude # after
+      // [|&;<>] but that doesn't seem to cause many major problems.
+      // If that does turn out to be a problem, we should change the below
+      // when hc is truthy to include # in the run of punctuation characters
+      // only when not followint [|&;<>].
+      '^.[^\\s\\w.$@\'"`/\\\\]*';
+    if (options['regexLiterals']) {
+      punctuation += '(?!\s*\/)';
+    }
+
+    fallthroughStylePatterns.push(
+        // TODO(mikesamuel): recognize non-latin letters and numerals in idents
+        [PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_TYPE,        /^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/, null],
+        [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_LITERAL,
+         new RegExp(
+             '^(?:'
+             // A hex number
+             + '0x[a-f0-9]+'
+             // or an octal or decimal number,
+             + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)'
+             // possibly in scientific notation
+             + '(?:e[+\\-]?\\d+)?'
+             + ')'
+             // with an optional modifier like UL for unsigned long
+             + '[a-z]*', 'i'),
+         null, '0123456789'],
+        // Don't treat escaped quotes in bash as starting strings.
+        // See issue 144.
+        [PR_PLAIN,       /^\\[\s\S]?/, null],
+        [PR_PUNCTUATION, new RegExp(punctuation), null]);
+
+    return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
+  }
+
+  var decorateSource = sourceDecorator({
+        'keywords': ALL_KEYWORDS,
+        'hashComments': true,
+        'cStyleComments': true,
+        'multiLineStrings': true,
+        'regexLiterals': true
+      });
+
+  /**
+   * Given a DOM subtree, wraps it in a list, and puts each line into its own
+   * list item.
+   *
+   * @param {Node} node modified in place.  Its content is pulled into an
+   *     HTMLOListElement, and each line is moved into a separate list item.
+   *     This requires cloning elements, so the input might not have unique
+   *     IDs after numbering.
+   * @param {boolean} isPreformatted true iff white-space in text nodes should
+   *     be treated as significant.
+   */
+  function numberLines(node, opt_startLineNum, isPreformatted) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+    var lineBreak = /\r\n?|\n/;
+  
+    var document = node.ownerDocument;
+  
+    var li = document.createElement('li');
+    while (node.firstChild) {
+      li.appendChild(node.firstChild);
+    }
+    // An array of lines.  We split below, so this is initialized to one
+    // un-split line.
+    var listItems = [li];
+  
+    function walk(node) {
+      var type = node.nodeType;
+      if (type == 1 && !nocode.test(node.className)) {  // Element
+        if ('br' === node.nodeName) {
+          breakAfter(node);
+          // Discard the <BR> since it is now flush against a </LI>.
+          if (node.parentNode) {
+            node.parentNode.removeChild(node);
+          }
+        } else {
+          for (var child = node.firstChild; child; child = child.nextSibling) {
+            walk(child);
+          }
+        }
+      } else if ((type == 3 || type == 4) && isPreformatted) {  // Text
+        var text = node.nodeValue;
+        var match = text.match(lineBreak);
+        if (match) {
+          var firstLine = text.substring(0, match.index);
+          node.nodeValue = firstLine;
+          var tail = text.substring(match.index + match[0].length);
+          if (tail) {
+            var parent = node.parentNode;
+            parent.insertBefore(
+              document.createTextNode(tail), node.nextSibling);
+          }
+          breakAfter(node);
+          if (!firstLine) {
+            // Don't leave blank text nodes in the DOM.
+            node.parentNode.removeChild(node);
+          }
+        }
+      }
+    }
+  
+    // Split a line after the given node.
+    function breakAfter(lineEndNode) {
+      // If there's nothing to the right, then we can skip ending the line
+      // here, and move root-wards since splitting just before an end-tag
+      // would require us to create a bunch of empty copies.
+      while (!lineEndNode.nextSibling) {
+        lineEndNode = lineEndNode.parentNode;
+        if (!lineEndNode) { return; }
+      }
+  
+      function breakLeftOf(limit, copy) {
+        // Clone shallowly if this node needs to be on both sides of the break.
+        var rightSide = copy ? limit.cloneNode(false) : limit;
+        var parent = limit.parentNode;
+        if (parent) {
+          // We clone the parent chain.
+          // This helps us resurrect important styling elements that cross lines.
+          // E.g. in <i>Foo<br>Bar</i>
+          // should be rewritten to <li><i>Foo</i></li><li><i>Bar</i></li>.
+          var parentClone = breakLeftOf(parent, 1);
+          // Move the clone and everything to the right of the original
+          // onto the cloned parent.
+          var next = limit.nextSibling;
+          parentClone.appendChild(rightSide);
+          for (var sibling = next; sibling; sibling = next) {
+            next = sibling.nextSibling;
+            parentClone.appendChild(sibling);
+          }
+        }
+        return rightSide;
+      }
+  
+      var copiedListItem = breakLeftOf(lineEndNode.nextSibling, 0);
+  
+      // Walk the parent chain until we reach an unattached LI.
+      for (var parent;
+           // Check nodeType since IE invents document fragments.
+           (parent = copiedListItem.parentNode) && parent.nodeType === 1;) {
+        copiedListItem = parent;
+      }
+      // Put it on the list of lines for later processing.
+      listItems.push(copiedListItem);
+    }
+  
+    // Split lines while there are lines left to split.
+    for (var i = 0;  // Number of lines that have been split so far.
+         i < listItems.length;  // length updated by breakAfter calls.
+         ++i) {
+      walk(listItems[i]);
+    }
+  
+    // Make sure numeric indices show correctly.
+    if (opt_startLineNum === (opt_startLineNum|0)) {
+      listItems[0].setAttribute('value', opt_startLineNum);
+    }
+  
+    var ol = document.createElement('ol');
+    ol.className = 'linenums';
+    var offset = Math.max(0, ((opt_startLineNum - 1 /* zero index */)) | 0) || 0;
+    for (var i = 0, n = listItems.length; i < n; ++i) {
+      li = listItems[i];
+      // Stick a class on the LIs so that stylesheets can
+      // color odd/even rows, or any other row pattern that
+      // is co-prime with 10.
+      li.className = 'L' + ((i + offset) % 10);
+      if (!li.firstChild) {
+        li.appendChild(document.createTextNode('\xA0'));
+      }
+      ol.appendChild(li);
+    }
+  
+    node.appendChild(ol);
+  }
+  /**
+   * Breaks {@code job.sourceCode} around style boundaries in
+   * {@code job.decorations} and modifies {@code job.sourceNode} in place.
+   * @param {Object} job like <pre>{
+   *    sourceCode: {string} source as plain text,
+   *    sourceNode: {HTMLElement} the element containing the source,
+   *    spans: {Array.<number|Node>} alternating span start indices into source
+   *       and the text node or element (e.g. {@code <BR>}) corresponding to that
+   *       span.
+   *    decorations: {Array.<number|string} an array of style classes preceded
+   *       by the position at which they start in job.sourceCode in order
+   * }</pre>
+   * @private
+   */
+  function recombineTagsAndDecorations(job) {
+    var isIE8OrEarlier = /\bMSIE\s(\d+)/.exec(navigator.userAgent);
+    isIE8OrEarlier = isIE8OrEarlier && +isIE8OrEarlier[1] <= 8;
+    var newlineRe = /\n/g;
+  
+    var source = job.sourceCode;
+    var sourceLength = source.length;
+    // Index into source after the last code-unit recombined.
+    var sourceIndex = 0;
+  
+    var spans = job.spans;
+    var nSpans = spans.length;
+    // Index into spans after the last span which ends at or before sourceIndex.
+    var spanIndex = 0;
+  
+    var decorations = job.decorations;
+    var nDecorations = decorations.length;
+    // Index into decorations after the last decoration which ends at or before
+    // sourceIndex.
+    var decorationIndex = 0;
+  
+    // Remove all zero-length decorations.
+    decorations[nDecorations] = sourceLength;
+    var decPos, i;
+    for (i = decPos = 0; i < nDecorations;) {
+      if (decorations[i] !== decorations[i + 2]) {
+        decorations[decPos++] = decorations[i++];
+        decorations[decPos++] = decorations[i++];
+      } else {
+        i += 2;
+      }
+    }
+    nDecorations = decPos;
+  
+    // Simplify decorations.
+    for (i = decPos = 0; i < nDecorations;) {
+      var startPos = decorations[i];
+      // Conflate all adjacent decorations that use the same style.
+      var startDec = decorations[i + 1];
+      var end = i + 2;
+      while (end + 2 <= nDecorations && decorations[end + 1] === startDec) {
+        end += 2;
+      }
+      decorations[decPos++] = startPos;
+      decorations[decPos++] = startDec;
+      i = end;
+    }
+  
+    nDecorations = decorations.length = decPos;
+  
+    var sourceNode = job.sourceNode;
+    var oldDisplay;
+    if (sourceNode) {
+      oldDisplay = sourceNode.style.display;
+      sourceNode.style.display = 'none';
+    }
+    try {
+      var decoration = null;
+      while (spanIndex < nSpans) {
+        var spanStart = spans[spanIndex];
+        var spanEnd = spans[spanIndex + 2] || sourceLength;
+  
+        var decEnd = decorations[decorationIndex + 2] || sourceLength;
+  
+        var end = Math.min(spanEnd, decEnd);
+  
+        var textNode = spans[spanIndex + 1];
+        var styledText;
+        if (textNode.nodeType !== 1  // Don't muck with <BR>s or <LI>s
+            // Don't introduce spans around empty text nodes.
+            && (styledText = source.substring(sourceIndex, end))) {
+          // This may seem bizarre, and it is.  Emitting LF on IE causes the
+          // code to display with spaces instead of line breaks.
+          // Emitting Windows standard issue linebreaks (CRLF) causes a blank
+          // space to appear at the beginning of every line but the first.
+          // Emitting an old Mac OS 9 line separator makes everything spiffy.
+          if (isIE8OrEarlier) {
+            styledText = styledText.replace(newlineRe, '\r');
+          }
+          textNode.nodeValue = styledText;
+          var document = textNode.ownerDocument;
+          var span = document.createElement('span');
+          span.className = decorations[decorationIndex + 1];
+          var parentNode = textNode.parentNode;
+          parentNode.replaceChild(span, textNode);
+          span.appendChild(textNode);
+          if (sourceIndex < spanEnd) {  // Split off a text node.
+            spans[spanIndex + 1] = textNode
+                // TODO: Possibly optimize by using '' if there's no flicker.
+                = document.createTextNode(source.substring(end, spanEnd));
+            parentNode.insertBefore(textNode, span.nextSibling);
+          }
+        }
+  
+        sourceIndex = end;
+  
+        if (sourceIndex >= spanEnd) {
+          spanIndex += 2;
+        }
+        if (sourceIndex >= decEnd) {
+          decorationIndex += 2;
+        }
+      }
+    } finally {
+      if (sourceNode) {
+        sourceNode.style.display = oldDisplay;
+      }
+    }
+  }
+
+  /** Maps language-specific file extensions to handlers. */
+  var langHandlerRegistry = {};
+  /** Register a language handler for the given file extensions.
+    * @param {function (Object)} handler a function from source code to a list
+    *      of decorations.  Takes a single argument job which describes the
+    *      state of the computation.   The single parameter has the form
+    *      {@code {
+    *        sourceCode: {string} as plain text.
+    *        decorations: {Array.<number|string>} an array of style classes
+    *                     preceded by the position at which they start in
+    *                     job.sourceCode in order.
+    *                     The language handler should assigned this field.
+    *        basePos: {int} the position of source in the larger source chunk.
+    *                 All positions in the output decorations array are relative
+    *                 to the larger source chunk.
+    *      } }
+    * @param {Array.<string>} fileExtensions
+    */
+  function registerLangHandler(handler, fileExtensions) {
+    for (var i = fileExtensions.length; --i >= 0;) {
+      var ext = fileExtensions[i];
+      if (!langHandlerRegistry.hasOwnProperty(ext)) {
+        langHandlerRegistry[ext] = handler;
+      } else if (win['console']) {
+        console['warn']('cannot override language handler %s', ext);
+      }
+    }
+  }
+  function langHandlerForExtension(extension, source) {
+    if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) {
+      // Treat it as markup if the first non whitespace character is a < and
+      // the last non-whitespace character is a >.
+      extension = /^\s*</.test(source)
+          ? 'default-markup'
+          : 'default-code';
+    }
+    return langHandlerRegistry[extension];
+  }
+  registerLangHandler(decorateSource, ['default-code']);
+  registerLangHandler(
+      createSimpleLexer(
+          [],
+          [
+           [PR_PLAIN,       /^[^<?]+/],
+           [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
+           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
+           // Unescaped content in an unknown language
+           ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
+           ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],
+           [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/],
+           ['lang-',        /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],
+           // Unescaped content in javascript.  (Or possibly vbscript).
+           ['lang-js',      /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
+           // Contains unescaped stylesheet content
+           ['lang-css',     /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
+           ['lang-in.tag',  /^(<\/?[a-z][^<>]*>)/i]
+          ]),
+      ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
+  registerLangHandler(
+      createSimpleLexer(
+          [
+           [PR_PLAIN,        /^[\s]+/, null, ' \t\r\n'],
+           [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
+           ],
+          [
+           [PR_TAG,          /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
+           [PR_ATTRIB_NAME,  /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
+           ['lang-uq.val',   /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
+           [PR_PUNCTUATION,  /^[=<>\/]+/],
+           ['lang-js',       /^on\w+\s*=\s*\"([^\"]+)\"/i],
+           ['lang-js',       /^on\w+\s*=\s*\'([^\']+)\'/i],
+           ['lang-js',       /^on\w+\s*=\s*([^\"\'>\s]+)/i],
+           ['lang-css',      /^style\s*=\s*\"([^\"]+)\"/i],
+           ['lang-css',      /^style\s*=\s*\'([^\']+)\'/i],
+           ['lang-css',      /^style\s*=\s*([^\"\'>\s]+)/i]
+           ]),
+      ['in.tag']);
+  registerLangHandler(
+      createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CPP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'types': C_TYPES
+        }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': 'null,true,false'
+        }), ['json']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CSHARP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'verbatimStrings': true,
+          'types': C_TYPES
+        }), ['cs']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JAVA_KEYWORDS,
+          'cStyleComments': true
+        }), ['java']);
+  registerLangHandler(sourceDecorator({
+          'keywords': SH_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true
+        }), ['bash', 'bsh', 'csh', 'sh']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PYTHON_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'tripleQuotedStrings': true
+        }), ['cv', 'py', 'python']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PERL_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': 2  // multiline regex literals
+        }), ['perl', 'pl', 'pm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': RUBY_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': true
+        }), ['rb', 'ruby']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JSCRIPT_KEYWORDS,
+          'cStyleComments': true,
+          'regexLiterals': true
+        }), ['javascript', 'js']);
+  registerLangHandler(sourceDecorator({
+          'keywords': COFFEE_KEYWORDS,
+          'hashComments': 3,  // ### style block comments
+          'cStyleComments': true,
+          'multilineStrings': true,
+          'tripleQuotedStrings': true,
+          'regexLiterals': true
+        }), ['coffee']);
+  registerLangHandler(sourceDecorator({
+          'keywords': RUST_KEYWORDS,
+          'cStyleComments': true,
+          'multilineStrings': true
+        }), ['rc', 'rs', 'rust']);
+  registerLangHandler(
+      createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']);
+
+  function applyDecorator(job) {
+    var opt_langExtension = job.langExtension;
+
+    try {
+      // Extract tags, and convert the source code to plain text.
+      var sourceAndSpans = extractSourceSpans(job.sourceNode, job.pre);
+      /** Plain text. @type {string} */
+      var source = sourceAndSpans.sourceCode;
+      job.sourceCode = source;
+      job.spans = sourceAndSpans.spans;
+      job.basePos = 0;
+
+      // Apply the appropriate language handler
+      langHandlerForExtension(opt_langExtension, source)(job);
+
+      // Integrate the decorations and tags back into the source code,
+      // modifying the sourceNode in place.
+      recombineTagsAndDecorations(job);
+    } catch (e) {
+      if (win['console']) {
+        console['log'](e && e['stack'] || e);
+      }
+    }
+  }
+
+  /**
+   * Pretty print a chunk of code.
+   * @param sourceCodeHtml {string} The HTML to pretty print.
+   * @param opt_langExtension {string} The language name to use.
+   *     Typically, a filename extension like 'cpp' or 'java'.
+   * @param opt_numberLines {number|boolean} True to number lines,
+   *     or the 1-indexed number of the first line in sourceCodeHtml.
+   */
+  function $prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
+    var container = document.createElement('div');
+    // This could cause images to load and onload listeners to fire.
+    // E.g. <img onerror="alert(1337)" src="nosuchimage.png">.
+    // We assume that the inner HTML is from a trusted source.
+    // The pre-tag is required for IE8 which strips newlines from innerHTML
+    // when it is injected into a <pre> tag.
+    // http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie
+    // http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript
+    container.innerHTML = '<pre>' + sourceCodeHtml + '</pre>';
+    container = container.firstChild;
+    if (opt_numberLines) {
+      numberLines(container, opt_numberLines, true);
+    }
+
+    var job = {
+      langExtension: opt_langExtension,
+      numberLines: opt_numberLines,
+      sourceNode: container,
+      pre: 1
+    };
+    applyDecorator(job);
+    return container.innerHTML;
+  }
+
+   /**
+    * Find all the {@code <pre>} and {@code <code>} tags in the DOM with
+    * {@code class=prettyprint} and prettify them.
+    *
+    * @param {Function} opt_whenDone called when prettifying is done.
+    * @param {HTMLElement|HTMLDocument} opt_root an element or document
+    *   containing all the elements to pretty print.
+    *   Defaults to {@code document.body}.
+    */
+  function $prettyPrint(opt_whenDone, opt_root) {
+    var root = opt_root || document.body;
+    var doc = root.ownerDocument || document;
+    function byTagName(tn) { return root.getElementsByTagName(tn); }
+    // fetch a list of nodes to rewrite
+    var codeSegments = [byTagName('pre'), byTagName('code'), byTagName('xmp')];
+    var elements = [];
+    for (var i = 0; i < codeSegments.length; ++i) {
+      for (var j = 0, n = codeSegments[i].length; j < n; ++j) {
+        elements.push(codeSegments[i][j]);
+      }
+    }
+    codeSegments = null;
+
+    var clock = Date;
+    if (!clock['now']) {
+      clock = { 'now': function () { return +(new Date); } };
+    }
+
+    // The loop is broken into a series of continuations to make sure that we
+    // don't make the browser unresponsive when rewriting a large page.
+    var k = 0;
+    var prettyPrintingJob;
+
+    var langExtensionRe = /\blang(?:uage)?-([\w.]+)(?!\S)/;
+    var prettyPrintRe = /\bprettyprint\b/;
+    var prettyPrintedRe = /\bprettyprinted\b/;
+    var preformattedTagNameRe = /pre|xmp/i;
+    var codeRe = /^code$/i;
+    var preCodeXmpRe = /^(?:pre|code|xmp)$/i;
+    var EMPTY = {};
+
+    function doWork() {
+      var endTime = (win['PR_SHOULD_USE_CONTINUATION'] ?
+                     clock['now']() + 250 /* ms */ :
+                     Infinity);
+      for (; k < elements.length && clock['now']() < endTime; k++) {
+        var cs = elements[k];
+
+        // Look for a preceding comment like
+        // <?prettify lang="..." linenums="..."?>
+        var attrs = EMPTY;
+        {
+          for (var preceder = cs; (preceder = preceder.previousSibling);) {
+            var nt = preceder.nodeType;
+            // <?foo?> is parsed by HTML 5 to a comment node (8)
+            // like <!--?foo?-->, but in XML is a processing instruction
+            var value = (nt === 7 || nt === 8) && preceder.nodeValue;
+            if (value
+                ? !/^\??prettify\b/.test(value)
+                : (nt !== 3 || /\S/.test(preceder.nodeValue))) {
+              // Skip over white-space text nodes but not others.
+              break;
+            }
+            if (value) {
+              attrs = {};
+              value.replace(
+                  /\b(\w+)=([\w:.%+-]+)/g,
+                function (_, name, value) { attrs[name] = value; });
+              break;
+            }
+          }
+        }
+
+        var className = cs.className;
+        if ((attrs !== EMPTY || prettyPrintRe.test(className))
+            // Don't redo this if we've already done it.
+            // This allows recalling pretty print to just prettyprint elements
+            // that have been added to the page since last call.
+            && !prettyPrintedRe.test(className)) {
+
+          // make sure this is not nested in an already prettified element
+          var nested = false;
+          for (var p = cs.parentNode; p; p = p.parentNode) {
+            var tn = p.tagName;
+            if (preCodeXmpRe.test(tn)
+                && p.className && prettyPrintRe.test(p.className)) {
+              nested = true;
+              break;
+            }
+          }
+          if (!nested) {
+            // Mark done.  If we fail to prettyprint for whatever reason,
+            // we shouldn't try again.
+            cs.className += ' prettyprinted';
+
+            // If the classes includes a language extensions, use it.
+            // Language extensions can be specified like
+            //     <pre class="prettyprint lang-cpp">
+            // the language extension "cpp" is used to find a language handler
+            // as passed to PR.registerLangHandler.
+            // HTML5 recommends that a language be specified using "language-"
+            // as the prefix instead.  Google Code Prettify supports both.
+            // http://dev.w3.org/html5/spec-author-view/the-code-element.html
+            var langExtension = attrs['lang'];
+            if (!langExtension) {
+              langExtension = className.match(langExtensionRe);
+              // Support <pre class="prettyprint"><code class="language-c">
+              var wrapper;
+              if (!langExtension && (wrapper = childContentWrapper(cs))
+                  && codeRe.test(wrapper.tagName)) {
+                langExtension = wrapper.className.match(langExtensionRe);
+              }
+
+              if (langExtension) { langExtension = langExtension[1]; }
+            }
+
+            var preformatted;
+            if (preformattedTagNameRe.test(cs.tagName)) {
+              preformatted = 1;
+            } else {
+              var currentStyle = cs['currentStyle'];
+              var defaultView = doc.defaultView;
+              var whitespace = (
+                  currentStyle
+                  ? currentStyle['whiteSpace']
+                  : (defaultView
+                     && defaultView.getComputedStyle)
+                  ? defaultView.getComputedStyle(cs, null)
+                  .getPropertyValue('white-space')
+                  : 0);
+              preformatted = whitespace
+                  && 'pre' === whitespace.substring(0, 3);
+            }
+
+            // Look for a class like linenums or linenums:<n> where <n> is the
+            // 1-indexed number of the first line.
+            var lineNums = attrs['linenums'];
+            if (!(lineNums = lineNums === 'true' || +lineNums)) {
+              lineNums = className.match(/\blinenums\b(?::(\d+))?/);
+              lineNums =
+                lineNums
+                ? lineNums[1] && lineNums[1].length
+                  ? +lineNums[1] : true
+                : false;
+            }
+            if (lineNums) { numberLines(cs, lineNums, preformatted); }
+
+            // do the pretty printing
+            prettyPrintingJob = {
+              langExtension: langExtension,
+              sourceNode: cs,
+              numberLines: lineNums,
+              pre: preformatted
+            };
+            applyDecorator(prettyPrintingJob);
+          }
+        }
+      }
+      if (k < elements.length) {
+        // finish up in a continuation
+        setTimeout(doWork, 250);
+      } else if ('function' === typeof opt_whenDone) {
+        opt_whenDone();
+      }
+    }
+
+    doWork();
+  }
+
+  /**
+   * Contains functions for creating and registering new language handlers.
+   * @type {Object}
+   */
+  var PR = win['PR'] = {
+        'createSimpleLexer': createSimpleLexer,
+        'registerLangHandler': registerLangHandler,
+        'sourceDecorator': sourceDecorator,
+        'PR_ATTRIB_NAME': PR_ATTRIB_NAME,
+        'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE,
+        'PR_COMMENT': PR_COMMENT,
+        'PR_DECLARATION': PR_DECLARATION,
+        'PR_KEYWORD': PR_KEYWORD,
+        'PR_LITERAL': PR_LITERAL,
+        'PR_NOCODE': PR_NOCODE,
+        'PR_PLAIN': PR_PLAIN,
+        'PR_PUNCTUATION': PR_PUNCTUATION,
+        'PR_SOURCE': PR_SOURCE,
+        'PR_STRING': PR_STRING,
+        'PR_TAG': PR_TAG,
+        'PR_TYPE': PR_TYPE,
+        'prettyPrintOne':
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrintOne'] = $prettyPrintOne)
+             : (prettyPrintOne = $prettyPrintOne),
+        'prettyPrint': prettyPrint =
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrint'] = $prettyPrint)
+             : (prettyPrint = $prettyPrint)
+      };
+
+  // Make PR available via the Asynchronous Module Definition (AMD) API.
+  // Per https://github.com/amdjs/amdjs-api/wiki/AMD:
+  // The Asynchronous Module Definition (AMD) API specifies a
+  // mechanism for defining modules such that the module and its
+  // dependencies can be asynchronously loaded.
+  // ...
+  // To allow a clear indicator that a global define function (as
+  // needed for script src browser loading) conforms to the AMD API,
+  // any global define function SHOULD have a property called "amd"
+  // whose value is an object. This helps avoid conflict with any
+  // other existing JavaScript code that could have defined a define()
+  // function that does not conform to the AMD API.
+  if (typeof define === "function" && define['amd']) {
+    define("google-code-prettify", [], function () {
+      return PR; 
+    });
+  }
+})();
diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
new file mode 100644
index 000000000..ffd4802fb
--- /dev/null
+++ b/public/stylesheets/prettify.css
@@ -0,0 +1,77 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+/* SPAN elements with the classes below are added by prettyprint. */
+.pln { color: #000 }  /* plain text */
+
+@media screen {
+  .str { color: #080 }  /* string content */
+  .kwd { color: #008 }  /* a keyword */
+  .com { color: #800 }  /* a comment */
+  .typ { color: #606 }  /* a type name */
+  .lit { color: #066 }  /* a literal value */
+  /* punctuation, lisp open bracket, lisp close bracket */
+  .pun, .opn, .clo { color: #660 }
+  .tag { color: #008 }  /* a markup tag name */
+  .atn { color: #606 }  /* a markup attribute name */
+  .atv { color: #080 }  /* a markup attribute value */
+  .dec, .var { color: #606 }  /* a declaration; a variable name */
+  .fun { color: red }  /* a function name */
+}
+
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+  .str { color: #060 }
+  .kwd { color: #006; font-weight: bold }
+  .com { color: #600; font-style: italic }
+  .typ { color: #404; font-weight: bold }
+  .lit { color: #044 }
+  .pun, .opn, .clo { color: #440 }
+  .tag { color: #006; font-weight: bold }
+  .atn { color: #404 }
+  .atv { color: #060 }
+}
+
+/* Put a border around prettyprinted code snippets. */
+pre.prettyprint { padding: 2px;
+    border-left:30px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc,
+    border-top: 1px solid #ccc }
+
+pre li,ul,ol {
+    list-style-type: decimal;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 3px } /* IE indents via margin-left */
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L5,
+li.L6,
+li.L7,
+li.L8 { list-style-type: decimal; }
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 { background: #eee }
+
+.prettyprint *{font-family:'courier new',monospace;}
+/*.prettyprint .com { color: #93a1a1; }*/
+/*.prettyprint .lit { color: #AE81FF; }*/
+/*.prettyprint .pun,*/
+/*.prettyprint .opn,*/
+/*.prettyprint .clo { color: #F8F8F2; }*/
+/*.prettyprint .fun { color: #dc322f; }*/
+/*.prettyprint .str,*/
+/*.prettyprint .atv { color: #E6DB74; }*/
+/*.prettyprint .kwd,*/
+/*.prettyprint .tag { color: #F92659; }*/
+/*.prettyprint .typ,*/
+/*.prettyprint .atn,*/
+/*.prettyprint .dec,*/
+/*.prettyprint .var { color: #A6E22E; }*/
+/*.prettyprint .pln { color: #66D9EF; }*/

From 80e38287dd38d1ed221f39d29baafc64eb4e25dc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 16:38:45 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E6=89=80=E6=9C=89baselayout=E9=83=BD?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5prttefy.css=20.js=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base.html.erb           |  4 ++--
 app/views/layouts/base_courses.html.erb   |  4 ++--
 app/views/layouts/base_forums.html.erb    |  4 ++--
 app/views/layouts/base_memos.html.erb     |  4 ++--
 app/views/layouts/base_tags.html.erb      |  3 ++-
 app/views/layouts/base_users.html.erb     |  4 ++--
 app/views/layouts/base_users_new.html.erb |  4 ++--
 app/views/layouts/course_base.html.erb    |  4 ++--
 app/views/layouts/new_base.html.erb       |  4 ++--
 app/views/layouts/new_base_user.html.erb  |  4 ++--
 app/views/layouts/static_base.html.erb    |  4 ++--
 app/views/layouts/users_base.html.erb     |  4 ++--
 app/views/users/_resources_list.html.erb  |  2 +-
 db/schema.rb                              | 10 ++++++++++
 public/stylesheets/new_user.css           |  8 ++++----
 15 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index ae44bf0ac..fbc545607 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -8,11 +8,11 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "jquery.leanModal.min" %>
-<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+<%= javascript_include_tag 'seems_rateable/jRating','prettify', 'seems_rateable/rateable'%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c2f159f28..7841ead91 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,8 +17,8 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses','header'%>
-  <%= javascript_include_tag "course","header","attachments" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2','prettify', 'courses','header'%>
+  <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 7cd0022ea..c68e917f5 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -7,10 +7,10 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
 		<%= heads_for_theme %>
 
 		<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 2831d642e..02cdf4485 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -7,12 +7,12 @@
 	<meta name="keywords" content="issue,bug,tracker" />
 	<%= csrf_meta_tag %>
 	<%= favicon %>
-	<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+	<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 	<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 	<%= javascript_heads %>
 	<%= heads_for_theme %>
 	<%= call_hook :view_layouts_base_html_head %>
-	<%= javascript_include_tag "ckeditor/ckeditor.js" %>
+	<%= javascript_include_tag "ckeditor/ckeditor.js",'prettify' %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header', :media => 'all'%>
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 3fd00e042..7fb129cb2 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -12,8 +12,9 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_include_tag 'prettify' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 5686c9a1b..f0a433205 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -13,10 +13,10 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
-
+      <%= javascript_include_tag 'prettify' %>
 		<%= heads_for_theme %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index e4fe188d2..91357d09a 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,10 +14,10 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
-<%= javascript_include_tag "avatars"%>
+<%= javascript_include_tag "avatars",'prettify'%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <%= yield :header_tags -%>
diff --git a/app/views/layouts/course_base.html.erb b/app/views/layouts/course_base.html.erb
index 24a784cd5..35ae21fd0 100644
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@@ -12,10 +12,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index db93ee495..98eea13bf 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -13,8 +13,8 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header'%>
-  <%= javascript_include_tag "course","header" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify'%>
+  <%= javascript_include_tag "course","header",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index ae8fd774e..419931936 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','users',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','prettify','users',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'prettify'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/static_base.html.erb b/app/views/layouts/static_base.html.erb
index b81b0755d..15dd9145b 100644
--- a/app/views/layouts/static_base.html.erb
+++ b/app/views/layouts/static_base.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index e356c0560..0caa5e39b 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min" ,'prettify'%>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index ab49fd9d6..f134e8f42 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,7 +11,7 @@
           </li>
           <li class="resourcesListName fl">
             <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
-            <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
+            <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
                         :title => attach.filename,:class=>'resourcesBlack'%>
           </li>
           <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
diff --git a/db/schema.rb b/db/schema.rb
index 9c0f8e373..96b243891 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -764,6 +764,16 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
+  create_table "journal_details_copy", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
+
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0515da364..9cfebf8b3 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -313,10 +313,10 @@ a.uploadText {color:#ffffff; font-size:14px;}
 /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;}
+.resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
 /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}

From 93b179c95893952342fbf9f4fe81f14d15fde491 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Sep 2015 17:11:16 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 251 ++++++++----------
 app/controllers/users_controller.rb           |  13 +
 app/views/homework_common/edit.html.erb       |  43 ++-
 app/views/users/_user_homework_form.html.erb  |  16 +-
 public/stylesheets/new_user.css               |   1 +
 5 files changed, 158 insertions(+), 166 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 2e9925916..862e6c80e 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   require 'json'
   require "base64"
   layout "base_courses"
+  include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create,:next_step]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
@@ -18,151 +19,125 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #新建作业，在个人作业列表创建作业
   def new
-    @homework_type = "1"
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  #新建作业下一步
-  def next_step
-    @homework_type = params[:homework_common_type]
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-
-
-    respond_to do |format|
-      format.html
-    end
+    render_404
+    # @homework_type = "1"
+    #
+    # @homework = HomeworkCommon.new
+    # @homework.safe_attributes = params[:homework_common]
+    # @homework.late_penalty = 2
+    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+    #
+    # if @homework_type == "1"
+    #   #匿评作业相关属性
+    #   @homework_detail_manual = HomeworkDetailManual.new
+    #   @homework_detail_manual.ta_proportion = 0.6
+    #   @homework_detail_manual.absence_penalty = 2
+    #   @homework_detail_manual.evaluation_num = 3
+    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    #   @homework.homework_detail_manual = @homework_detail_manual
+    # elsif @homework_type == "2"
+    #   #编程作业相关属性
+    #   @homework_detail_programing = HomeworkDetailPrograming.new
+    #   @homework.homework_detail_programing = @homework_detail_programing
+    # end
+    # respond_to do |format|
+    #   format.html
+    # end
   end
 
+  #新建作业，在个人作业列表创建作业
   def create
-    if params[:homework_common]
-      homework = HomeworkCommon.new
-      homework.name = params[:homework_common][:name]
-      homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time]
-      homework.publish_time = params[:homework_common][:publish_time]
-      homework.homework_type = params[:homework_common][:homework_type]
-      homework.late_penalty = params[:late_penalty]
-      homework.user_id = User.current.id
-      homework.course_id = @course.id
-
-      homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(homework)
-
-      if homework.homework_type == 2
-        homework_detail_programing = HomeworkDetailPrograming.new
-        homework_detail_programing.language = params[:language]
-        homework_detail_programing.standard_code = params[:standard_code]
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        question = {title:homework.name,content:homework.description}
-        question[:input] = []
-        question[:output] = []
-        if params[:input] && params[:output] && params[:result]
-          params[:input].each do |k,v|
-            if params[:output].include? k
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework.homework_tests << homework_test
-              question[:input] << homework_test.input
-              question[:output] << homework_test.output
-            end
-          end
-        end
-
-        # uri = URI('http://192.168.80.21:8080/api/questions.json')
-        # body = question.to_json
-        # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-        #   request                 = Net::HTTP::Post.new(uri.path)
-        #   request.body            = body
-        #   request["Content-Type"] = "application/json"
-        #   client.request(request)
-        # end
-        # result = JSON.parse(res.body)
-        # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
-
-        homework.homework_detail_programing = homework_detail_programing
-      else
-        #匿评作业相关属性
-        homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = params[:evaluation_start]
-        homework_detail_manual.evaluation_end = params[:evaluation_end]
-        homework_detail_manual.evaluation_num = params[:evaluation_num]
-        homework_detail_manual.absence_penalty = params[:absence_penalty]
-        homework.homework_detail_manual = homework_detail_manual
-      end
-
-      if homework.save
-        homework_detail_programing.save if homework_detail_programing
-        homework_detail_manual.save if homework_detail_manual
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to homework_common_index_path(:course => @course.id)
-          }
-        end
-        return
-      end
-    end
-
-    respond_to do |format|
-      format.html {
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_homework_common_path(:course => @course.id)
-      }
-    end
+    redirect_to user_homeworks_user_path(User.current.id)
+    # if params[:homework_common]
+    #   homework = HomeworkCommon.new
+    #   homework.name = params[:homework_common][:name]
+    #   homework.description = params[:homework_common][:description]
+    #   homework.end_time = params[:homework_common][:end_time]
+    #   homework.publish_time = params[:homework_common][:publish_time]
+    #   homework.homework_type = params[:homework_common][:homework_type]
+    #   homework.late_penalty = params[:late_penalty]
+    #   homework.user_id = User.current.id
+    #   homework.course_id = @course.id
+    #
+    #   homework.save_attachments(params[:attachments])
+    #   render_attachment_warning_if_needed(homework)
+    #
+    #   if homework.homework_type == 2
+    #     homework_detail_programing = HomeworkDetailPrograming.new
+    #     homework_detail_programing.language = params[:language]
+    #     homework_detail_programing.standard_code = params[:standard_code]
+    #     homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+    #     question = {title:homework.name,content:homework.description}
+    #     question[:input] = []
+    #     question[:output] = []
+    #     if params[:input] && params[:output] && params[:result]
+    #       params[:input].each do |k,v|
+    #         if params[:output].include? k
+    #           homework_test = HomeworkTest.new
+    #           homework_test.input = v
+    #           homework_test.output = params[:output][k]
+    #           homework_test.result = params[:result][k]
+    #           homework_test.error_msg = params[:error_msg]
+    #           homework.homework_tests << homework_test
+    #           question[:input] << homework_test.input
+    #           question[:output] << homework_test.output
+    #         end
+    #       end
+    #     end
+    #
+    #     # uri = URI('http://192.168.80.21:8080/api/questions.json')
+    #     # body = question.to_json
+    #     # res = Net::HTTP.new(uri.host, uri.port).start do |client|
+    #     #   request                 = Net::HTTP::Post.new(uri.path)
+    #     #   request.body            = body
+    #     #   request["Content-Type"] = "application/json"
+    #     #   client.request(request)
+    #     # end
+    #     # result = JSON.parse(res.body)
+    #     # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
+    #
+    #     homework.homework_detail_programing = homework_detail_programing
+    #   else
+    #     #匿评作业相关属性
+    #     homework_detail_manual = HomeworkDetailManual.new
+    #     homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+    #     homework_detail_manual.comment_status = 1
+    #     homework_detail_manual.evaluation_start = params[:evaluation_start]
+    #     homework_detail_manual.evaluation_end = params[:evaluation_end]
+    #     homework_detail_manual.evaluation_num = params[:evaluation_num]
+    #     homework_detail_manual.absence_penalty = params[:absence_penalty]
+    #     homework.homework_detail_manual = homework_detail_manual
+    #   end
+    #
+    #   if homework.save
+    #     homework_detail_programing.save if homework_detail_programing
+    #     homework_detail_manual.save if homework_detail_manual
+    #     respond_to do |format|
+    #       format.html {
+    #         flash[:notice] = l(:notice_successful_create)
+    #         redirect_to homework_common_index_path(:course => @course.id)
+    #       }
+    #     end
+    #     return
+    #   end
+    # end
+    #
+    # respond_to do |format|
+    #   format.html {
+    #     flash[:notice] = l(:notice_failed_create)
+    #     redirect_to new_homework_common_path(:course => @course.id)
+    #   }
+    # end
   end
 
   def edit
+    @user = User.current
     respond_to do |format|
-      format.html
+      format.html{render :layout => 'new_base_user'}
     end
   end
 
@@ -284,7 +259,7 @@ class HomeworkCommonController < ApplicationController
   def destroy
     if @homework.destroy
       respond_to do |format|
-        format.html {redirect_to homework_common_index_path(:course => @course.id)}
+        format.html {redirect_to user_homeworks_user_path(User.current.id)}
       end
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9b2d49f2d..088271e86 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -367,6 +367,19 @@ class UsersController < ApplicationController
     end
   end
 
+  #修改编程作业
+  def edit_user_commit_homework
+    if User.current.logged?
+
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
+    end
+  end
+
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
     student_work = homework.student_works.where(user_id: User.current.id).first
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index 5b65b5982..d6815a00a 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -1,24 +1,23 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%= error_messages_for 'homework_common' %>
-
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_edit)%>
-  </h2>
+<script type="text/javascript">
+    function reset_homework(){
+        $("#homework_name").val("");
+        $("#homework_end_time").val("");
+        $("#course_id").val($("#option_select").val());
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
+        homework_description_editor.html("");
+        $("#homework_editor").toggle();
+    }
+</script>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作业</div>
 </div>
-<div class="hwork_new">
-  <%if @homework.homework_type == 2%>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% else %>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% end%>
-</div><!--hwork_new end-->
 <div class="cl"></div>
+
+<!-- 老师身份才可以发布作业 -->
+<div class="HomeWork mb10">
+  <%= form_for @homework do |f| %>
+      <div id="HomeWorkCon">
+        <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+      </div>
+  <% end%>
+</div><!----HomeWork end-->
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 949fb7f83..dfb48ef95 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -11,17 +11,16 @@
   <div class="cl"></div>
 
   <div class=" mt10">
-    <%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
+    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly"  >
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
-
     </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
   <div class="cl"></div>
-  <div id="homework_editor" style="display: none">
+  <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
     <div class="mt10">
       <% if edit_mode %>
           <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
@@ -40,14 +39,19 @@
     <div class="cl"></div>
 
     <div id="homework_attachments">
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>true} %>
+      <!-- 编辑作业 && 作业类型为匿评作业   时没有编程选项-->
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type == 1)} %>
     </div>
 
 
     <div class="mt5">
       <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
       <span class="fr mr10 mt3">或</span>
-      <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+      <% if edit_mode %>
+          <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
+      <% else %>
+          <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+      <% end %>
       <div class="cl"></div>
     </div>
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a37123d76..1a868a903 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -576,6 +576,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;}
 .homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
+.homepagePostSetting ul li:hover ul {display:block;}
 .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;}

From e5e3eeca2c562d071f7345b982aaca1ddd2f9a7a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 17:30:01 +0800
Subject: [PATCH 06/18] =?UTF-8?q?kindeditor=20=20icon=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index bc45cd91f..e8c28f678 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -264,10 +264,10 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['code', 'emoticons',
-		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
+	items : ['code', 'emoticons','fontname',
+        'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+		'formatblock', 'fontsize', '|','indent', 'outdent',
+		 '|','imagedirectupload','table',   'media', 'preview',"more"
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [
@@ -4987,16 +4987,16 @@ KEditor.prototype = {
         htmlList.push('</div>')
         var htmlListFull = [];
         var fullItems =  ['code',
-            'emoticons',
-            'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-            'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media', "less",
+            'emoticons','fontname',
+            'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+              '|','imagedirectupload','table',   'media', 'preview', "less",
                 '/',
-             'undo', 'redo', '|', 'preview', 'print', 'template',
-            'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
-            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/  'fontname',
+            'italic', 'underline',  'undo', 'redo', '|',  'removeformat',
+            'justifyright','justifyfull', 'source','plainpaste', 'wordpaste',  'subscript',
+            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/
             'strikethrough', 'lineheight', 'hr', 'pagebreak',
-            'anchor' , 'link','unlink'
+            'link','unlink', 'print'
         ]
         K.each(fullItems, function(i, name) {
             if (name == '|') {

From 2beb85561ab61ffdf20dceafac1ea34470529e5d Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 09:08:05 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=E5=92=8C?=
 =?UTF-8?q?=E5=B7=B2=E9=80=89=E6=8B=A9=E8=B5=84=E6=BA=90=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource_create.js.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index f7ae832d1..2d6c4f4d8 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -2,4 +2,6 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 //这里不能将翻页的更新
-$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
\ No newline at end of file
+$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
\ No newline at end of file

From 66636efda9cf76da85b9562057b74c9a9fa45f75 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:15:54 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 133 ++++--------------
 app/views/users/_user_homework_form.html.erb  |   6 +-
 2 files changed, 31 insertions(+), 108 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 862e6c80e..b60b12d36 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -142,116 +142,37 @@ class HomeworkCommonController < ApplicationController
   end
 
   def update
-    @homework.name = params[:homework_common][:name]
-    @homework.description = params[:homework_common][:description]
-    @homework.end_time = params[:homework_common][:end_time]
-    @homework.publish_time = params[:homework_common][:publish_time]
-    @homework.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type]
-    unless @homework.late_penalty == params[:late_penalty]
-      @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
-        student_work.late_penalty = params[:late_penalty]
-        student_work.save
-      end
-      @homework.late_penalty = params[:late_penalty]
-    end
-    # @homework.course_id = @course.id
+    if params[:homework_common]
+      @homework.name = params[:homework_common][:name]
+      @homework.description = params[:homework_common][:description]
+      @homework.end_time = params[:homework_common][:end_time] || Time.now
+      @homework.course_id = params[:course_id]
 
-    #匿评作业相关属性
-    if @homework.homework_type == 1 && @homework_detail_manual
-      @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-      @homework_detail_manual.evaluation_start = params[:evaluation_start]
-      @homework_detail_manual.evaluation_end = params[:evaluation_end]
-      @homework_detail_manual.evaluation_num = params[:evaluation_num]
-      unless @homework_detail_manual.absence_penalty == params[:absence_penalty]
-        if @homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
-          work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-          @homework.student_works.each do |student_work|
-            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
-            student_work.save
-          end
-        end
-        @homework_detail_manual.absence_penalty = params[:absence_penalty]
-      end
-    elsif @homework.homework_type == 0 #普通作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
-      @homework.student_works.where("absence_penalty != 0").each do |student_work|
-        student_work.late_penalty = 0
-        student_work.save
-      end
-      @homework_detail_manual.absence_penalty = 0 if @homework_detail_manual
-    end
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
 
-    if @homework.homework_type == 2 && @homework_detail_programing #编程作业
-      @homework_detail_programing.language = params[:language]
-      @homework_detail_programing.standard_code = params[:standard_code]
-      @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-      homework_tests = @homework.homework_tests
-      #需要删除的测试
-      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
-      ids.each do |id|
-        homework_test = HomeworkTest.find id
-        homework_test.destroy if homework_test
-      end
-      if params[:input] && params[:output] && params[:result]
-        params[:input].each do |k,v|
-          if params[:output].include? k
-            homework_test = HomeworkTest.find_by_id k
-            if homework_test #已存在的测试，修改
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-            else #不存在的测试，增加
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework_test.homework_common = @homework
-            end
-            homework_test.save
-          end
-        end
+      #编程作业相关属性
+      if @homework.homework_type == 2
+        # homework_detail_programing = HomeworkDetailPrograming.new
+        # homework.homework_detail_programing = homework_detail_programing
+        # homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+        # homework_detail_programing.language = params[:language_type].to_i
+        #
+        # inputs = params[:program][:input]
+        # if Array === inputs
+        #   inputs.each_with_index do |val, i|
+        #     homework.homework_tests << HomeworkTest.new(
+        #         input: val,
+        #         output: params[:program][:output][i]
+        #     )
+        #   end
+        # end
       end
 
-      #发送修改作业的请求
-      question = {title:@homework.name,content:@homework.description}
-      question[:input] = []
-      question[:output] = []
-      @homework.homework_tests.each do |test|
-        question[:input] << test.input
-        question[:output] << test.output
-      end
-      # uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
-      # body = question.to_json
-      # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-      #   request                 = Net::HTTP::Put.new(uri.path)
-      #   request.body            = body
-      #   request["Content-Type"] = "application/json"
-      #   client.request(request)
-      # end
-      # result = JSON.parse(res.body)
-    end
-
-    @homework.save_attachments(params[:attachments])
-    render_attachment_warning_if_needed(@homework)
-
-    if @homework.save
-      @homework_detail_manual.save if @homework_detail_manual
-      @homework_detail_programing.save if @homework_detail_programing
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_edit)
-          redirect_to homework_common_index_path(:course => @course.id)
-        }
-      end
-      return
-    else
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_failed_edit)
-          redirect_to edit_homework_common_path(@homework)
-        }
+      if @homework.save
+        @homework_detail_manual.save if @homework_detail_manual
+        @homework_detail_programing.save if @homework_detail_programing
+        redirect_to user_homeworks_user_path(User.current.id)
       end
     end
   end
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index dfb48ef95..988c95643 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -45,11 +45,13 @@
 
 
     <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
-      <span class="fr mr10 mt3">或</span>
       <% if edit_mode %>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common');">确定</a>
+          <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
       <% else %>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
+          <span class="fr mr10 mt3">或</span>
           <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <% end %>
       <div class="cl"></div>

From 948a6c9138ebb13047468aa2fd92343ba55b44ad Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:20:43 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E8=8A=82=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index c337bb672..8676c6fb1 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -27,7 +27,7 @@
 </div>
 
 <div class="homepageContentContainer">
-  <div class="homepageRightBannerImg"></div>
+  <!--div class="homepageRightBannerImg"></div-->
   <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft" id="LSide">

From a94521f2e15bf0b73d3c543c62709bd9fae7d2e8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:36:44 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 1 +
 app/helpers/homework_common_helper.rb         | 1 +
 app/views/users/_user_homework_form.html.erb  | 2 +-
 public/javascripts/new_user.js                | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index b60b12d36..a3b981b22 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   require 'json'
   require "base64"
   layout "base_courses"
+
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create,:next_step]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 43f815250..a03c4ccd7 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+include UsersHelper
 module HomeworkCommonHelper
   #迟交扣分下拉框
   def late_penalty_option
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 988c95643..b4118bd2a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -46,7 +46,7 @@
 
     <div class="mt5">
       <% if edit_mode %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common');">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
       <% else %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 8362217a7..eb50c2762 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -71,6 +71,7 @@ function submit_homework(id)
         $("#course_id").focus();
     }
     else{
+
         homework_description_editor.sync();
         $("#"+id).submit();
     }

From 30ebe9b2d53469b1404f14828f7149a341497171 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:59:34 +0800
Subject: [PATCH 11/18] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=8F=AF=E4=BB=A5=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=202=E3=80=81=E5=8F=96=E6=B6=88=E6=89=A3=E5=88=86=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=9A=84=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        | 36 +++++++++++++-----------
 app/views/homework_common/index.html.erb | 14 ++++-----
 app/views/student_work/index.html.erb    | 14 ++++-----
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4c78c03df..a1663c76b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2297,25 +2297,27 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-        link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
-      elsif homework.student_works.count >= 2 #作业份数大于2
-        case homework.homework_detail_manual.comment_status
-          when 1
-            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 2
-            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 3
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+    # if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+    #
+    # elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
+    #   link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
+    # else
+    #   link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    # end
+
+    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+      link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+    elsif homework.student_works.count >= 2 #作业份数大于2
+      case homework.homework_detail_manual.comment_status
+        when 1
+          link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+        when 2
+          link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+        when 3
+          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
       end
-    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-      link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
     else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+      link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
     end
     link
   end
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index bbf4aa343..694069b44 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -98,17 +98,17 @@
             <div class="cl"></div>
         <% end%>
 
-        <div class="mt5">
+        <!--div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
           <div class="fl mb5 c_red">
-            <% if homework.homework_type == 1%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
-            <% else%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
-            <% end%>
+            <%# if homework.homework_type == 1%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
+            <%# else%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
+            <%# end%>
           </div>
         </div>
-        <div class="cl"></div>
+        <div class="cl"></div-->
 
         <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
         <% if betweentime(homework.end_time) < 0 %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 776af3b3e..e8fa33902 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -185,18 +185,18 @@
         </div>
         <div class="cl"></div>
 
-        <div class="mt5">
+        <!--div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
           <div class="fl mb5 c_red">
-            <% if @homework.homework_type == 1%>
-                <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%>
-            <% else%>
-                <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%>
-            <% end%>
+            <%# if @homework.homework_type == 1%>
+                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%>
+            <%# else%>
+                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%>
+            <%# end%>
           </div>
         </div>
 
-        <div class="cl"></div>
+        <div class="cl"></div-->
         <span class="fl">截止时间：<%= @homework.end_time%></span>
         <div >
           <% if betweentime(@homework.end_time) < 0 %>

From 7db774eedb8c57b769731aae3a5ec252fee49cdb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:19:45 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8C=BF=E8=AF=84=E7=9B=B8=E5=85=B3=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=B8=BA=E4=BD=9C=E4=B8=9A=E5=BF=85=E9=A1=BB=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 088271e86..d332af793 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -408,17 +408,17 @@ class UsersController < ApplicationController
         homework.save_attachments(params[:attachments])
         render_attachment_warning_if_needed(homework)
 
-        #匿评作业相关属性
-        if homework.homework_type == 1
-          homework_detail_manual = HomeworkDetailManual.new
-          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-          homework_detail_manual.comment_status = 1
-          homework_detail_manual.evaluation_start = Time.now
-          homework_detail_manual.evaluation_end = Time.now
-          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-          homework_detail_manual.absence_penalty = 2
-          homework.homework_detail_manual = homework_detail_manual
-        else
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = Time.now
+        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+        homework_detail_manual.absence_penalty = 2
+        homework.homework_detail_manual = homework_detail_manual
+
+        #编程作业相关属性
+        if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
           homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6

From dfed4885de1fbb8e1eafc4d18d7a1f07df717a17 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:36:16 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E4=B9=8B=E5=90=8E=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_homeworks.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index b3aaf5ece..f375496d1 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -3,7 +3,7 @@
       $("#homework_name").val("");
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
-      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
+      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
       homework_description_editor.html("");
       $("#homework_editor").toggle();
   }

From 527ff41d4305eb83b060f715ff5cee04ae641d19 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:44:10 +0800
Subject: [PATCH 14/18] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=202=E3=80=81=E5=8C=BF=E8=AF=84=E5=BC=B9=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/new.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 556f054f1..85c23f300 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -1,17 +1,20 @@
 <!-- 此界面只用来新建匿评作业作品 -->
 <script type="text/javascript">
-  <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
+  <%if @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
         showModal('ajax-modal', '360px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().css("top","30%").css("left","40%");
         $('#ajax-modal').parent().addClass("anonymos_work");
 //        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
     });
   <% end%>
+
+  //匿评弹框取消按钮
+  function clickCanel(){hideModal("#popbox02");}
 </script>
 
 <div class="homepageRightBanner mb10">

From f4c19c0fb0224ec09f8171ea9fb2559549316afc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:50:16 +0800
Subject: [PATCH 15/18] =?UTF-8?q?1=E3=80=81homework.js=20=20=20on=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAlive=202=E3=80=81=E5=AF=BC=E5=85=A5=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BC=96=E7=A8=8B=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_select_homework.js.erb |  2 +-
 public/javascripts/homework.js              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index a18fdacc8..acffd2506 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -3,6 +3,6 @@ hideModal('#coursesChoosePopup');
 $("#homework_name").val("<%= @homework.name%>");
 $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#course_id").val("<%= @homework.course_id%>");
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>");
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#homework_editor").show();
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index c136029bf..773a2c209 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -58,10 +58,10 @@ $(function(){
         );
     };
 
-    $('#test-program-btn').on('click', test_program);
+    $('#test-program-btn').live('click', test_program);
 
 
-    $('#commit-program-work-btn').on('click', function(){
+    $('#commit-program-work-btn').live('click', function(){
         if(!valid_form()){
             return;
         }
@@ -89,7 +89,7 @@ $(function(){
         $(".HomeWorkCon form").submit();
     });
 
-    $('form.edit_student_work').on('keydown', '#program-src', function(){
+    $('form.edit_student_work').live('keydown', '#program-src', function(){
         tested = false;
     });
 
@@ -104,12 +104,12 @@ $(function(){
 
     $('input.date-input').datepicker(datepickerOptions);
 
-    $('a.pic_date').on('click', function(){
+    $('a.pic_date').live('click', function(){
         $(this).parent().prev().first().focus();
     })
     
 
-    $('a.ProBtn').on('click', function(){
+    $('a.ProBtn').live('click', function(){
         $("#BluePopupBox").dialog({
             modal: true,
             dialogClass: 'BluePopupBox',
@@ -117,12 +117,12 @@ $(function(){
         });
         $(".ui-dialog-titlebar").hide();
 
-        $("a.CloseBtn").on('click', function(){
+        $("a.CloseBtn").live('click', function(){
             $("#BluePopupBox" ).dialog("close");
         });
         $('#textarea_input_test').focus();
 
-        $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+        $("#BluePopupBox a.BlueCirBtn").live('click', function(){
             var test_numbers = 0;
             var valid = true;  
             var input = null;
@@ -162,12 +162,12 @@ $(function(){
         });
     });
 
-    $("#BluePopupBox").on('click', 'a.icon_add', function(){
+    $("#BluePopupBox").live('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
 
     });
-    $("#BluePopupBox").on('click', 'a.icon_remove', function(){
+    $("#BluePopupBox").live('click', 'a.icon_remove', function(){
         $(this).parent('.mt10').remove();
     });
 });
\ No newline at end of file

From 8848b3975e2bf6a111b26b827fae8b571de9a07f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 10:52:13 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84kindeditor=E5=A4=AA=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kindeditor/plugins/autoheight/autoheight.js       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
index 546578bfa..3c25fe49e 100644
--- a/public/assets/kindeditor/plugins/autoheight/autoheight.js
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -27,7 +27,9 @@ KindEditor.plugin('autoheight', function(K) {
 		var edit = self.edit;
 		var body = edit.doc.body;
 		edit.iframe.height(minHeight);
-		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+		self.resize(null, Math.max(
+            (K.IE ? body.scrollHeight : body.offsetHeight)
+                + 76, minHeight));
 	}
 
 	function init() {
@@ -35,7 +37,12 @@ KindEditor.plugin('autoheight', function(K) {
 
 		self.edit.afterChange(resetHeight);
 		hideScroll();
-		resetHeight();
+        var edit = self.edit;
+        var body = edit.doc.body;
+        edit.iframe.height(minHeight);
+        self.resize(null, Math.max(
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 500 ? 500 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+                + 76, minHeight));
 	}
 
 	if (self.isCreated) {

From cd36965cd12af08846a73f0e6eb60bb043306fb7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 11:31:59 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=95=B0=E6=8D=AE=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  15 +--
 ...0150911031029_about_programing_homework.rb |  25 +++++
 db/schema.rb                                  | 103 ++++++++++--------
 3 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 db/migrate/20150911031029_about_programing_homework.rb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a3b981b22..d4c02860e 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -154,20 +154,7 @@ class HomeworkCommonController < ApplicationController
 
       #编程作业相关属性
       if @homework.homework_type == 2
-        # homework_detail_programing = HomeworkDetailPrograming.new
-        # homework.homework_detail_programing = homework_detail_programing
-        # homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        # homework_detail_programing.language = params[:language_type].to_i
-        #
-        # inputs = params[:program][:input]
-        # if Array === inputs
-        #   inputs.each_with_index do |val, i|
-        #     homework.homework_tests << HomeworkTest.new(
-        #         input: val,
-        #         output: params[:program][:output][i]
-        #     )
-        #   end
-        # end
+
       end
 
       if @homework.save
diff --git a/db/migrate/20150911031029_about_programing_homework.rb b/db/migrate/20150911031029_about_programing_homework.rb
new file mode 100644
index 000000000..50786834b
--- /dev/null
+++ b/db/migrate/20150911031029_about_programing_homework.rb
@@ -0,0 +1,25 @@
+class AboutProgramingHomework < ActiveRecord::Migration
+  def up
+    HomeworkCommon.where(:homework_type => 2).each do |homework|
+      unless homework.homework_detail_manual
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion =  0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = homework.created_at
+        homework_detail_manual.evaluation_end = homework.created_at
+        homework_detail_manual.evaluation_num =  3
+        homework_detail_manual.absence_penalty = 2
+        homework_detail_manual.homework_common_id = homework.id
+        homework_detail_manual.save
+      end
+    end
+  end
+
+  def down
+    HomeworkCommon.where(:homework_type => 2).each do |homework|
+      if homework.homework_detail_manual
+        homework.homework_detail_manual.destroy
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 96b243891..008e13129 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150907152238) do
+ActiveRecord::Schema.define(:version => 20150911031029) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -236,6 +236,13 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -469,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -483,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -764,16 +781,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -909,7 +916,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1166,18 +1172,18 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1202,6 +1208,19 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1253,10 +1272,11 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1419,8 +1439,8 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1488,9 +1508,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|

From 17b4b31449b2fc1bb28de0ef42b6072bfac319ad Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 14:44:50 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=9B=9E=E5=A4=8D=20textarea?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 2 +-
 app/views/users/_course_news.html.erb     | 2 +-
 app/views/users/_project_issue.html.erb   | 2 +-
 app/views/users/_project_message.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index eee272fe6..1587cbfb1 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -72,7 +72,7 @@
         <%= 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|%>
             <input type="hidden" name="quote[quote]" value="">
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index d2213c743..857ae3697 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -44,7 +44,7 @@
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 04f541d77..e0e093f2d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -82,7 +82,7 @@
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 5fc10e48c..2c0dfeec0 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -58,7 +58,7 @@
         <%= 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|%>
             <input type="hidden" name="quote[quote]" value="">
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>