Merge branch 'develop' into 'develop'

bug修复



See merge request !124

app/controllers/works_controller.rb

@@ -242,7 +242,8 @@ class WorksController < ApplicationController
   def set_score_rule
     # 未启动在线评审时才能更改评审参数
     if @contestwork.work_status < 3
-      @contestwork.online_evaluation = params[:online_evaluation] ? 1 : 0
+      @contestwork.online_evaluation = params[:online_evaluation].to_i ? 1 : 0
+      @contestwork.save
 
       # 如果开启在线评审
       if params[:online_evaluation]

app/views/admin/contests.html.erb

@@ -21,25 +21,25 @@
       <th style="width: 40px;">
         序号
       </th>
-      <th style="width: 200px;">
+      <th style="width: 180px;">
         竞赛
       </th>
       <th style="width: 40px;">
         公开
       </th>
-      <th style="width: 100px;">
+      <th style="width: 80px;">
         创建者
       </th>
-      <th style="width: 30px;">
+      <th style="width: 40px;">
         成员数
       </th>
-      <th style="width: 30px;">
+      <th style="width: 40px;">
         提交数
       </th>
-      <th style="width: 70px;">
+      <th style="width: 80px;">
         创建于
       </th>
-      <th style="width: 120px;">
+      <th style="width: 130px;">
         最新动态时间
       </th>
     </tr>

app/views/contestant_works/_has_commit_work.html.erb

@@ -1,12 +1,17 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
-    <div><p align='center' style='margin-top: 35px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
+    <h3 class="fl">提示</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div><p align='center' style='margin-top: 30px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
     <div class="cl"></div>
     <div class="ni_btn mt10">
-      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+      <a href="javascript:" class="fr sy_btn_blue mr30" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
         编&nbsp;&nbsp;辑
       </a>
-      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
+      <a href="javascript:" class="fr sy_btn_grey mr5" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
         取&nbsp;&nbsp;消
       </a>
     </div>

app/views/contestant_works/_work_edit_information.html.erb

@@ -1,10 +1,18 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
+    <h3 class="fl">作品确认</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div class="clear mt15 ml20" style="color:#808181;">
       <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+
       <p class="f14 mt5 break_word">
         <span class="fb">作品名称：</span><%= @student_work.name %>
       </p>
-    <div class="f14 mt5 break_word" style="max-width: 425px; color:#808181; max-height:300px; overflow-x:hidden; overflow-y: auto;">
+
+      <div class="f14 mt5 break_word" style="max-width: 425px; max-height:300px; overflow-x:hidden; overflow-y: auto;">
         <div class="fb fl dis">作品描述：</div>
         <div class="upload_img fl" style="max-width: 330px;"><%= @student_work.description.html_safe %></div>
         <div class="cl"></div>
@@ -12,7 +20,7 @@
       <p class="mt5">
         <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
         <% if @student_work.attachments.empty? %>
-          <span class="fl c_red"><%= "无附件"%></span>
+            <span class="fl c_red">无附件</span>
         <% else %>
             <div class="fl grey_c">
               <% @student_work.attachments.each_with_index do |attachment, i| %>
@@ -20,6 +28,7 @@
                     <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
                     <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
                     <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+
                     <div class="cl"></div>
                   </div>
               <% end -%>
@@ -29,12 +38,13 @@
       </p>
       <div class="cl"></div>
       <div class="ni_btn mt10">
-        <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+        <a href="javascript:" class="sy_btn_blue" onclick="clickOK();" style="margin-left: 55px;">
           确&nbsp;&nbsp;定
         </a>
       </div>
     </div>
   </div>
+</div>
 
 <script type="text/javascript">
     function clickOK() {

app/views/contestant_works/_work_information.html.erb

@@ -1,9 +1,17 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
+    <h3 class="fl">作品确认</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div class="clear mt15 ml20" style="color:#808181;">
       <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+
       <p class="f14 mt5 break_word">
         <span class="fb">作品名称：</span><%= @student_work.name %>
       </p>
+
       <div class="f14 mt5 break_word" style="max-width: 425px; color:#808181; max-height:300px; overflow-x:hidden; overflow-y: auto;">
         <div class="fb fl dis">作品描述：</div>
         <div id="worksDescription" class="upload_img fl" style="max-width: 330px;"><%= @student_work.description.html_safe %></div>
@@ -20,6 +28,7 @@
                     <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
                     <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
                     <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+
                     <div class="cl"></div>
                   </div>
               <% end -%>
@@ -29,10 +38,11 @@
       </p>
       <div class="cl"></div>
       <div class="ni_btn mt10">
-        <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+        <a href="javascript:" class="fr sy_btn_blue mr45" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;">
           确&nbsp;定
         </a>
-        <%= link_to("重 试", retry_work_contestant_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
+        <%= link_to("重 试", retry_work_contestant_work_path(@student_work.id), :class => "fr sy_btn_blue mr5", :style => "margin-bottom: 15px;margin-top:15px;", :remote => true) %>
+      </div>
     </div>
   </div>
 </div>

app/views/contestant_works/create.js.erb

@@ -1,19 +1,10 @@
+hideModal();
 <% if @has_commit %>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'has_commit_work') %>');
+    var htmlvalue = '<%= escape_javascript(render :partial => 'contestant_works/has_commit_work') %>';
-showModal('ajax-modal', '500px');
+    pop_box_new(htmlvalue, 500, 163);
-$('#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","").css("border","3px solid #269ac9");
-$('#ajax-modal').parent().addClass("anonymos");
 <% elsif @submit_result%>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'work_information') %>');
+    var htmlvalue = '<%= escape_javascript(render :partial => 'contestant_works/work_information') %>';
-showModal('ajax-modal', '500px');
+    pop_box_new(htmlvalue, 500, 400);
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='/student_work/"+ <%=@student_work.id%> +"/retry_work' class='upload_btn' data-remote='true'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-$('#ajax-modal').parent().addClass("anonymos");
 <% else %>
     window.location.href = '<%= new_contestant_work_path(:work => @contestwork.id)%>';
 <% end %>

app/views/contestant_works/new.html.erb

@@ -21,28 +21,6 @@
     });
     <% end %>
 
-//    //快速创建项目的弹框
-//    function new_project(){
-//        $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'student_work/new_project') %>');
-//        showModal('ajax-modal', '800px');
-//        $('#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","30%").css("left","20%").css("position","fixed").css("border","3px solid #269ac9");
-//    }
-
-//    // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
-//    function store_seleted_resource(dom){
-//        if(dom.attr('checked') == 'checked' ){
-//            $.get(
-//                            '<%#= store_selected_resource_user_path(User.current) %>'+'?save=y&res_id='+dom.val()
-//            )
-//        }else {
-//            $.get(
-//                            '<%#= store_selected_resource_user_path(User.current) %>'+'?save=n&res_id='+dom.val()
-//            )
-//        }
-//    }
     // 添加组成员
     function show_group_member() {
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'choose_group_member',:locals => {:homework=>@contestwork}) %>');

app/views/contestant_works/update.js.erb

@@ -1,11 +1,7 @@
+hideModal();
 <% if @submit_result%>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'work_edit_information') %>');
+var htmlvalue = '<%= escape_javascript(render :partial => 'contestant_works/work_edit_information') %>';
-showModal('ajax-modal', '500px');
+pop_box_new(htmlvalue, 500, 400);
-$('#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","").css("border","3px solid #269ac9");
-$('#ajax-modal').parent().addClass("anonymos");
 <% else %>
 window.location.href = '<%= edit_contestant_work_path(@work)%>';
 <% end %>

app/views/homework_common/score_rule_set.js.erb

@@ -1,7 +1,7 @@
 <% if @homework.homework_type == 2 %>
     <% if @homework.anonymous_comment == 0 %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
-        pop_box_new(htmlvalue, 630, 758);
+        pop_box_new(htmlvalue, 630, 914);
     <% else %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
         pop_box_new(htmlvalue, 530, 404);
@@ -9,7 +9,7 @@
 <% else %>
     <% if @homework.anonymous_comment == 0 %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_non_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
-        pop_box_new(htmlvalue, 630, 758);
+        pop_box_new(htmlvalue, 630, 885);
     <% else %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_none_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
         pop_box_new(htmlvalue, 530, 332);

app/views/student_work/_has_commit_work.html.erb

@@ -1,12 +1,17 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
-    <div><p align='center' style='margin-top: 35px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
+    <h3 class="fl">提示</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div><p align='center' style='margin-top: 30px'>您已提交过作品，请不要重复提交，如果想修改作品请点击编辑。</p></div>
     <div class="cl"></div>
     <div class="ni_btn mt10">
-      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+      <a href="javascript:" class="fr sy_btn_blue mr30" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
         编&nbsp;&nbsp;辑
       </a>
-      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
+      <a href="javascript:" class="fr sy_btn_grey mr5" onclick="clickCanel();" style="margin-bottom: 15px;margin-top:15px;" >
         取&nbsp;&nbsp;消
       </a>
     </div>

app/views/student_work/_work_edit_information.html.erb

@@ -1,9 +1,17 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
+    <h3 class="fl">作品确认</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div class="clear mt15 ml20" style="color:#808181;">
       <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+
       <p class="f14 mt5">
         <span class="fb">作品名称：</span><%= @student_work.name %>
       </p>
+
       <div class="f14 mt5 break_word" style="max-width: 425px; color:#808181; max-height:300px; overflow-x:hidden; overflow-y: auto;">
         <div class="fb fl dis">作品描述：</div>
         <div class="upload_img fl" style="max-width: 330px;"><%= @student_work.description.html_safe %></div>
@@ -12,7 +20,7 @@
       <p class="mt5">
         <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
         <% if @student_work.attachments.empty? %>
-          <span class="fl c_red"><%= "无附件"%></span>
+            <span class="fl c_red">无附件</span>
         <% else %>
             <div class="fl grey_c">
               <% @student_work.attachments.each_with_index do |attachment, i| %>
@@ -20,6 +28,7 @@
                     <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
                     <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
                     <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+
                     <div class="cl"></div>
                   </div>
               <% end -%>
@@ -29,12 +38,13 @@
       </p>
       <div class="cl"></div>
       <div class="ni_btn mt10">
-        <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+        <a href="javascript:" class="sy_btn_blue" onclick="clickOK();" style="margin-left: 55px;">
           确&nbsp;&nbsp;定
         </a>
       </div>
     </div>
   </div>
+</div>
 
 <script type="text/javascript">
     function clickOK() {

app/views/student_work/_work_information.html.erb

@@ -1,9 +1,17 @@
-<div id="popbox02">
+<div id="muban_popup_box" style="width:500px;">
-  <div class="ni_con">
+  <div class="muban_popup_top">
+    <h3 class="fl">作品确认</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear">
+    <div class="clear mt15 ml20" style="color:#808181;">
       <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+
       <p class="f14 mt5">
         <span class="fb">作品名称：</span><%= @student_work.name %>
       </p>
+
       <div class="f14 mt5 break_word" style="max-width: 425px; color:#808181; max-height:300px; overflow-x:hidden; overflow-y: auto;">
         <div class="fb fl dis">作品描述：</div>
         <div id="worksDescription" class="upload_img fl" style="max-width: 330px;"><%= @student_work.description.html_safe %></div>
@@ -20,6 +28,7 @@
                     <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
                     <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
                     <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+
                     <div class="cl"></div>
                   </div>
               <% end -%>
@@ -29,10 +38,11 @@
       </p>
       <div class="cl"></div>
       <div class="ni_btn mt10">
-      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
+        <a href="javascript:" class="fr sy_btn_blue mr45" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;">
           确&nbsp;定
         </a>
-      <%= link_to("重 试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
+        <%= link_to("重 试", retry_work_student_work_path(@student_work.id), :class => "fr sy_btn_blue mr5", :style => "margin-bottom: 15px;margin-top:15px;", :remote => true) %>
+      </div>
     </div>
   </div>
 </div>

app/views/student_work/create.js.erb

@@ -1,19 +1,10 @@
+hideModal();
 <% if @has_commit %>
-    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>');
+    var htmlvalue = '<%= escape_javascript(render :partial => 'student_work/has_commit_work') %>';
-    showModal('ajax-modal', '500px');
+    pop_box_new(htmlvalue, 500, 163);
-    $('#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","").css("border","3px solid #269ac9");
-    $('#ajax-modal').parent().addClass("anonymos");
 <% elsif @submit_result%>
-    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+    var htmlvalue = '<%= escape_javascript(render :partial => 'student_work/work_information') %>';
-    showModal('ajax-modal', '500px');
+    pop_box_new(htmlvalue, 500, 400);
-    $('#ajax-modal').siblings().remove();
-    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-            "<a href='/student_work/"+ <%=@student_work.id%> +"/retry_work' class='upload_btn' data-remote='true'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-    $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-    $('#ajax-modal').parent().addClass("anonymos");
 <% else %>
     window.location.href = '<%= new_student_work_url(:homework => @homework.id)%>';
 <% end %>

app/views/student_work/update.js.erb

@@ -1,11 +1,7 @@
+hideModal();
 <% if @submit_result%>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_edit_information') %>');
+var htmlvalue = '<%= escape_javascript(render :partial => 'student_work/work_edit_information') %>';
-showModal('ajax-modal', '500px');
+pop_box_new(htmlvalue, 500, 400);
-$('#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","").css("border","3px solid #269ac9");
-$('#ajax-modal').parent().addClass("anonymos");
 <% else %>
 window.location.href = '<%= edit_student_work_url(@work)%>';
 <% end %>

app/views/users/_user_message_contest.html.erb

@@ -185,7 +185,7 @@
             </li>
             <li class="homepageNewsPubType fl">
               <%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">在线评审启动失败<font class="fr c_red">(评委数为0或作品数为0)：</font></span>
+              <span class="homepageNewsType fl">在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font></span>
             </li>
             <li class="messageInformationContents">
               <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"%>