Merge branch 'szzh' into develop

app/controllers/student_work_controller.rb

@@ -14,8 +14,8 @@ class StudentWorkController < ApplicationController
   def program_test
     is_test = params[:is_test] == 'true'
     resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T')}
-    unless is_test
-      student_work = find_or_save_student_work
+
+      student_work = find_or_save_student_work(is_test)
 
       unless student_work
         resultObj[:status] = 100
@@ -42,26 +42,6 @@ class StudentWorkController < ApplicationController
 
         end
       end
-
-    else 
-      if @homework.homework_type == 2 && @homework.homework_detail_programing     
-        result = test_realtime(student_work, params[:src])
-        logger.debug result
-        resultObj[:status] = result["status"]
-        resultObj[:results] = result["results"]
-        resultObj[:error_msg] = result["error_msg"]
-        results = result["results"]
-        if result["status"].to_i == -2 #编译错误
-          results = [result["error_msg"]]
-        end
-        
-        resultObj[:status] = result["status"].to_i
-        resultObj[:time] = Time.now.strftime('%Y-%m-%d %T')
-        resultObj[:index] = 0
-      end
-
-    end
-
     
     render :json => resultObj
   end
@@ -182,24 +162,23 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
-      stundet_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
-      stundet_work ||= StudentWork.new
-      stundet_work.name = params[:student_work][:name]
-      stundet_work.description = params[:student_work][:description]
-      stundet_work.project_id = params[:student_work][:project_id]
-      stundet_work.homework_common_id = @homework.id
-      stundet_work.user_id = User.current.id
-      stundet_work.save_attachments(params[:attachments])
+      student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      student_work ||= StudentWork.new
+      student_work.name = params[:student_work][:name]
+      student_work.description = params[:student_work][:description]
+      student_work.project_id = params[:student_work][:project_id]
+      student_work.homework_common_id = @homework.id
+      student_work.user_id = User.current.id
+      student_work.save_attachments(params[:attachments])
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-        stundet_work.late_penalty = @homework.late_penalty
+        student_work.late_penalty = @homework.late_penalty
         else
-        stundet_work.late_penalty = 0
+        student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(stundet_work)
-      if stundet_work.save
-        if @homework.homework_type == 2 && @homework.homework_detail_programing       #编程作业，学生提交作品后计算系统得分
-         
-        end
+      render_attachment_warning_if_needed(student_work)
+
+      if student_work.save
+
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -640,15 +619,17 @@ class StudentWorkController < ApplicationController
     xls_report.string
   end
 
-  def find_or_save_student_work
-    student_work = @homework.student_works.where(user_id: User.current.id).first
+  def find_or_save_student_work(is_test)
+    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
     if student_work.nil?
       @homework.student_works.build(
         name: params[:title],
         description: params[:src],
-        user_id: User.current.id
+        user_id: User.current.id,
+        is_test: is_test
         )
       unless @homework.save
+        logger.debug @homework.errors.full_messages
       else
         student_work = @homework.student_works.where(user_id: User.current.id).first
       end

app/controllers/users_controller.rb

@@ -294,6 +294,7 @@ class UsersController < ApplicationController
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
       @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
       respond_to do |format|
         format.js
         format.html {render :layout => 'new_base_user'}
@@ -361,8 +362,15 @@ class UsersController < ApplicationController
   end
 
   def user_commit_homework
-    flash[:notice] = l(:notice_successful_create)
-    redirect_to student_work_index_url(:homework => params[:homework])
+    homework = HomeworkCommon.find(params[:homework])
+    student_work = homework.student_works.where(user_id: User.current.id).first
+    if student_work
+      student_work.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to student_work_index_url(:homework => params[:homework])
+    else 
+      render_403
+    end
   end
 
   def user_new_homework
@@ -395,7 +403,7 @@ class UsersController < ApplicationController
           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[:program][:language].to_i
+          homework_detail_programing.language = params[:language_type].to_i
 
           inputs = params[:program][:input]
           if Array === inputs

app/helpers/application_helper.rb

@@ -2359,7 +2359,7 @@ module ApplicationHelper
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
         if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "修改作品",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
           link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
         else

app/models/homework_common.rb

@@ -10,7 +10,7 @@ class HomeworkCommon < ActiveRecord::Base
   has_one :homework_detail_manual, :dependent => :destroy
   has_one :homework_detail_programing, :dependent => :destroy
   has_many :homework_tests, :dependent => :destroy
-  has_many :student_works, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   # 课程动态
@@ -56,6 +56,10 @@ class HomeworkCommon < ActiveRecord::Base
     Mailer.run.homework_added(self)
   end
 
+  def is_program_homework?
+    self.homework_type == 2 && self.homework_detail_programing
+  end
+
   delegate :language_name, :to => :homework_detail_programing
 
 end

app/models/student_work.rb

@@ -1,6 +1,6 @@
 #学生提交作品表
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test
 
   belongs_to :homework_common
   belongs_to :user
@@ -10,10 +10,32 @@ class StudentWork < ActiveRecord::Base
   has_many :student_work_tests, order: 'id desc'
 
   before_destroy :delete_praise
+  before_save :set_program_score, :set_src
 
   acts_as_attachable
 
   def delete_praise
     PraiseTread.where("praise_tread_object_id = #{self.id} AND praise_tread_object_type = 'StudentWork'").destroy_all
   end
+
+  def last_test
+    student_work_tests.order('id desc').first
+  end
+
+  private 
+  def set_program_score
+    if homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
+        #根据最后一次测试计算得分
+        unless last_test
+          self.system_score = 0
+        else
+          self.system_score = last_test.test_score
+        end
+    end
+
+  end
+  def set_src
+    self.description = last_test.src if last_test
+  end
+
 end

app/models/student_work_test.rb

@@ -34,10 +34,19 @@ class StudentWorkTest < ActiveRecord::Base
 
   def test_score
     if self.status.to_i == 0
-      format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
-    else
+      100
+    elsif self.results.empty?
       0
+    else 
+      get_success_count * 100 / self.results.count
     end
   end
 
+  private
+  def get_success_count
+    self.results.inject(0) do |sum, result|
+      sum += (result["status"].to_i == 0 ? 1 : 0)
+    end || 0
+  end
+
 end

app/views/admin/latest_login_users.html.erb

@@ -70,18 +70,20 @@
                 <%=link_to(user.login, user_path(user)) %>
               </td>
               <td align="center">
-                <% case user.user_extensions.identity %>
-                <% when 0 %>
-                <%='老师' %>
-                <% when 1 %>
-                <%='学生' %>
-                <% when 2 %>
-                <%='企业' %>
-                <% when 3 %>
-                <%='开发者' %>
-                <% else %>
-                <%='未知身份' %>
-                <% end %>
+                <%if user.user_extensions%>
+                    <% case user.user_extensions.identity %>
+                    <% when 0 %>
+                        <%='老师' %>
+                    <% when 1 %>
+                        <%='学生' %>
+                    <% when 2 %>
+                        <%='企业' %>
+                    <% when 3 %>
+                        <%='开发者' %>
+                    <% else %>
+                        <%='未知身份' %>
+                    <% end %>
+                <% end%>
               </td>
             </tr>
         <% end %>

app/views/boards/show.html.erb

@@ -82,13 +82,19 @@ function nh_init_board(params){
             var editor = params.kindutil.create(params.textarea, {
 //                allowPreviewEmoticons : false,
 //                allowImageUpload : false,
+                autoHeightMode : true,
                 resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
                 allowFileManager:true,uploadJson:"/kindeditor/upload",
                 fileManagerJson:"/kindeditor/filemanager",
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+//                    var edit = this.edit;
+//                    var body = edit.doc.body;
+//                    edit.iframe.height(minHeight);
+//                    this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + 30, minHeight));
                 },
                 afterCreate:function(){
+                   this.loadPlugin("autoheight");
                   var userAgent = navigator.userAgent.toLowerCase();
                   if(/trident/.test(userAgent)){
                     $("div.talk_new .ke-container").css({'margin-left':'0px'});

app/views/courses/_courses_jours.html.erb

@@ -10,11 +10,11 @@
   div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
   div.recall_con{width:570px;}
   div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-  .ke-container{height: 80px !important;}
+  /*.ke-container{height: 80px !important;}*/
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
 <script >
-    init_KindEditor_data('');
+    init_KindEditor_data('',80);
 </script>
 <div class="msg_box fl mb10" id='leave-message'>
   <h4><%= l(:label_leave_message) %></h4>
@@ -62,6 +62,7 @@
         params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+          params.height = 55;
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);

app/views/layouts/_logined_header.html.erb

@@ -78,11 +78,11 @@
     </div>
   </div>
 
-  <div class="navHomepageProfile">
+  <div class="navHomepageProfile" id="navHomepageProfile">
     <ul>
-      <li class="homepageProfileMenuIcon">
-        <%= link_to "<div class='mt5 mb8'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
-        <ul class="topnav_login_list">
+      <li class="homepageProfileMenuIcon" id="homepageProfileMenuIcon">
+        <%= link_to "<div class='mt5 mb8' id='user_avatar'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
+        <ul class="topnav_login_list none" id="topnav_login_list">
           <li>
             <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
           </li>
@@ -110,6 +110,15 @@
         $("#navHomepageSearchType").hide();
     });
 
+    $("#user_avatar img").mouseenter(function(){
+        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").show();
+    });
+    $("#navHomepageProfile").mouseleave(function(){
+        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").hide();
+    });
+
     function signout(){
         $.post(
                 '<%= signout_path%>',

app/views/layouts/new_base_user.html.erb

@@ -27,6 +27,8 @@
 </div>
 
 <div class="homepageContentContainer">
+  <div class="homepageRightBannerImg"></div>
+  <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft" id="LSide">
       <div class="homepagePortraitContainer">

app/views/student_work/edit.html.erb

@@ -1,54 +1,62 @@
-<div class="HomeWork" id="RSide">
-  <div class="RightBanner">
-    <div class="NewsBannerName">编辑作品</div>
-  </div>
-  <div class="Newwork">
-    <div class="hwork_ctt">
-      <div class="hwork_dis" id="tbc_01">
-        <%= labelled_form_for @work,:html => { :multipart => true }  do |f|%>
-            <div class="N_con">
-              <p>
-                <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <input type="text" name="student_work[name]" id="student_work_name" class="bo  fl" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
-                <a href="javascript:void(0)" class="fl ml10 mt3"  onclick="show_project();" >项目信息
-                  <img class="ml5 " src="/images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
-                </a>
-              <div class="cl"></div>
-              <p id="student_work_name_span" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-
-              <p id="about_project" class="about_project" style="<%= @work.project.nil? ? '' : 'display:block;'%>">
-                <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"}  %>
-              </p>
-              <div class="cl"></div>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作品</div>
+</div>
+<div class="cl"></div>
 
-              <p>
-                <label class="fl">
-                  <span class="c_red">*</span>
-                  &nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
-                </label>
-                <textarea  name="student_work[description]" placeholder="最多3000个汉字(或6000个英文字符)" id="student_work_description"  class="w620 hwork_txt"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
-              <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-              <p>
-                <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>
-              </p>
-              <div class="cl"></div>
-              <p class="ml80 ">
-                <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
-                <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
-              <div class="cl"></div>
-              </p>
-            </div><!---创建作业内容结束-->
-        <% end%>
+<div class="HomeWork" id="users_setting">
 
+  <div class="HomeWorkBox">
+    <div class="">
+      <div class="homepagePostTitle fl">
+        <%= @homework.name%>（作业名称）
+      </div>
+      <span class="fr c_grey">
+        截止时间：<%= @homework.end_time%>
+      </span>
+      <div class="cl"></div>
+      <a href="javascript:void(0);" class="c_blue">
+        <%= link_to @homework.user.show_name, user_activities_path(@homework.user_id), :class => "c_blue"%>
+      </a>
+      <div class="cl"></div>
+      <div class="HomeWorkP">
+        <%= @homework.description.html_safe %>
       </div>
     </div>
-  </div>
-</div><!--新建作业结束-->
-<div class="cl"></div>
+  </div><!----HomeWorkBox end-->
+  <div class="cl"></div>
+
+  <div class="HomeWorkCon mt15">
+    <%= labelled_form_for @work,:html => { :multipart => true }   do |f|%>
+        <div class=" c_red mb10">
+          提示：作品名称和描述中不要出现真实的姓名信息
+        </div>
+        <div class="cl"></div>
+
+        <div>
+          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <div class="cl"></div>
+          <p id="student_work_name_span" class="c_red mb10"></p>
+        </div>
+        <div class="mt10">
+          <textarea  name="student_work[description]" id="student_work_description" placeholder="请介绍你的作品"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <script>
+              var text = document.getElementById("student_work_description");
+              autoTextarea(text);// 调用
+          </script>
+          <div class="cl"></div>
+          <p id="student_work_description_textarea" class="c_red mb10"></p>
+        </div>
+
+        <div id="homework_attachments">
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false} %>
+        </div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="edit_student_work(<%= @work.id%>);">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <%= link_to "取消",  student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+    <% end%>
+  </div><!----HomeWorkCon end-->
 </div>

app/views/users/_project_issue.html.erb

@@ -141,7 +141,7 @@
                 image.wrap(element);
             }
         }
-        $('#activity_description_<%= user_activity_id %> a').colorbox({rel:'nofollow', close: "关闭"});
+        $('#activity_description_<%= user_activity_id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
     });
 
 </script>

app/views/users/_user_activities.html.erb

@@ -9,7 +9,6 @@
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
     .ke-inline-block{display: none;}
-    .ke-container{height: 30px !important;}
 </style>
 <% user_activities.each do |user_activity|
   if user_activities %>

app/views/users/_user_homework_attachment.html.erb

@@ -49,6 +49,10 @@
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
   <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mr15 mt3",:remote => true%>
+  <% if defined?(has_program) && has_program %>
+  <a href="javascript:void(0);" class="ProBtn fl mt3">编程</a>
+  <span class="fl C_lgrey mt3 program_detail_info"></span>
+  <% end %>
 </div>
 
 <% content_for :header_tags do %>

app/views/users/_user_homework_form.html.erb

@@ -1,5 +1,5 @@
 <% content_for :header_tags do %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
     <%= javascript_include_tag 'homework','baiduTemplate' %>
 <% end %>
 
@@ -40,40 +40,17 @@
     <div class="cl"></div>
 
     <div id="homework_attachments">
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>true} %>
     </div>
 
 
     <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
+      <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>
       <div class="cl"></div>
     </div>
 
-
-
-    <div class="mt10">
-      <a href="javascript:void(0);" class=" fl DropBtn">编程选项</a>
-      <div class="DropLine"></div>
-      <div class="cl"></div>
-    </div>
-
-    <div class="advanced_option" style="display:none;">
-      <div class="mt10">
-        <select class="InputBox W120" name="program[language]">
-          <option value="1" selected>C语言</option>
-          <option value="2">C++</option>
-        </select>
-      </div>
-
-      <div class="mt10">
-        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
-        <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-        <div class="cl"></div>
-      </div>
-    </div>
-
     <input type="hidden" name="homework_type" value="1">
 
   </div>
@@ -82,9 +59,46 @@
 
 <script id="t:test-answer-list" type="text/html">
   <div class="mt10">
-    <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required name="program[output][]"></textarea>
+    <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
     <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
     <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
     <div class="cl"></div>
   </div>
 </script>
+
+<script type="text/html" id="t:program-input-list">
+  <div class="program-input">
+    <input type="hidden" name="language_type" value="<!= language_type !>" />
+    <! for(var i=0; i< input_groups.length; ++i) { !>
+        <input  name="program[input][]" type="hidden" value="<!= input_groups[i].input !>" />
+        <input  name="program[output][]" type="hidden" value="<!= input_groups[i].output !>" />
+    <! } !>
+  </div>
+</script>
+
+  
+    <div class="BluePopupBox" id="BluePopupBox" style="display:none">
+      <a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
+        <h2 class="BluePopuph2 fl">编程作业的测试集设置</h2>
+        <div class="cl"></div>
+        <div class="HomeWorkCon">
+          <div class="mt15">
+              <select class="InputBox W120 language_type"  >
+                    <option value="1" selected>C语言</option>
+                    <option value="2">C++</option>
+                  </select>
+            </div>
+            <div class="mt10">
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+                <div class="cl"></div>
+            </div>
+           
+            <div class="mt10">
+                <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
+                <div class="cl"></div>
+            </div>
+
+        </div><!----HomeWorkCon end-->
+
+    </div><!----BluePopupBox end-->

app/views/users/_user_homework_list.html.erb

@@ -21,7 +21,7 @@
             </div>
             <% if homework_common.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
-              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue' %>
+              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
             </div>
             <% end %>
             <div class="homepagePostDeadline">
@@ -35,8 +35,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <%# if is_teacher%>
-          <% if false%>
+          <% if is_teacher%>
+          <%# if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">

app/views/users/new_user_commit_homework.html.erb

@@ -38,11 +38,15 @@
 </script>
 <!-- 模板1结束 -->
 
- <div class="homepageRight">
+ <div class="ProgramHomework">
+      
+
+      <div class="homepageRightBanner mb10">
+      <div class="NewsBannerName"><%= @is_test ? '模拟答题' : '提交作品' %></div>
+      </div>
+      <div class="cl"></div>
+
       <div class="HomeWork">
-        <div class="RightBanner">
-          <div class="NewsBannerName"><%= @is_test ? '模拟答题' : '提交作品' %></div>
-        </div>
         <div class="HomeWorkBox">
           <div class="">
               <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
@@ -70,7 +74,7 @@
               <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
             </div>
             <div class="mt10">
-            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
+            <%= f.text_area :description, id: 'program-src', class:"InputBox W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
             </div>
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>

app/views/users/show.html.erb

@@ -1,41 +1,41 @@
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
-  <div class="homepageRightBanner">
+<div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
     <ul class="resourcesSelect">
-      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="homepagePostType">
-          <li>
-            <ul class="homepagePostTypeHomework fl">
-              <li class="f14">课程动态</li>
-              <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-              <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-            </ul>
-          </li>
-          <li>
-            <ul class="homepagePostTypeProject fl">
-              <li class="f14">项目动态</li>
-              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-            </ul>
-          </li>
-          <li>
-            <ul class="homepagePostTypeProject fl">
-              <li class="f14">更多</li>
-              <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
-              <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
-            </ul>
-          </li>
+  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+    <ul class="homepagePostType">
+      <li>
+        <ul class="homepagePostTypeHomework fl">
+          <li class="f14">课程动态</li>
+          <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+            <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+          <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+          <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+            <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+        </ul>
+      </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">项目动态</li>
+          <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+        </ul>
+      </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">更多</li>
+          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
+          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
         </ul>
       </li>
     </ul>
-  </div>
+  </li>
+</ul>
+</div>
 
 <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>

app/views/users/user_homeworks.html.erb

@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 
-<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+<% if @is_teacher%>
     <!-- 老师身份才可以发布作业 -->
     <div class="HomeWork mb10">
       <% homework = HomeworkCommon.new %>

app/views/users/user_import_resource.js.erb

@@ -4,5 +4,5 @@ $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
 "<a href='javascript:void(0)' class='resourceClose' onclick='hideModal();'></a></div>");
-$('#ajax-modal').parent().css("top","").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
 $('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");

app/views/users/user_newfeedback.html.erb

@@ -8,7 +8,7 @@
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
-    .ke-container{height: 80px !important;}
+    /*.ke-container{height: 80px !important;}*/
 </style>
 <div >
   <div class="homepageRightBanner mb10">
@@ -20,7 +20,7 @@
   <div class="message_box mb10" id="users_setting">
     <div nhname='new_message' style="display:none;">
       <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
           <p nhname='contentmsg'></p>
           <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
           <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>

db/migrate/20150907152238_add_is_test_to_student_works.rb

@@ -0,0 +1,5 @@
+class AddIsTestToStudentWorks < ActiveRecord::Migration
+  def change
+    add_column :student_works, :is_test, :boolean, default: false
+  end
+end