Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/bids_controller.rb

@@ -506,7 +506,8 @@ class BidsController < ApplicationController
         end
 
         @cur_page = params[:page] || 1
-        @homework_list = paginateHelper all_homework_list,10
+        # @homework_list = paginateHelper all_homework_list,10
+        @homework_list = all_homework_list
         @jours_count = @bid.journals_for_messages.where('m_parent_id IS NULL').count
         if params[:student_id].present?
           @temp = []
@@ -792,7 +793,7 @@ class BidsController < ApplicationController
     @bid.is_evaluation = params[:bid][:is_evaluation]
     @bid.proportion = params[:bid][:proportion]
     @bid.evaluation_num = params[:bid][:evaluation_num]
-    @bid.open_anonymous_evaluation = params[:bid][:open_anonymous_evaluation]
+    params[:bid][:open_anonymous_evaluation] ? @bid.open_anonymous_evaluation = 1 : @bid.open_anonymous_evaluation = 0
     @bid.reward_type = 3
     # @bid.budget = params[:bid][:budget]
     @bid.deadline = params[:bid][:deadline]

app/controllers/homework_attach_controller.rb

@@ -59,7 +59,8 @@ class HomeworkAttachController < ApplicationController
     all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name
     @cur_page = params[:page] || 1
     @cur_type = 2
-    @homework_list = paginateHelper all_homework_list,10
+    # @homework_list = paginateHelper all_homework_list,10
+    @homework_list = all_homework_list
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
       format.js
@@ -93,7 +94,8 @@ class HomeworkAttachController < ApplicationController
     all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name
     @cur_page = params[:page] || 1
     @cur_type = 3
-    @homework_list = paginateHelper all_homework_list,10
+    # @homework_list = paginateHelper all_homework_list,10
+    @homework_list = all_homework_list
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
       format.js
@@ -110,7 +112,8 @@ class HomeworkAttachController < ApplicationController
     all_homework_list = get_student_batch_homework_list @bid,User.current
     @cur_page = params[:page] || 1
     @cur_type = 4
-    @homework_list = paginateHelper all_homework_list,10
+    # @homework_list = paginateHelper all_homework_list,10
+    @homework_list = all_homework_list
     respond_to do |format|
       format.js
     end
@@ -134,7 +137,8 @@ class HomeworkAttachController < ApplicationController
         WHERE homework_attaches.bid_id = #{@bid.id} AND homework_users.user_id = #{User.current.id}")
     end
     @cur_page = params[:page] || 1
-    @homework_list = paginateHelper all_homework_list,10
+    # @homework_list = paginateHelper all_homework_list,10
+    @homework_list = all_homework_list
     respond_to do |format|
       format.js
     end
@@ -612,7 +616,8 @@ class HomeworkAttachController < ApplicationController
         ORDER BY #{order_by}) AS table1
         WHERE table1.t_score IS NULL OR table1.t_score = 0 ")
     @all_homework_list = search_homework_member(@all_homework_list,@search_name.to_s.downcase) if @search_name
-    @homework_list = paginateHelper @all_homework_list,10
+    # @homework_list = paginateHelper @all_homework_list,10
+    @homework_list = @all_homework_list
   end
 
   #获取指定作业的所有成员

app/views/courses/_course_teacher.html.erb

@@ -16,7 +16,7 @@
     <% end%>
 
     <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+      <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
     </ul>
     <div class="cl"></div>
   </div>

app/views/courses/_show_member_score.html.erb

@@ -27,15 +27,15 @@
 
 
     /***弹框***/
-    #popbox_tscore{width:480px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-    .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}
-    .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
+    /*#popbox_tscore{width:480px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}*/
+    /*.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}*/
+    .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
     .tscore_box{ width:350px; margin:15px auto;}
     .tscore_box li{ height:25px;}
 </style>
 
 
-  <div class="tscore_con">
+  <div class="tscore_con" id="user_score">
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>

app/views/courses/settings.html.erb

@@ -73,7 +73,7 @@
 
   <div class="hwork_undis" id="tbc_02">
     <div class="search_course fl">
-      <%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
+      <%= form_tag(search_member_course_path,:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
           <!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
           <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
           <a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
@@ -83,7 +83,7 @@
           <span id="course_member_name_span" style="float: left"></span>
       <% end %>
     </div>
-    <div class="cl"></div>
+
     <div id="course_members_setting">
       <%= render :partial => "course_members" %>
     </div>

app/views/courses/show_member_score.js.erb

@@ -1,3 +1,13 @@
+//$('#ajax-modal').html('<%#= escape_javascript(render :partial => 'courses/show_member_score', :locals => {:member => @member_score}) %>');
+//showModal('ajax-modal', '400px');
+//$('#ajax-modal').addClass('new-watcher');
+
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_member_score', :locals => {:member => @member_score}) %>');
 showModal('ajax-modal', '400px');
-$('#ajax-modal').addClass('new-watcher');
+//$('#ajax-modal').css('height','569px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//$('#ajax-modal').parent().removeClass();
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
+$('#ajax-modal').parent().addClass("new-watcher");

app/views/homework_attach/_homeworks_list.html.erb

@@ -66,11 +66,11 @@
 <% else %>
 <% end %>
 <!-- 如果是我的作业或者匿评列表界面不现实分页控件 -->
-<% unless is_my_homework || is_student_batch_homework %>
-    <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => remote, :flag => true%>
-    </ul>
-<% end %>
+<%# unless is_my_homework || is_student_batch_homework %>
+    <!--<ul class="wlist">-->
+      <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => remote, :flag => true%>
+    <!--</ul>-->
+<%# end %>
 
 <% if is_teacher %>
     <span style="color: red;">

app/views/users/show.html.erb

@@ -104,7 +104,6 @@
 
                             <div style="display: inline-block; float: right; margin-top: 0px">
                                               <span>
-                                                <% puts 11111111111111 %>
                                                 <%= user_jour_feed_back_url e %>
                                               </span>
                             </div>

config/locales/commons/zh.yml

@@ -240,7 +240,7 @@ zh:
   # 
   button_upload_photo: 上传图片
   button_delete_file: 删除 
-  error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})
+  error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})，建议上传到百度云等其他共享工具里，然后在txt文档里给出链接以及共享密码并上传
   error_pic_type: "仅支持如下图片格式："
   
   

db/migrate/20150422034543_change_bid_open_anonymous_evaluation.rb

@@ -0,0 +1,8 @@
+class ChangeBidOpenAnonymousEvaluation < ActiveRecord::Migration
+  def chang
+    Bid.where("open_anonymous_evaluation IS NULL").each do |bid|
+      bid.open_anonymous_evaluation = 0
+      bid.save
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150409092151) do
+ActiveRecord::Schema.define(:version => 20150422034543) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -1459,7 +1459,7 @@ ActiveRecord::Schema.define(:version => 20150409092151) do
     t.string   "file_path"
     t.integer  "pack_times",   :default => 1
     t.integer  "pack_size",    :default => 0
-    t.string   "file_digests"
+    t.text     "file_digests"
     t.datetime "created_at",                  :null => false
     t.datetime "updated_at",                  :null => false
   end

public/javascripts/course.js

@@ -51,6 +51,11 @@ function edit_group(id,url,course_id,group_id)
         }
     );
 }
+
+function hidden_homework_score_form()
+{
+    hideModal($("#user_score"));
+}
 ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////新建课程相关
 //验证课程名称

public/stylesheets/css.css

@@ -11,7 +11,7 @@ a:hover{ text-decoration:underline;}
 .container{ width:940px; margin:0 auto; }
 /* 作业列表 */
 .ttl{ }
-.ctt{height:820px;clear:both; }
+.ctt{clear:both; }
 /* TAB 切换效果 */
 .tb_{ background-color: #eaeaea; height:40px; }
 .tb_ ul{height:40px; }