Merge branch 'szzh' into dev_hjq

Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js

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 = []

app/controllers/courses_controller.rb

@@ -191,8 +191,9 @@ class CoursesController < ApplicationController
       results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q)
     end
     @is_remote = true
-    @result_count = results.count
-    @results = paginateHelper results, 10
+    #@result_count = results.count
+    #@results = paginateHelper results, 10
+    @results = results
     @search_name = q
   end
 
@@ -315,13 +316,15 @@ class CoursesController < ApplicationController
         when '1'
           @subPage_title = l :label_teacher_list
           @all_members = searchTeacherAndAssistant(@course)
-          @members = paginateHelper @all_members, 10
+          #@members = paginateHelper @all_members, 10
+          @members =  @all_members
         when '2'
           @subPage_title = l :label_student_list
           page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
           @all_members = student_homework_score(0,page, 10,"desc")
           # @all_members = @course.members
-          @members = paginateHelper_for_members @all_members, 10
+         # @members = paginateHelper_for_members @all_members, 10
+          @members =  @all_members
       end
       respond_to do |format|
         if params[:page]
@@ -877,7 +880,7 @@ class CoursesController < ApplicationController
         students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
         members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
         )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by} limit #{start_from}, #{nums}"
+        GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
 
       end
     else

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/avatar/_avatar_form.html.erb

@@ -47,6 +47,7 @@
   <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
   </a>
+  <span class="c_orange ml25 f12">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
   <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',

app/views/avatar/_new_avatar_form.html.erb

@@ -2,7 +2,8 @@
   <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
 </a>
 <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
-<a href="javascript:void(0)" class="upbtn fl">上传图片</a>
+<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
+<span class="c_orange ml25 mt43 f12 fl ">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
 <%= file_field_tag 'avatar[image]',
                    :id => nil,
                    :class => 'upload_file ',

app/views/bids/_alert_anonyoms.html.erb

@@ -39,28 +39,28 @@
     <% if @bid.comment_status == 0%>
         <h2>开启匿评功能</h2>
         <p>
-          开启匿评后学生将不能对作业进行
+          开启匿评后学生将不能对作品进行
           <span class="c_blue">修改、删除</span>
           等操作，目前有
           <span class="c_pink"><%= totle_size%>个</span>
           学生，共提交了
           <span class="c_pink"><%= cur_size %></span>
-          份作业，占
+          份作品，占
           <span class="c_pink"><%= percent %>%</span>，
           是否确定开启匿评？
         </p>
     <% elsif @bid.comment_status == 1 %>
         <h2>关闭匿评功能</h2>
         <p>
-          关闭匿评后学生将不能对作业进行
+          关闭匿评后学生将不能对作品进行
           <span class="c_blue">匿评</span>
-          ,且作业列表将会
+          ,且作品列表将会
           <span class="c_blue">公开</span>，
           目前分配了
           <span class="c_pink"><%= totle_size%>份</span>
-          匿评作业，已评了
+          匿评作品，已评了
           <span class="c_pink"><%= cur_size %></span>
-          份作业，占
+          份作品，占
           <span class="c_pink"><%= percent %>%</span>，
           是否确定关闭匿评？
         </p>

app/views/bids/_bid_homework_show.html.erb

@@ -10,7 +10,7 @@
         var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
         var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
         var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
-        $("#"+divname).html("<span style='color: #acaeb1;'>作业提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
+        $("#"+divname).html("<span style='color: #acaeb1;'>作品提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
                 +day1+"&nbsp;</span><span style='color: #acaeb1;'>天</span><span style='color: red;'>&nbsp;"
                 +hour+"&nbsp;</span><span style='color: #acaeb1;'>时</span><span style='color: red;'>&nbsp;"
                 +minute+"&nbsp;</span><span style='color: #acaeb1;'>分</span><span style='color: red;'>&nbsp;"

app/views/courses/_course.html.erb

@@ -79,16 +79,6 @@
 </div>
 </div>
 
-<div class="add-info">
-  <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
-  <%= get_course_term @course %>
-</div>
-
-<div class="add-info" style="margin-left: 30px; margin-top: -20px">
-  <%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
-  <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
-</div>
-
 <div class="tags">
 	<div id="tags">
 		<%= image_tag( "/images/sidebar/tags.png") %>

app/views/courses/_course_members.html.erb

@@ -1,4 +1,4 @@
-<div class="cl"></div>
+
 <div class="members_left">
   <ul style=" border-bottom:none;">
     <li>

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/_new_member_list.html.erb

@@ -70,9 +70,9 @@
       <% end; reset_cycle %>
     </div>
 
-    <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-    </ul>
+    <!--<ul class="wlist">
+      <% #= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+    </ul>-->
 <% else%>
     <p class="nodata">
       <%= l(:label_no_data) %>

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/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

@@ -47,7 +47,7 @@
               <%= link_to User.current.login, user_path(User.current), :title => User.current.login%>
             </span>
           </li>
-          <li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作品，请创建作品</li>
+          <li class="c_red" style="margin:25px 0 0 20px;"> 您还没提交作品，请点击提交作品按钮：）</li>
               <li class="wping">
                 <%= link_to "提交作品", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
               </li>
@@ -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

@@ -101,6 +101,7 @@
                             <p class="font_description">
                               <%= textAreailizable act.notes %>
                             </p>
+
                             <div style="display: inline-block; float: right; margin-top: 0px">
                                               <span>
                                                 <% puts 11111111111111 %>

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: "仅支持如下图片格式："
   
   

config/locales/users/zh.yml

@@ -118,7 +118,7 @@ zh:
    
   label_goto: "前往»"  
   
-  label_activity_project: "项目："
+  label_activity_project: 项目
   label_active_call: 需求
   label_active_homework: 作业  
   # 评论在commons模块下

config/locales/zh.yml

@@ -20,7 +20,7 @@ zh:
   notice_file_not_found: 您访问的页面不存在或已被删除。
   notice_locking_conflict: 数据已被另一位用户更新
   notice_not_authorized: 对不起，您无权访问此页面。
-  notice_has_homework: 您已经提交过一份作业
+  notice_has_homework: 您已经提交过一份作品
   notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。
   notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。
   notice_not_authorized_archived_project: 要访问的项目已经归档。
@@ -312,13 +312,13 @@ zh:
   permission_view_course_messages: 查看留言
   permission_view_real_name: 查看真名
   permission_view_students: 查看成员
-  permission_export_homeworks: 导出作业
+  permission_export_homeworks: 导出作品
   permission_quote_project: 引用项目
   permission_is_manager: 作为管理员
   permission_as_teacher: 作为教师
   permission_as_student: 作为学生
   permission_paret_in_homework: 加入作业
-  permission_view_homework_attaches: 查看作业附件
+  permission_view_homework_attaches: 查看作品附件
   permission_view_course_journals_for_messages: 查看课程留言
   view_course_journals_for_messages: 课程留言
   label_send_course_journals_for_messages: 发布了留言
@@ -1138,7 +1138,7 @@ zh:
   label_current_contributors: 位当前贡献者
   label_commit_limit: 已截止，但可补交
   label_commit_ar: 作业提交截止时间快到了！
-  lable_has_commit_homework: 您已提交过作业
+  lable_has_commit_homework: 您已提交过作品
   #modify by men
   label_x_current_contributors:
     zero: 位当前贡献者
@@ -1150,7 +1150,7 @@ zh:
   label_users_on_trustie: 用户
   label_front: 第一页
   label_commit_on: 次提交
-  label_uncommit_homework: 暂无学生提交作业！
+  label_uncommit_homework: 暂无学生提交作品！
   #modify by men
   label_x_commit_on:
     zero: 次提交
@@ -1211,7 +1211,7 @@ zh:
 
   label_student_response: 作业答疑 # modified by bai
   label_bidding_project: 参与项目
-  label_homework_project: 已提交作业  #huang
+  label_homework_project: 已提交作品  #huang
   button_bidding: 我要参加
   field_enterprise: '企业：'
 
@@ -1232,11 +1232,11 @@ zh:
   label_wrong_date: 时间格式错误，请输入正确的时间 yyyy-mm-dd
   label_bidding_succeed: 应标成功
   label_bidding_contest_succeed: 竞赛提交成功   #added by bai
-  label_bidding_homework_succeed: 作业提交成功   #added by bai
-  label_bidding_homework_failed: 作业提交失败   #added by bai
-  label_bidding_homework_committed: 你已经提交过作业，不能重复提交！
+  label_bidding_homework_succeed: 作品提交成功   #added by bai
+  label_bidding_homework_failed: 作品提交失败   #added by bai
+  label_bidding_homework_committed: 你已经提交过作品，不能重复提交！
   label_bidding_fail: 应标失败，该项目已经应标
-  label_bidding_homework_fail: 作业提交失败，该作业已经被提交！
+  label_bidding_homework_fail: 作品提交失败，该作品已经被提交！
 
   label_requirement_list: 需求列表
 
@@ -1246,9 +1246,9 @@ zh:
     other: 应标项目
   #end
   label_x_homework_project:  #modify by huang
-    zero: 已提交的作业
-    one: 已提交的作业
-    other: 已提交的作业
+    zero: 已提交的作品
+    one: 已提交的作品
+    other: 已提交的作品
   #end
   label_x_responses: #modify by men
     zero: 留言
@@ -1400,8 +1400,8 @@ zh:
   label_bid_project: 项目
   label_project_no_follow: 该项目暂未被关注！
   label_no_bid_project: 暂无参与项目
-  label_no_course_project: 暂无已提交的作业！
-  label_course_submit_homework: 提交了作业
+  label_no_course_project: 暂无已提交的作品！
+  label_course_submit_homework: 提交了作品
   label_bids_reward_method: 奖励方式 ：
   label_bids_reward_what: 输入奖励内容
   label_call_bonus: 奖金
@@ -1432,7 +1432,7 @@ zh:
   label_have_feedback: 有了
   label_of_feedback: 的
   label_welcome_participate: 参与了
-  label_cant_download: 未开启互评功能作业不允许下载
+  label_cant_download: 未开启互评功能作品不允许下载
   lable_close_evaluation: 该作业未开启互评功能
   lable_has_evaluation: 您已进行过评价
   #modify by men
@@ -1895,7 +1895,7 @@ zh:
   label_max_length: 最多250个字
   label_create_person: 创建人员
   label_participation_person: 参与人员
-  label_homework_without_description: 该作业无任何描述！
+  label_homework_without_description: 该作品无任何描述！
   label_sure_exit_homework: 是否确认退出该作业
   label_teacher_comments: 教师评论
   label_anonymous_comments: 匿评
@@ -1968,9 +1968,9 @@ zh:
 
   label_totle: 共有
   label_homework_count: 个作业
-  lebel_homework_commit: 已提交的作业
+  lebel_homework_commit: 已提交的作品
   label_open_anonymous_evaluation: 是否匿评
-  label_evaluation_description: 即每份作业被允许匿评的人数
+  label_evaluation_description: 即每份作品被允许匿评的人数
   label_name_not_null: 名称不能为空
   modal_valid_unpassing: 该分班已经存在
 

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"));
+}
 ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////新建课程相关
 //验证课程名称
@@ -357,7 +362,7 @@ function show_bid_dead_line(year,month,day,divname)
     + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
     + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
     + "</form>"
-    + "<p class='fr'>作业提交还剩：</p>");
+    + "<p class='fr'>作品提交还剩：</p>");
 }
 //验证新建作业的名字
 function regex_bid_name()

public/stylesheets/application.css

@@ -30,9 +30,13 @@ ol,ul,li{ list-style-type:none}
 a{ text-decoration:none; }
 .ml10{ margin-left:10px;}
 .ml20{ margin-left:20px;}
+.ml25{ margin-left:25px;}
+.ml30{ margin-left:30px;}
 .mr10{ margin-right:10px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
+.f12{font-size:12px; font-weight:normal;}
+.c_orange{color:#ff5722;}
 .fl{ float: left;}
 .fr{ float:right;}
 .project_h4{ font-size:14px; color:#3b3b3b;}

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; }

public/stylesheets/public.css

@@ -56,6 +56,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml25{ margin-left:25px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -73,6 +74,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
+.mt43{ margin-top:43px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
 .pl15{ padding-left:15px;}