Merge branch 'szzh' into develop

app/views/courses/show.html.erb

@@ -17,9 +17,9 @@
             <li><%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%></li>
             <li><%= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%></li>
             <li><%= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%></li>
-            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "resourcesTypeAtt resourcesGrey"%></li>
+            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey"%></li>
             <li><%= link_to "论坛动态", {:controller => "courses", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey"%></li>
-            <li><%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeQuiz postTypeGrey"%></li>
+            <li><%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeMessage postTypeGrey"%></li>
             <li><%= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%></li>
           </ul>
         </li>

app/views/layouts/base_forums.html.erb

@@ -123,7 +123,7 @@
             }
         });
 
-        function del_confirm(){
+        function del_forum_confirm(){
             if(confirm('您确定要删除么?')){
                 $("#del_link").click();
             }
@@ -180,7 +180,7 @@
              <span class="postEdit">
             </span>
             <a href="<%= edit_forum_path(@forum) %>" class="linkGrey3">编辑贴吧</a>
-            <a href="javascript:void(0);" data-method="delete" onclick="del_confirm();" class="fr linkGrey3">删除贴吧</a>
+            <a href="javascript:void(0);" data-method="delete" onclick="del_forum_confirm();" class="fr linkGrey3">删除贴吧</a>
                 <a href="<%= forum_path(@forum)%>" data-method="delete" id="del_link" type="hidden"></a>
             <span class="postDelete"></span>
              <% end %>

app/views/memos/_praise_tread.html.erb

@@ -7,7 +7,7 @@
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>
               <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
-                  <a href="javascript:void(0);" class="<%= @obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+                  <a href="javascript:void(0);" class="<%= obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
               <% end %>
           <% else %>
               <% if user_id == obj.author_id %>

public/assets/kindeditor/kindeditor.js

@@ -5031,7 +5031,7 @@ KEditor.prototype = {
 			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
 			src : editDiv,
 			srcElement : self.srcElement,
-			designMode : self.designMode,
+			designMode : true,
 			themesPath : self.themesPath,
 			bodyClass : self.bodyClass,
 			cssPath : self.cssPath,
@@ -5063,9 +5063,9 @@ KEditor.prototype = {
 				_bindTabEvent.call(self);
 				_bindFocusEvent.call(self);
 				edit.afterChange(function(e) {
-					if (!edit.designMode) {
+//					if (!edit.designMode) {
-						return;
+//						return;
-					}
+//					}
 					self.updateState();
 					self.addBookmark();
                     //prettyPrint("",self.edit.doc.body);

public/javascripts/course.js

@@ -410,22 +410,6 @@ function show_bid_dead_line(year,month,day,divname)
     + "<p class='fr'>作品提交还剩：</p>");
 }
 
-//验证新建作业的名字
-function regex_homework_name()
-{
-    var name = $.trim($("#homework_name").val());
-
-    if(name=="")
-    {
-        $("#homework_name_span").text("名称不能为空");
-        return false;
-    }
-    else
-    {
-        $("#homework_name_span").text("");
-        return true;
-    }
-}
 
 //处理迟交、缺评扣分
 function check_late_penalty(id)
@@ -579,22 +563,68 @@ function regex_evaluation_num(){
 }
 
 //老师提交 新建/修改 作业
-//function submit_homework(id)
+function submit_homework(id){
-//{
+    if(!regex_homework_name()){
-//    if(!regex_homework_name())
+        $("#homework_name").focus();
-//    {
+    }
-//        $("#homework_name").focus();
+    else if(!regex_homework_end_time()){
-//    }
+        $("#homework_end_time").focus();
-//    else if(!regex_evaluation_num())
+    }
-//    {
+    else if(!regex_course_id()){
-//        $("#evaluation_num").focus();
+        $("#course_id").focus();
-//    }
+    }
-//    else
+    else{
-//    {
+        homework_description_editor.sync();
-//        homework_description_editor.sync();
+        $("#"+id).submit();
-//        $("#"+id).submit();
+    }
-//    }
+}
-//}
+
+//验证新建作业的名字
+function regex_homework_name()
+{
+    var name = $.trim($("#homework_name").val());
+
+    if(name=="")
+    {
+        $("#homework_name_span").text("名称不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_name_span").text("");
+        return true;
+    }
+}
+//验证截止时间
+function regex_homework_end_time()
+{
+    var name = $.trim($("#homework_end_time").val());
+    if(name=="")
+    {
+        $("#homework_end_time_span").text("截止时间不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_end_time_span").text("");
+        return true;
+    }
+}
+
+//验证发送到课程
+function regex_course_id(){
+    var course_id = $("#course_id").val();
+    if(course_id == -1)
+    {
+        $("#homework_course_id_span").text("发布课程不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_course_id_span").text("");
+        return true;
+    }
+}
 
 function regexHomeworkCommonName()
 {

public/javascripts/new_user.js

@@ -63,17 +63,10 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
-    //else if(!regex_evaluation_start()){
-    //    $("#evaluation_start_time").focus()
-    //}
-    //else if(!regex_evaluation_end()){
-    //    $("#evaluation_end_time").focus()
-    //}
     else if(!regex_course_id()){
         $("#course_id").focus();
     }
     else{
-
         homework_description_editor.sync();
         $("#"+id).submit();
     }

public/stylesheets/courses.css

@@ -96,6 +96,8 @@ a.homepagePostTypeAssignment {background:url(../images/homepage_icon.png) -93px
 a.homepagePostTypeNotice {background:url(../images/homepage_icon.png) -87px -280px no-repeat; padding-left:23px;}
 a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310px no-repeat; padding-left:23px;}
 a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
+a.homepagePostTypeMessage {background:url(images/homepage_icon.png) -3px -518px no-repeat; padding-left:23px;}
+a.homepagePostTypeResource {background:url(images/homepage_icon.png) -86px -517px no-repeat; padding-left:23px;}
 a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;}
 a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277px no-repeat; padding-left:23px;}
 a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -189px -308px no-repeat; padding-left:23px;}

public/stylesheets/new_user.css

@@ -798,6 +798,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailWrap {width:580px; float:left;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
+.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

public/stylesheets/prettify.css

@@ -43,7 +43,11 @@ pre li,ul,ol {
 }
 
 /* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px } /* IE indents via margin-left */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px !important; } /* IE indents via margin-left */
+.list_style ol li {
+    list-style-type: decimal;
+    margin-left: 10px;
+}
 li.L0,
 li.L1,
 li.L2,

public/stylesheets/project.css

@@ -881,3 +881,19 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .wiki {width: 510px;}
 .wiki img {max-width:100%;}
 
+#content_ .tabs_enterprise ul li a.selected:hover {background-color: #E2F4FF;}
+/*end*/
+/*end*/
+/***** Diff *****/
+.diff_out { background: #fcc; }
+.diff_out span { background: #faa; }
+.diff_in { background: #cfc; }
+.diff_in span { background: #afa; }
+
+.text-diff {
+    padding: 1em;
+    background-color:#f6f6f6;
+    color:#505050;
+    border: 1px solid #e4e4e4;
+}
+