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

app/api/mobile/entities/user.rb

@@ -34,6 +34,8 @@ module Mobile
       user_expose :img_url
       #昵称
       expose :nickname
+      #真名
+      expose :realname
       #性别
       user_expose :gender
       #我的二维码

app/controllers/courses_controller.rb

@@ -418,12 +418,27 @@ class CoursesController < ApplicationController
 
   end
 
+  def search_member
+    if User.current.allowed_to?(:as_teacher,@course) || User.current.admin
+      q = "#{params[:name].strip}"
+      @roles = Role.givable.all[3..5]
+      if q.nil? || q == ""
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
+      else
+        @members = searchmember_by_name(@course.member_principals.includes(:roles, :principal).all.sort,q)
+      end
+
+    else
+      render_403
+    end
+  end
+
   def create
     cs = CoursesService.new
     @course = cs.create_course(params,User.current)[:course]
     if @course.new_record?
       respond_to do |format|
-        format.html { render :action => 'new', :layout => 'base' } #Added by young
+        format.html { render :action => 'new', :layout => 'new_base' } #Added by young
         format.api { render_validation_errors(@course) }
       end
     else
@@ -493,7 +508,7 @@ class CoursesController < ApplicationController
 
     respond_to do |format|
       format.html {
-        render :layout => 'base'
+        render :layout => 'new_base'
       }
       format.api  {
       }

app/controllers/files_controller.rb

@@ -79,7 +79,8 @@ class FilesController < ApplicationController
         @result = find_course_attache q,@course,sort
         @result = visable_attachemnts @result
         @searched_attach = paginateHelper @result,10
-        @tag_list = attachment_tag_list @result
+
+        @tag_list = get_course_tag_list @course
       end
     #rescue Exception => e
     #  #render 'stores'
@@ -387,6 +388,7 @@ class FilesController < ApplicationController
        @containers = [Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)]
 
        show_attachments @containers
+       @tag_list = attachment_tag_list @all_attachments
 
        @attachtype = 0
        @contenttype = 0
@@ -540,7 +542,7 @@ class FilesController < ApplicationController
     @result = visable_attachemnts @result
     @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)}
     @searched_attach = paginateHelper @result,10
-    @tag_list = attachment_tag_list @result
+    @tag_list = get_course_tag_list @course
 
     respond_to do |format|
       format.js

app/controllers/homework_attach_controller.rb

@@ -314,7 +314,7 @@ class HomeworkAttachController < ApplicationController
 
   def edit
     bid = @homework.bid
-    if (bid.comment_status == 0 || bid.open_anonymous_evaluation == 0) && (User.current.admin? || User.current.member_of_course?(bid.courses.first))
+    if (bid.comment_status == 0 || bid.open_anonymous_evaluation == 0 || bid.comment_status == 2) && (User.current.admin? || User.current.member_of_course?(bid.courses.first))
       get_homework_member @homework
     else
       render_403 :message => :notice_not_authorized
@@ -347,7 +347,7 @@ class HomeworkAttachController < ApplicationController
 
   def destroy
     bid = @homework.bid
-    if (bid.comment_status == 0 || bid.open_anonymous_evaluation == 0) && (User.current.admin? || User.current == @homework.user)
+    if (bid.comment_status == 0 || bid.open_anonymous_evaluation == 0 || bid.comment_status == 0) && (User.current.admin? || User.current == @homework.user)
       if @homework.destroy
         #respond_to do |format|
         #  format.html { redirect_to course_for_bid_url @homework.bid }

app/controllers/tags_controller.rb

@@ -220,11 +220,18 @@ class TagsController < ApplicationController
         @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
         @tag.delete unless @tag.nil?
       end
+
+      if @obj && @object_flag == '6' && @obj.container.kind_of?(Course)
+        @course = @obj.container
+        @tag_list = get_course_tag_list @course
+        @select_tag_name = params[:select_tag_name]
+      end
       # end
     end
   end
 
   def tag_save
+    @select_tag_name = params[:tag_for_save][:tag_name]
     @tags = params[:tag_for_save][:name]
     @obj_id = params[:tag_for_save][:object_id]
     @obj_flag = params[:tag_for_save][:object_flag]
@@ -263,6 +270,10 @@ class TagsController < ApplicationController
     else
       logger.error "#{__FILE__}:#{__LINE__} ===> #{@obj.errors.try(:full_messages)}"
     end
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(Course)
+      @course = @obj.container
+      @tag_list = @tag_list = get_course_tag_list @course
+    end
     respond_to do |format|
       format.js
       format.html

app/helpers/application_helper.rb

@@ -2156,48 +2156,48 @@ module ApplicationHelper
 
   def anonymous_comment_link(bid, course)
     link = case bid.comment_status
-             when 0
+    when 0
-               confirm_info = "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n"
+      confirm_info = "开启匿评后学生将不能对作品进行提交、修改、删除等操作\n"
-               confirm_info += anonymous_comment_notice(bid,course)
+      confirm_info += anonymous_comment_notice(bid,course)
-               confirm_info += '是否确定开启匿评？'
+      confirm_info += '是否确定开启匿评？'
-               link_to '启动匿评', start_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, :confirm => confirm_info, disable_with: '加载中...'
+      link_to '启动匿评', start_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, :confirm => confirm_info, disable_with: '加载中...'
-             when 1
+    when 1
-               confirm_info = "关闭匿评后所有同学将不能继续进行匿评，且将公开已提交作业列表\n"
+      confirm_info = "关闭匿评后所有同学将不能继续进行匿评，且将公开已提交作品列表\n"
-               confirm_info += anonymous_comment_notice(bid,course)
+      confirm_info += anonymous_comment_notice(bid,course)
-               confirm_info += '是否确定关闭匿评？'
+      confirm_info += '是否确定关闭匿评？'
-               link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true, :confirm => confirm_info
+      link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true, :confirm => confirm_info
-             when 2
+    when 2
-               '匿评结束'
+      '匿评结束'
-           end
+    end
     content_tag('span', link, id: "#{bid.id}_anonymous_comment")
   end
 
   def anonymous_comment_notice(bid, course)
-    case bid.comment_status
+     case bid.comment_status
-      when 0
+     when 0
-        @student_size  ||= searchStudent(course).size
+       @student_size  ||= searchStudent(course).size
-        @homework_size = bid.homeworks.size
+       @homework_size = bid.homeworks.size
-        percent = @homework_size.to_f / (@student_size == 0 ? 1 : @student_size)
+       percent = @homework_size.to_f / (@student_size == 0 ? 1 : @student_size)
-        confirm_info = "目前#{@student_size}个学生,总共提交了#{@homework_size}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
+       confirm_info = "目前#{@student_size}个学生,总共提交了#{@homework_size}份作品,占#{number_to_percentage(percent * 100, precision: 1)}\n"
-      when 1
+     when 1
-        @homework_evaluations = 0
+       @homework_evaluations = 0
-        bid.homeworks.map { |homework| @homework_evaluations += homework.homework_evaluations.count}
+       bid.homeworks.map { |homework| @homework_evaluations += homework.homework_evaluations.count}
-        teachers = "("
+       teachers = "("
-        teacher_members = searchTeacherAndAssistant(course)
+       teacher_members = searchTeacherAndAssistant(course)
-        teacher_members.each do |member|
+       teacher_members.each do |member|
-          if member == teacher_members.last
+         if member == teacher_members.last
-            teachers += member.user_id.to_s + ")"
+           teachers += member.user_id.to_s + ")"
-          else
+         else
-            teachers += member.user_id.to_s + ","
+           teachers += member.user_id.to_s + ","
-          end
+         end
-        end
+       end
-        @has_evaluations = 0
+       @has_evaluations = 0
-        bid.homeworks.map { |homework| @has_evaluations += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
+       bid.homeworks.map { |homework| @has_evaluations += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
 
-        percent = @has_evaluations.to_f / (@homework_evaluations == 0 ? 1 : @homework_evaluations)
+       percent = @has_evaluations.to_f / (@homework_evaluations == 0 ? 1 : @homework_evaluations)
-        confirm_info = "目前总共分配了#{@homework_evaluations}份匿评作业,已评价#{@has_evaluations}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
+       confirm_info = "目前总共分配了#{@homework_evaluations}份匿评作品,已评价#{@has_evaluations}份作品,占#{number_to_percentage(percent * 100, precision: 1)}\n"
-    end
+     end
-    confirm_info
+     confirm_info
   end
 
   def get_technical_title user
@@ -2218,4 +2218,23 @@ module ApplicationHelper
     request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/
   end
 
+
+  #获取指定资源列表的TAG的集合以及每个TAG的数量，降序排序
+  def attachment_tag_list attachments
+    tag_list = Hash.new
+    attachments.each do |attachment|
+      attachment.tag_list.map{|tag| tag_list.has_key?(tag) ? tag_list[tag] = tag_list[tag] + 1 : tag_list[tag] = 1}
+    end
+    tag_list.sort {|a,b| b[1]<=>a[1]}
+  end
+
+  #获取课程资源的TAG云
+  def get_course_tag_list course
+    all_attachments = course.attachments.select{|attachment| attachment.is_public? ||
+        (attachment.container_type == "Course" && User.current.member_of_course?(course))||
+        attachment.author_id == User.current.id
+    }
+    tag_list = attachment_tag_list all_attachments
+    tag_list
+  end
 end

app/helpers/courses_helper.rb

@@ -762,7 +762,11 @@ module CoursesHelper
     if user_homework && user_homework.empty?
       link_to l(:label_commit_homework),  new_exercise_book_path(bid),:class => 'fr mr10 work_edit'
     else
-      "<span class='fr mr10 pr_join_span '>作业已交</span>".html_safe
+      if bid.comment_status == 1 && bid.open_anonymous_evaluation == 1
+        "<span class='fr mr10 pr_join_span ' title='已开启匿评不能修改作品'>#{l(:label_edit_homework)}</span>".html_safe
+      else
+        link_to l(:label_edit_homework),  edit_homework_attach_path(user_homework.first.id),:class => 'fr mr10 work_edit'
+      end
     end
   end
 

app/helpers/files_helper.rb

@@ -120,14 +120,6 @@ module FilesHelper
     result
   end
 
-  def attachment_tag_list attachments
-    tag_list = Hash.new
-    attachments.each do |attachment|
-      attachment.tag_list.map{|tag| tag_list.has_key?(tag) ? tag_list[tag] = tag_list[tag] + 1 : tag_list[tag] = 1}
-    end
-    tag_list.sort {|a,b| b[1]<=>a[1]}
-  end
-
   def get_attachments_by_tag attachments,tag
     attachments.each do |attachment|
       attachment.tag_list.include?(tag)

app/services/courses_service.rb

@@ -40,9 +40,9 @@ class CoursesService
     end
     @courses = courses_all.visible(current_user)
     if params[:name].present?
-      @courses_all = @courses.like(params[:name])
+      @courses_all = @courses.like(params[:name]).order("created_at desc")
     else
-      @courses_all =  @courses;
+      @courses_all =  @courses.order("created_at desc");
     end
     @courses_all
     course_list = []
@@ -198,7 +198,7 @@ class CoursesService
       @course.school_id = current_user.user_extensions.school_id
       @course.setup_time = params[:setup_time]
       @course.endup_time = params[:endup_time]
-      @course.class_period = params[:class_period]
+      @course.class_period = params[:class_period].to_i
       params[:course][:is_public] ? @course.is_public = 1 : @course.is_public = 0
       params[:course][:open_student] ? @course.open_student = 1 : @course.open_student = 0
     end
@@ -245,7 +245,7 @@ class CoursesService
     #course.safe_attributes = params[:course]
     course.time = params[:time]
     course.term = params[:term]
-    course.class_period = params[:class_period]
+    course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
     if course.save

app/services/users_service.rb

@@ -77,7 +77,7 @@ class UsersService
     gender = @user.user_extensions.gender.nil? ? 0 : @user.user_extensions.gender
     work_unit = get_user_work_unit @user
     location = get_user_location @user
-    {:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
+    {:id => @user.id, :img_url => img_url,:realname => @user.realname, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
   end
 
   #忘记密码

app/views/bids/_homework_list.html.erb

@@ -70,7 +70,7 @@
   <div class="upload_box_" >
     <h2 class="upload_box_tit">下载文件包太大，分成多个下载包</h2>
     <ul class="upload_box_ul" >
-      <li><span class="upload_box_span" >1.</span> <a href="javascript:void(0)">前20名学生的作业</a><span class="c_grey">&nbsp;&nbsp;（共200M）</span> </li>
+      <li><span class="upload_box_span" >1.</span> <a href="javascript:void(0)">前20名学生的作品</a><span class="c_grey">&nbsp;&nbsp;（共200M）</span> </li>
     </ul>
     <div class="cl"></div>
   </div>

app/views/courses/_course.html.erb

@@ -33,6 +33,15 @@
 		<% end %>
 	</p>
 
+    <p>
+         <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
+         <%= get_course_term @course %>
+    </p>
+    <p>
+         <%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
+         <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
+    </p>
+
 </div>
 
 <div class="information_for_course" >
@@ -71,15 +80,13 @@
 </div>
 
 <div class="add-info">
-	<div class="main-language" style="margin-left: 30px;margin-top:-10px">	
+  <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
-		<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
+  <%= get_course_term @course %>
-		<%= get_course_term @course %>
-	</div>
 </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 "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
-	<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
+  <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
 </div>
 
 <div class="tags">

app/views/courses/_course_members.html.erb

@@ -1,3 +1,15 @@
+<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 %>
+      <!-- , :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" >
+        <%= l(:label_search)%>
+      </a>
+      <br />
+      <span id="course_member_name_span" style="float: left"></span>
+  <% end %>
+</div>
+<div class="cl"></div>
 <div class="members_left">
   <ul style=" border-bottom:none;">
     <li>

app/views/courses/new.html.erb

@@ -25,8 +25,9 @@
       <li class="ml45 mb10">
         <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
         <input type="text" style="display: none;">
-        <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02">
+        <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" onkeyup="regex_course_password();">
         <a id="psw_btn" href="javascript:void(0)">显示明码</a>
+        <span class="c_red" id="course_course_password_notice"></span>
         <div class="cl"></div>
         <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
       </li>

app/views/courses/search_member.js.erb

@@ -0,0 +1 @@
+$('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');

app/views/courses/settings.html.erb

@@ -39,8 +39,9 @@
           <div class="cl"></div>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>">
+            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password();">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
+            <span class="c_red" id="course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
           </li>

app/views/courses/show.html.erb

@@ -40,7 +40,7 @@
     <br />
     <p class="mt5">
       <br />
-      <%= l :label_create_time %>: ：  <%= format_time(@course.created_at) %>
+      <%= l :label_create_time %> ：  <%= format_time(@course.created_at) %>
     </p>
   </div>
   <div class="cl"></div>

app/views/files/_course_list.html.erb

@@ -15,12 +15,8 @@
 </div>
 <div class="cl"></div>
 
-<div class="files_tag">
+<div class="files_tag" id="files_tag">
-  <% unless @tag_list.nil?%>
+    <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
-    <% @tag_list.each do |k,v|%>
-          <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>（<span class="c_red"><%= v%></span>）</a>
-    <% end%>
-  <% end%>
 </div>
 <div class="cl"></div>
 
@@ -29,35 +25,35 @@
   <% if file.is_public? || User.current.member_of_course?(course) %>
     <div class="re_con_box">
       <div class="">
-        <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
+        <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
         <% if User.current.logged? %>
           <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
-            <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,file) %>
+            <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
 
             <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
               <span id="is_public_<%= file.id %>">
-                <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
+                <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
               </span>
             <% else %>
               <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
             <% end %>
           <% else %>
-           <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true) if has_course?(User.current,file) %>
+           <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
           <% end %>
         <% else %>
         <% end %>
       </div>
       <div class="cl"></div>
       <div class="">
-        <p class="f_l c_grey02 font">文件大小：<%= number_to_human_size(file.filesize) %></p>
+        <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <%= link_to( l(:button_delete), attachment_path(file),
                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
         <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
       </div>
       <div class="cl"></div>
       <div class="tag_h">
-        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
-        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
       </div>
       <div class="cl"></div>
     </div><!---re_con_box end-->

app/views/files/_tag_yun.html.erb

@@ -0,0 +1,9 @@
+<% unless tag_list.nil?%>
+    <% tag_list.each do |k,v|%>
+        <% if tag_name && tag_name == k%>
+            <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
+        <% else%>
+            <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>×<%= v%></a>
+        <% end%>
+    <% end%>
+<% end%>

app/views/homework_attach/_homework.html.erb

@@ -15,7 +15,7 @@
 </li>
 <li class="wname">
   <% if homework.name == nil || homework.name == "" %>
-      <% homework_filename = homework.user.name + "提交的作业" %>
+      <% homework_filename = homework.user.name + "提交的作品" %>
   <% else %>
       <% homework_filename = homework.name %>
   <% end %>
@@ -55,7 +55,7 @@
     <!-- 是学生 -->
     <% if is_my_homework %>
         <!-- 我的作品，在未开启匿评和未使用匿评，显示为编辑和删除 -->
-        <% if bid.comment_status == 0 || bid.open_anonymous_evaluation == 0 %>
+        <% if bid.comment_status == 0 || bid.open_anonymous_evaluation == 0 || bid.comment_status == 2 %>
             <li class="wmine">
               <%= link_to l(:button_edit), edit_homework_attach_path(homework) %>
               <%  if homework.user == User.current || User.current.admin? %>
@@ -69,7 +69,7 @@
               <% end %>
             </li>
         <% else %>
-            <li class="wmine" title="只有开启匿评之前才能修改和删除作业哦！">
+            <li class="wmine" title="已开启匿评的作业不能进行修改和删除">
               <a style="color:#8e8e8e;"><%= l(:button_edit) %></a>
               <%  if homework.user == User.current || User.current.admin? %>
                   <!-- 作业创建者显示删除作业 -->

app/views/homework_attach/_homeworks_list.html.erb

@@ -47,9 +47,9 @@
               <%= 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;" %>
+                <%= link_to "提交作品", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
               </li>
         </ul>
         <div class="cl"></div>

app/views/layouts/base_courses.html.erb

@@ -35,7 +35,7 @@
           <%= l(:label_courses_community)%>
         </a>
       </h2>
-      <p>
+      <p class="hiddent">
         <%= l(:label_user_location) %> :
         <%= link_to l(:field_homepage), home_path %>
         >
@@ -80,7 +80,7 @@
         <div class="cl"></div>
 
         <div >
-          <a class="pr_info_name fl c_dark fb" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
             <%= @course.name %>
             <% if @course.is_public == 0%>
                 <span class="img_private ">

app/views/tags/_tag_add.html.erb

@@ -9,6 +9,8 @@
       <%= f.text_field :name ,:id => "tags_name_#{obj.id}",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class => "isTxt w90 f_l" %>
       <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
       <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+      <% tag_name ||= ""%>
+      <%= f.text_field :tag_name,:value=> tag_name,:style=>"display:none"%>
       <%= f.submit "",:class => "submit f_l" %>
     </span>
 <% end %>

app/views/tags/_tag_list.html.erb

@@ -12,8 +12,9 @@
 			<% end %>
           <% when '6' %>
           <% if obj.author_id == User.current.id || User.current.admin?%>
+              <% select_tag_name ||= ""%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag_new", :remote => true, :tag_name => tag,
-                                               :taggable_id => obj.id, :taggable_type => object_flag %> </span>
+                                               :taggable_id => obj.id, :taggable_type => object_flag, :select_tag_name => select_tag_name %> </span>
 			<% end %>
 	    <% end %>
     </span>

app/views/tags/_tag_new.html.erb

@@ -21,7 +21,8 @@
       </div>
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
-        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag} %>
+        <% tag_name ||= ""%>
+        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %>
       </div>
       <div id="put-tag-form-<%=obj.class%>-<%=obj.id%>" style="display: none;height: 100px;">
         <%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>

app/views/tags/remove_tag_new.js.erb

@@ -2,7 +2,9 @@
 <% if @object_flag == "6"%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
-                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag,:select_tag_name => @select_tag_name}) %>');
+
+$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
 <% end %>
 <% if @object_flag == "10"%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();

app/views/tags/tag_save.js.erb

@@ -5,11 +5,19 @@ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_n
 //$('#put-tag-form-issue').hide();
 $('#name-issue').val("");
 <% elsif @obj_flag == '6'%>
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+    <%if @course%>
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+                     :locals => {:obj => @obj,:object_flag =>  @obj_flag,:select_tag_name => @select_tag_name}) %>');
+        $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
+    <%else%>
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
-$("#tags_name_<%=@obj.id%>").val("");
+    <%end%>
-$("#add_tag_<%=@obj.id%>").hide();
+
+    $("#tags_name_<%=@obj.id%>").val("");
+    $("#add_tag_<%=@obj.id%>").hide();
 <% elsif  @obj_flag == '9'%>
     $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');

app/views/welcome/course.html.erb

@@ -39,21 +39,12 @@
 
     </div>
     <div class="course welcome_left" id="welcome_left">
+      <% if User.current.login? %>
         <span class="font_welcome_school">
-          <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+            <% if  @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
-              <span class="font_welcome_tdescription">,
-                <!--
-                edit by meng
-                @course_page.description存储在first_page表中的description字段
-	                             原本代码
-	                        <%= @course_page.description %>
-                !-->
-                <%= l(:label_welcome_trustie_course_description) %>
-              </span>
-          <% else %>
-            <% if @school_id == "0" %>
-            
             <% else %>
+              <% if @school_id == "0" %>
+              <% else %>
                 <% if @school_id.nil? %>
                     <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
                   <br/>
@@ -61,10 +52,20 @@
                     <%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
                   <br/>
                 <% end %>
+              <% end %>
             <% end %>
-        <% end %>
         </span>
-      <% unless @course_page.nil? %>
+        <span class="font_welcome_trustie">
+            <!--
+            edit by meng
+              @course_page.title存储在first_page表中的title字段
+	                        原本代码
+	                        <%= @course_page.title %>
+            !-->
+                      <%= l(:label_welcome_trustie_course) %>
+        </span>
+      <% else %>
+        <% unless @course_page.nil? %>
           <span class="font_welcome_trustie">
             <!--
             edit by meng
@@ -74,8 +75,18 @@
             !-->
             <%= l(:label_welcome_trustie_course) %>
           </span>
-
+          <span class="font_welcome_tdescription">,
+            <!--
+                edit by meng
+                @course_page.description存储在first_page表中的description字段
+	                             原本代码
+	                        <%= @course_page.description %>
+                !-->
+            <%= l(:label_welcome_trustie_course_description) %>
+          </span>
+        <% end %>
       <% end %>
+
     </div>
     <div class="search-bar" id="search-bar">
       <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course} %>

config/locales/courses/zh.yml

@@ -86,4 +86,8 @@ zh:
 
   #boards
   label_course_momes_count: "个帖子"
-  #boards count
+  #boards count
+
+  #setting
+  label_user_name: "用户名称"
+  #setting end

config/locales/zh.yml

@@ -497,14 +497,14 @@ zh:
   label_teacher_list: 教师列表
   label_student_list: 学生列表
   label_limit_time: 截止日期
-  label_commit_homework: 提交作业
+  label_commit_homework: 提交作品
+  label_edit_homework: 修改作品
   label_course_homework: 对应课程
   label_course_doing: 进行中
   label_course_done: 已结束
   label_homework_response: 作业咨询
-  label_bidding_homework: 提交作业
+  label_bidding_homework: 提交作品
   label_add_homework: 添加作业
-  label_edit_homework: 修改作业
   label_delete_homework: 删除作业
   label_new_homework: 创建作业
 

config/routes.rb

@@ -678,6 +678,7 @@ RedmineApp::Application.routes.draw do
   resources :courses do
     member do
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
+      get 'search_member', :action => 'search_member'
       get 'homework', :action => 'homework', :as => 'homework'
       get 'new_homework', :action => 'new_homework', :as => 'new_homework'
       get 'file', :action => 'file', :as => 'file'

lib/redmine.rb

@@ -110,7 +110,7 @@ Redmine::AccessControl.map do |map|
   map.permission :view_course, {:courses => [:show], :activities => [:index]}, :public => true, :read => true
   map.permission :search_course, {:search => :index}, :public => true, :read => true
   map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin ,:belong_to_course => true
-  map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member  ,:belong_to_course => true
+  map.permission :edit_course, {:courses => [:settings, :edit, :update,:search_member]}, :require => :member  ,:belong_to_course => true
   map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true
   map.permission :select_course_modules, {:courses => :modules}, :require => :member  ,:belong_to_course => true
   map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true  ,:belong_to_course => true

public/javascripts/course.js

@@ -80,9 +80,18 @@ function regex_course_class_period()
         return false;
     }
     else if (regex.test(class_period)) {
-        $("#course_class_period_notice").html("");
+        if(parseInt(class_period) > 0)
-        $("#course_class_period_notice").hide();
+        {
-        return true;
+            $("#course_class_period_notice").html("");
+            $("#course_class_period_notice").hide();
+            return true;
+        }
+        else
+        {
+            $("#course_class_period_notice").html("学时总数必须大于0");
+            $("#course_class_period_notice").show();
+            return false;
+        }
     }
     else
     {
@@ -91,10 +100,33 @@ function regex_course_class_period()
         return false;
     }
 }
+//验证密码
+function regex_course_password()
+{
+    var class_period = $.trim($("#course_course_password").val());
+    var regex = /^\w+$/;
+    if(class_period.length == 0)
+    {
+        $("#course_course_password_notice").html("课程密码不能为空");
+        $("#course_course_password_notice").show();
+        return false;
+    }
+    else if (regex.test(class_period)) {
+        $("#course_course_password_notice").html("");
+        $("#course_course_password_notice").hide();
+        return true;
+    }
+    else
+    {
+        $("#course_course_password_notice").html("课程密码有非法字符");
+        $("#course_course_password_notice").show();
+        return false;
+    }
+}
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name()&&regex_course_class_period())
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
     {
         $("#new_course").submit();
     }
@@ -102,7 +134,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name()&&regex_course_class_period())
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
     {
         $("#edit_course_"+id).submit();
     }
@@ -268,6 +300,31 @@ function submitSerch(content)
 {
     if(regexName(content)){$("#course_search_form").submit();}
 }
+
+//验证搜索时输入名字
+function regexQ(content)
+{
+    var name = $.trim($("#q").val());
+    if(name.length == 0)
+    {
+        $("#course_member_name_span").text(content);
+        $("#course_member_name_span").css('color','#ff0000');
+        $("#course_member_name_span").focus();
+        return false;
+    }
+    else
+    {
+        $("#course_member_name_span").text("");
+        return true;
+    }
+}
+//提交课程成员搜索
+function submitMemberSerch(content)
+{
+    //if(regexQ(content)){$("#course_member_search_form").submit();}
+    $("#course_member_search_form").submit();
+}
+
 //课程描述显示更多信息
 function show_more_msg()
 {

public/stylesheets/application.css

@@ -641,7 +641,6 @@ span.forums-avatar-right{
 /*added by bai*/
 .user_underlinescore{
 	margin: 1px;
-	padding: 1px;
 	width:700px;
 	height:1px;
 	background-color:#15bccf;
@@ -1106,7 +1105,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .user_underline{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#15bccf;
@@ -1126,7 +1124,6 @@ ul.user_course_sort li{list-style-type:none;
 
 .user_underline2{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1134,7 +1131,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .user_underline3{
 	margin: 1px;
-	padding:1px;
 	width:120px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1143,7 +1139,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .homepage_underline{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -3063,7 +3058,6 @@ div.repos_explain{
 /* new linchun compitition */
 .contest_underline{
 	margin:1px;
-	padding:1px;
 	width:900px;
 	height:0.5px;
 	background-color:#aaa;

public/stylesheets/courses.css

@@ -117,9 +117,9 @@ a:hover.re_fabu{background:#55a1b9;}
 .re_con{ margin:5px; width:665px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
-a.re_select{ display:block; height:20px; border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding:2px 5px 1px;}
+a.re_select{ display:block;  border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding:1px 5px;}
 a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;}
-a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding-top:3px;}
+a.re_open{display:block; width:46px;  border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding:1px 5px;}
 a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
@@ -273,6 +273,8 @@ a:hover.tijiao{ background:#0f99a9;}
 a.member_btn{ padding: 3px 5px; background:#15bccf; color:#fff;}
 a:hover.member_btn{ background:#329cbd;}
 .hol{display: none;}
+.search_course{margin-top:8px;margin-left:8px;}
+.search_form_course{margin-top:8px;margin-left:8px;}
 
 /* 新建项目 */
 .pro_new{ }
@@ -467,6 +469,8 @@ blockquote {
     font-family: "Microsoft YaHei";
     background: url('../images/requirements/reference.jpg');
 }
+a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
+.min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
 
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
@@ -521,8 +525,13 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .vi_zan{color:#28be6c;}
 .newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;}
 .newwork_btn a:hover{ background:#329cbd;}
-a.files_tag_icon{ background:#dcdcdc; color:#fff; border:1px solid #c8c8c8; padding:1px 10px; float:left; margin-right:10px; margin-bottom:10px;}
+.files_tag{ width:670px; height:22px; overflow:hidden; margin-bottom:10px;}
-a:hover.files_tag_icon{ background:#64bdd9; color:#fff; border:1px solid #54aeca; }
+a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
+a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
+
+
+
+
 
 
 

public/stylesheets/css.css

@@ -167,23 +167,8 @@ a:hover.tijiao{ background:#0f99a9 !important;}
 .c_grey{ color:#A7A7A7;}
 
 /*新增*/
-.min_search {
+.min_search {width: 150px;height: 15px;border: 1px solid #d0d0d0 !important;color: #666;}
-    width: 150px;
+a.member_search {width: 43px;height: 22px;background: #15bccf;color: #fff;text-align: center;padding: 4px 6px;text-decoration: none;}
-    height: 15px;
-    border: 1px solid #d0d0d0 !important;
-    color: #666;
-    /*background: url(../images/course/public_icon.png) 135px -193px no-repeat;*/
-    /*cursor: pointer;*/
-}
-a.member_search {
-    width: 43px;
-    height: 22px;
-    background: #15bccf;
-    color: #fff;
-    text-align: center;
-    padding: 4px 6px;
-    text-decoration: none;
-}
 /*上传图片处理*/
 .upload_img img{max-width: 100%;}
 

public/stylesheets/public.css

@@ -285,6 +285,7 @@ a:hover.close_btn {background-position:-66px 0;}
 .msgserver a {color:#15bccf; }
 
 
+.hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
 
 

public/themes/redpenny-master/stylesheets/application.css

@@ -1057,7 +1057,7 @@ display: block;
 float: left;
 margin-left: 20px;
 margin-top: 10px;
-width: 470px;
+width: 540px;
 font-family: '微软雅黑'; /*modify by men*/
 color: rgb(0, 0, 0);
 font-size: 13px;
@@ -1085,7 +1085,7 @@ float: left;
 }*/
 .information_for_course {
   margin-top: 20px;
-  margin-left: 507px;
+  margin-left: 550px;
   float: left;
   height: auto;
   width: 300px;
@@ -2008,10 +2008,10 @@ div.tableline{
    text-align: justify;
  }
  .brief_introduction {
-   margin-top: -18px;
+   margin-top: -30px;
    margin-left: 60px;
    /*display: inline-block;*/
-   width: 500px;
+   width: 480px;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;