Merge branch 'yuanke' into develop

app/views/blog_comments/show.html.erb

@@ -215,6 +215,9 @@
   $(function(){
       var postContent = $("#message_description_<%= @article.id %>").html();
       postContent = postContent.replace(/&nbsp;/g," ");
+      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
       $("#message_description_<%= @article.id %>").html(postContent);
       autoUrl('message_description_<%= @article.id %>');
   });

app/views/courses/_history.html.erb

@@ -15,9 +15,11 @@
                     <%= format_time(journal.created_on) %>
                   </span>
               <div class="cl"></div>
-              <p>
+              <div class = "ping_journal" id="journal_<%= journal.id %>">
-                <%= journal.notes.html_safe %>
+                  <p>
-              </p>
+                    <%= journal.notes.html_safe %>
+                  </p>
+              </div>
               <div class="cl"></div>
             </div>
             <div class="ping_disfoot f14">
@@ -49,6 +51,12 @@
           </div>
           <div class="cl"></div>
         </div>
+        <script type="text/javascript">
+            $(function(){
+                showNormalImage('journal_<%= journal.id %>');
+                autoUrl('journal_<%= journal.id %>');
+            });
+        </script>
     <% end %>
 <% end %>
 

app/views/organizations/_org_subfield_leftMD.html.erb

@@ -28,7 +28,7 @@
                               <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -50,7 +50,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -67,7 +67,7 @@
                               <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -130,7 +130,7 @@
                               <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -151,7 +151,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -168,7 +168,7 @@
                               <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank"  %>
@@ -214,7 +214,7 @@
                               <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
@@ -244,7 +244,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
@@ -264,7 +264,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
@@ -285,7 +285,7 @@
                                 </h3>
                                 <div class="resources-tagbox">
                                   <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
-                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
+                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28, :maxwidth=>0} %>
                                 </div>
                                 <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
                               </div>

app/views/projects/_history.html.erb

@@ -10,7 +10,9 @@
                   </span><span class="c_grey fr f14"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
-                  <p><%=journal.notes.html_safe%>
+                  <div class = "ping_journal" id="journal_<%= journal.id %>">
+                    <p><%=journal.notes.html_safe%></p>
+                  </div>
                 </div>
                 <div class="ping_disfoot f14">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
@@ -42,6 +44,12 @@
               </div>
               <div class="cl"></div>
             </div>
+            <script type="text/javascript">
+                $(function(){
+                    showNormalImage('journal_<%= journal.id %>');
+                    autoUrl('journal_<%= journal.id %>');
+                });
+            </script>
         <% end %>
     <% end %>
 

app/views/users/_course_boardlist.html.erb

@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">
-                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>

app/views/users/_course_newslist.html.erb

@@ -24,16 +24,15 @@
                       <span class="fl ml10 red-cir-btn">顶</span>
                   <% end%>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">
+                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
                   <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>
                   <% count=activity.comments.count %>

app/views/users/_intro_content_ex.html.erb

@@ -12,6 +12,11 @@
             $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
         }
 
+        var maxWidth = <%= maxwidth %>
+        if (maxWidth > 0) {
+            $("#intro_content_<%= user_activity_id%>").css("max-width", maxWidth + "px");
+        }
+
         description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>);
     });
 </script>

app/views/users/_project_boardlist.html.erb

@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10 f12">
-                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">
-                  <span class="grayTxt">更新：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>

app/views/users/_user_course_list.html.erb

@@ -24,7 +24,7 @@
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-                </span>
+                  </span>
               </li>
               <div class="cl"></div>
                 <li class="ml15">

app/views/words/_journal_reply_items.html.erb

@@ -20,10 +20,11 @@
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>
-
+        <div id="reply_<%= reply.id %>">
-        <p>
+            <p>
-          <%= reply.notes.html_safe %>
+              <%= reply.notes.html_safe %>
-        </p>
+            </p>
+        </div>
         <div class="cl"></div>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
@@ -53,3 +54,9 @@
       <div class="cl"></div>
     </div>
 <% end %>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply__<%= reply.id %>');
+        autoUrl('reply_<%= reply.id %>');
+    });
+</script>

public/assets/kindeditor/kindeditor.js

@@ -297,7 +297,7 @@ K.options = {
 		'td,th': [
 			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
-			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border', '.text-overflow','.overflow','.white-space'
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
 		],
 		a : ['id', 'class', 'href', 'target', 'name'],
 		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
@@ -2539,7 +2539,8 @@ function _nativeCommand(doc, key, val) {
 function _nativeCommandValue(doc, key) {
 	var val = '';
 	try {
-		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+//		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+        val = doc.queryCommandValue(key);
 	} catch (e) {}
 	if (typeof val !== 'string') {
 		val = '';
@@ -3310,6 +3311,7 @@ _each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull
 		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
 			self.selection();
 		}
+
 		return self;
 	};
 });
@@ -5751,7 +5753,7 @@ _plugin('core', function(K) {
 				h2 : 24,
 				h3 : 18,
 				H4 : 14,
-				p : 12
+                p : 12
 			},
 			curVal = self.cmd.val('formatblock'),
 			menu = self.createMenu({
@@ -5769,6 +5771,14 @@ _plugin('core', function(K) {
 				checked : (curVal === key || curVal === val),
 				click : function() {
 					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+                    //by yk利用html的特性使h1 h2 h3 h4标签之间不能相互包含 并将空的标签去掉
+                    if (key != "p"){
+                        var val = self.select().html();
+                        self.select().html(val);
+                        val = self.select().html().replace(/(<h1>\s*<\/h1>)|(<h2>\s*<\/h2>)|(<h3>\s*<\/h3>)|(<h4>\s*<\/h4>)/g,"");
+                        self.select().html(val);
+                        self.select();
+                    }
 				}
 			});
 		});

public/assets/kindeditor/plugins/autoheight/autoheight.js

@@ -41,7 +41,7 @@ KindEditor.plugin('autoheight', function(K) {
         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)) //限制初始化太高的情况
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 250 ? 250 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
                 + 33, minHeight));
 	}
 

public/assets/kindeditor/plugins/code/previewcode.css

@@ -1,7 +1,7 @@
 .ke-content {
-    font-size: 12px;
+    font-size: 14px;
-    font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢<EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
+    /*font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;*/
-    font-family:Tahoma;
+    font-family: "微软雅黑","宋体";
 }
 .ke-content pre {
     font-size:9pt;
@@ -53,4 +53,6 @@ span.at a{color:#269ac9;text-decoration: none;}
 /*yk*/
 .ke-content ol li{list-style-type: decimal;}
 .ke-content ul li{list-style-type: disc;}
-.ke-content ol,.ke-content ul{margin-top:0;margin-bottom: 0;}
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
+.ke-content a{color: #15bccf;}
+.ke-content a:link,.ke-content a:visited{text-decoration:none;}

public/assets/kindeditor/plugins/table/table.js

@@ -257,6 +257,7 @@ KindEditor.plugin('table', function(K) {
                             style += 'border-color:'+borderColor+';';
                         }
                         style += 'table-layout: '+'fixed;';
+                        style += 'border-collapse: collapse;';
 						var html = '<table';
 						if (style !== '') {
 							html += ' style="' + style + '"';
@@ -283,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}

public/javascripts/application.js

@@ -1358,10 +1358,10 @@ function autoUrl(id){
                     var reStr = full;
                     if (full.length > 0){
                         if (full.indexOf("://") >= 0){
-                            reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                         }
                         else{
-                            reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                            reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                         }
                     }
                     return reStr ;
@@ -1377,10 +1377,10 @@ function autoUrl(id){
             var reStr = full;
             if (full.length > 0){
                 if (full.indexOf("://") >= 0){
-                    reStr =  "<a target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
                 }
                 else{
-                    reStr =  "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
+                    reStr =  "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
                 }
             }
             return reStr ;

public/javascripts/create_kindeditor.js

@@ -25,7 +25,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();

public/javascripts/homework.js

@@ -487,6 +487,7 @@ int main()\n\
 ';
            } else if(language==3){
 src = '\
+#-*-coding:utf-8-*-\n\
 #注意\n\
     #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
     #2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\

public/stylesheets/courses.css

@@ -140,6 +140,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
 .homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;}
+.homepagePostTitle a{color: #15bccf;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
@@ -147,7 +148,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
-
+.homepagePostIntro a{color: #15bccf;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -189,6 +190,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyContent a{color: #15bccf;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -436,6 +438,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
 .ping_discon{ float:left; width:610px; margin-left:10px; }
+.ping_journal a{color: #15bccf;}
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
@@ -1132,7 +1135,8 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
-.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
+.postDetailDes a{color: #15bccf;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; }
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}

public/stylesheets/css.css

@@ -123,7 +123,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .list_style ol li{list-style-type: decimal;margin-left: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
-
+.ping_journal a{color: #15bccf;}
 
 /* 创建作业 */
 .Newwork{ width:940px; border:1px solid #c3c3c3;}

public/stylesheets/new_user.css

@@ -673,6 +673,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
 .homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;}
+.homepagePostTitle a{color: #15bccf;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
@@ -683,6 +684,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+.homepagePostIntro a{color: #15bccf;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -722,6 +724,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyContent a{color: #15bccf;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -866,6 +869,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
+.postDetailDes a{color: #15bccf;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; } /*line-height: 18px !important;*/
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}

public/stylesheets/project.css

@@ -332,6 +332,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
+.ping_journal a{color: #15bccf;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
 .list_style ol li{list-style-type: decimal;margin-left: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
@@ -974,6 +975,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+.homepagePostIntro a{color: #15bccf;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1114,7 +1116,8 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
-.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
+.postDetailDes a{color: #15bccf;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}

public/stylesheets/public.css

@@ -24,9 +24,9 @@ table{ background:#fff;}
 a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 .db {display:block;}
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
+h2{ font-size:18px; }
-h3{ font-size:14px; color:#e8770d;}
+h3{ font-size:14px; }
-h4{ font-size:14px; color:#3b3b3b;}
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}
@@ -611,6 +611,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+.homepagePostIntro a{color: #15bccf;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -647,6 +648,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyContent a{color: #15bccf;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}

public/stylesheets/public_new.css

@@ -22,9 +22,9 @@ table{ background:#fff;}
 .none{display: none;}
 
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
+h2{ font-size:18px; }
-h3{ font-size:14px; color:#e8770d;}
+h3{ font-size:14px; }
-h4{ font-size:14px; color:#3b3b3b;}
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}