Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

app/controllers/application_controller.rb

@@ -267,6 +267,8 @@ class ApplicationController < ActionController::Base
         end
       when "contest"
         return true
+      when "Course"
+        allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
       else
         return true
     end

app/controllers/attachments_controller.rb

@@ -76,7 +76,7 @@ class AttachmentsController < ApplicationController
       candown = User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
     elsif (@attachment.container.has_attribute?(:course) ||@attachment.container.has_attribute?(:course_id) ) && @attachment.container.course
       course = @attachment.container.course
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
+      candown = User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
     elsif @attachment.container.is_a?(Course)
       course = @attachment.container
       candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
@@ -366,7 +366,7 @@ class AttachmentsController < ApplicationController
     end
   rescue NoMethodError
     @save_flag = false
-    @save_message = [] << l(:error_attachment_empty)
+    @save_message = [] << l(:label_course_empty_select)
     respond_to do |format|
       format.js
     end

app/controllers/files_controller.rb

@@ -26,13 +26,15 @@ class FilesController < ApplicationController
 
   helper :sort
   include SortHelper
+  include FilesHelper
   helper :project_score
 
   def show_attachments obj
-    @all_attachments = []
+    @attachments = []
     obj.each do |container|
-      @all_attachments += container.attachments
+      @attachments += container.attachments
     end
+    @all_attachments = visable_attachemnts(@attachments)
     @limit = 10
     @feedback_count = @all_attachments.count
     @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
@@ -48,9 +50,11 @@ class FilesController < ApplicationController
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
       if params[:insite]
         @result = find_public_attache q
+        @result = visable_attachemnts @result
         @searched_attach = paginateHelper @result,10
       else
         @result = find_course_attache q,@course
+        @result = visable_attachemnts @result
         @searched_attach = paginateHelper @result,10
       end
 
@@ -69,7 +73,7 @@ class FilesController < ApplicationController
     # StoresController#search 将每条文件都查出来，再次进行判断过滤。---> resultSet.to_a.map
     # 此时内容不多速度还可，但文件增长，每条判断多则进行3-4次表连接。
     # 现在还木有思路 药丸
-    resultSet = Attachment.where("attachments.container_type IS NOT NULL AND (is_public = 1 OR author_id = #{User.current.id}) AND filename LIKE :like ", like: "%#{keywords}%").
+    resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{keywords}%").
               reorder("created_on DESC")
   end
 

app/controllers/homework_attach_controller.rb

@@ -382,42 +382,22 @@ class HomeworkAttachController < ApplicationController
     if User.current.admin? || User.current.member_of_course?(@homework.bid.courses.first)
       # 打分统计
       stars_reates = @homework. rates(:quality)
-      #stars_reates_count = stars_reates.count == 0 ? 1 : stars_reates.count
-      #stars_status = stars_reates.select("stars, count(*) as scount").group("stars")
-      #@stars_status_map = Hash.new(0.0)
-      #stars_status.each do |star_status|
-      #  percent = (star_status.scount * 1.0/ stars_reates_count) * 100.to_f
-      #  percent_m = format("%.2f", percent)
-      #  @stars_status_map["star#{star_status.stars.to_i}".to_sym] =
-      #      percent_m.to_s + "%"
-      #end
       #是否已经进行过评价
       temp = HomeworkAttach.find_by_sql("SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = #{@homework.id} AND rater_id = #{User.current.id}").first
       @m_score = temp.nil? ? 0:temp.stars
       @has_evaluation = stars_reates.where("rater_id = ?",User.current).count > 0
-      #是否开启互评功能
-      #@is_evaluation = @homework.bid.is_evaluation == 1 || @homework.bid.is_evaluation == nil
-      #@limit =  10
       #@jours留言 is null条件用以兼容历史数据
       @jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
       @cur_page = params[:cur_page] || 1
       @cur_type = params[:cur_type] || 5
       @jour = paginateHelper @jours,5
-      #@feedback_count = @jours.count
+
-      #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-      #@offset ||= @feedback_pages.offset
-      #@jour = @jours[@offset, @limit]
-      #@comprehensive_evaluation教师评论
-      #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1").order("created_on DESC")
       teachers = searchTeacherAndAssistant @course
       @comprehensive_evaluation = []
       teachers.each do|teacher|
         temp = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{teacher.user_id}").order("created_on DESC").first
         @comprehensive_evaluation << temp if temp
       end
-      #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id in #{convert_array(teachers)}").order("created_on DESC")
-      #@anonymous_comments 匿评
-      #@anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2").order("created_on DESC")
       annymous_users = @homework.homework_evaluations.map(&:user)
       unless annymous_users.nil? || annymous_users.count == 0
         @anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2 and user_id in #{convert_array(annymous_users)}").order("created_on DESC")

app/controllers/projects_controller.rb

@@ -843,7 +843,10 @@ class ProjectsController < ApplicationController
   end
 
   def show_projects_score
-    render :layout => false
+    respond_to do |format|
+      format.html { render :layout => "project_base"}
+      format.js
+    end
   end
   
   def issue_score_index

app/controllers/welcome_controller.rb

@@ -163,7 +163,7 @@ class WelcomeController < ApplicationController
 
       return 0
     elsif url.include?(Setting.host_user.gsub('/',''))
-      redirect_to(:controller => "users", :action => "index")
+      #redirect_to(:controller => "users", :action => "index")
     end
       
     

app/helpers/files_helper.rb

@@ -72,5 +72,20 @@ module FilesHelper
     result
   end
 
+  def visable_attachemnts attachments
+    result = []
+    attachments.each do |attachment|
+      if attachment.is_public? || attachment.author_id == User.current.id
+        result << attachment
+      end
+    end
+    result
+  end
 
+  def get_qute_number attachment
+    if attachment.copy_from.nil?
+      return 0
+    end
+    count = Attachment.find_by_sql("select count(*) from attachments where copy_from = #{attachment.copy_from}")
+  end
 end

app/helpers/homework_attach_helper.rb

@@ -60,7 +60,7 @@ module HomeworkAttachHelper
     memberships = User.current.memberships.all(:conditions => cond)
     projects = memberships.map(&:project)
     not_have_project = []
-    not_have_project << "<<NULL>>"
+    not_have_project << "NO PROJECT"
     not_have_project << 0
     type = []
     type << not_have_project

app/models/role.rb

@@ -161,7 +161,7 @@ class Role < ActiveRecord::Base
     if action.is_a? Hash
       allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
     else
-        allowed_permissions.include? action
+      allowed_permissions.include? action
     end
   end
 

app/views/bids/_bid_homework_show.html.erb

@@ -27,8 +27,7 @@
         background: #15bccf;
         color: #fff;
         text-align: center;
-        padding-top: 3px;
+        padding: 5px !important;
-        padding-left: 3px;
     }
     .span_wping a:hover{ background-color:#03a1b3;}
 </style>
@@ -76,7 +75,7 @@
                       <% end %>
                   <% end %>
                   <% if (User.current.admin?||User.current.id==bid.author_id) %>
-                      <% if bid.open_anonymous_evaluation == 1%>
+                      <% if bid.open_anonymous_evaluation == 1 && bid.homeworks.count >= 2%>
                         <span id="<%=bid.id %>_anonymous_comment" class="span_wping">
                           <% case bid.comment_status %>
                           <% when 0 %>

app/views/bids/_homework_form.html.erb

@@ -40,7 +40,7 @@
 <p style="display: none;">
   <%= f.select :is_evaluation, is_evaluation_option %>
 </p>
-<p>
+<p style="display: none">
   <%= f.select :proportion, proportion_option %>
 </p>
 <p>

app/views/bids/_homework_list.html.erb

@@ -22,7 +22,7 @@
           <%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
           (<span id="jours_count" class="c_red f_12"><%= @jours_count %></span>)
         </li>
-        <li >
+        <li style="padding-top: 5px;">
           <%= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all"  unless @bid.homeworks.empty? %>
         </li>
       </ul>

app/views/courses/_homework_form.html.erb

@@ -45,7 +45,7 @@
 <p style="display: none">
   <%= f.select :is_evaluation, is_evaluation_option %>
 </p>
-<p>
+<p style="display: none">
   <%= f.select :proportion, proportion_option %>
 </p>
 <p>

app/views/files/_course_file.html.erb

@@ -18,6 +18,20 @@
       hideModal($("#popbox_upload"));
   }
 
+   function presscss(id)
+   {
+       if(id == "incourse")
+       {
+         $('#incourse').attr("class", "re_schbtn b_dblue");
+         $('#insite').attr("class", "re_schbtn b_lblue");
+       }
+       else
+       {
+         $('#incourse').attr("class", "re_schbtn b_lblue");
+         $('#insite').attr("class", "re_schbtn b_dblue");
+       }
+   }
+
 </script>
 
 <div class="container">
@@ -25,8 +39,8 @@
 <div class="re_top">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "课内搜索", :class => "re_schbtn b_dblue",:name => "incourse"%>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onclick => "presscss('incourse')"%>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onclick => "presscss('insite')" %>
       <% end %>
   <% if is_course_teacher(User.current,@course) %>
     <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload()">上传资源</a>

app/views/files/_course_list.html.erb

@@ -1,8 +1,8 @@
 <% delete_allowed = User.current.allowed_to?(:manage_files, course) %>
 <div class="re_con_top">
-  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= User.current.member_of_course?(course) ? all_attachments.count : 0 %>&nbsp;个资源</p>
+  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
-  <!-- <p class="f_r">
+   <p class="f_r" style="color: #808080">
-    <#% if @order == "asc" %>
+    <!--<#% if @order == "asc" %>
         按&nbsp;<#%= link_to "时间",course_files_path(course,:sort=>"created_on:desc"),:class => "f_b c_grey"  %><#%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
         <#%= link_to "下载次数",course_files_path(course,:sort=>"downloads:desc"),:class => "f_b c_grey"  %><#%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
         <a href="#" class="f_b c_grey">引用次数</a>&nbsp;排序
@@ -10,37 +10,38 @@
         按&nbsp;<#%= link_to "时间",course_files_path(course,:sort=>"created_on:asc"),:class => "f_b c_grey"  %><#%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
         <#%= link_to "下载次数",course_files_path(course,:sort=>"downloads:asc"),:class => "f_b c_grey"  %><#%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
         <a href="#" class="f_b c_grey">引用次数</a>&nbsp;排序
-    <#% end %>
+    <#% end %>-->
-  </p>-->
+     资源列表的多样化排序将在下周上线...
+  </p>
 </div>
 <div class="cl"></div>
 <% curse_attachments.each do |file| %>
-    <%if file.is_public == 0 && !User.current.member_of_course?(@course)%>
-        <%next%>
-    <%end%>
     <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" %>
-        <% if is_course_teacher(User.current,@course) %>
+        <% if User.current.logged? %>
-            <%= link_to "选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true %>
+          <% if is_course_teacher(User.current,@course) && file.author_id == User.current.id %>
+            <%= link_to "选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select",:remote => true %>
+
             <% 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  %>
               </span>
             <% else %>
-                <%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %>
+              <!--  <#%= 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 %>
+          <% end %>
         <% else %>
-            <%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %>
         <% end %>
       </div>
       <div class="cl"></div>
       <div class="">
-        <p class="f_l c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+        <p class="f_l c_grey02 font">文件大小：<%= 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;引用0 </p>
+        <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;引用<%#=get_qute_number file %>--> </p>
       </div>
       <div class="cl"></div>
       <div class="tag_h">

app/views/files/_show_quote_resource.html.erb

@@ -1,8 +1,8 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <div id="error_show"></div>
     <h2>将此课件引入我的课程资源库</h2>
     <div class="upload_box">
+      <div id="error_show" style="color: red;"></div>
       <%= form_tag course_attach_relations_path,
                    method: :post,
                    remote: true,

app/views/homework_attach/_homework.html.erb

@@ -51,7 +51,7 @@
     <% if is_my_homework %>
         <!-- 我的作品，显示为编辑和删除 -->
         <% if @bid.comment_status == 0 %>
-            <li class="wmine">
+            <li class="wmine" style="padding-top: 4px;">
               <%= link_to l(:button_edit), edit_homework_attach_path(homework) %>
               <%  if homework.user == User.current || User.current.admin? %>
                   <!-- 作业创建者显示删除作业 -->

app/views/homework_attach/new.html.erb

@@ -2,11 +2,11 @@
 <script type="text/javascript" language="javascript" xmlns="http://www.w3.org/1999/html">
     function regexName()
     {
-        var name = $("#homework_attach_name").val();
+        var name = $.trim($("#homework_attach_name").val());
 
         if(name=="")
         {
-            $("#homework_attach_name_span").text("名称不能为空");
+            $("#homework_attach_name_span").text("作品名称不能为空");
             $("#homework_attach_name_span").css('color','#ff0000');
             return false;
         }
@@ -17,8 +17,25 @@
             return true;
         }
     }
+    function regexDescription()
+    {
+        var name = $.trim($("#homework_attach_description").val());
 
-    function submit_homework_form(){if(regexName()){$('#new_homework_attach').submit();}}
+        if(name=="")
+        {
+            $("#homework_attach_description_span").text("作品描述不能为空");
+            $("#homework_attach_description_span").css('color','#ff0000');
+            return false;
+        }
+        else
+        {
+            $("#homework_attach_description_span").text("填写正确");
+            $("#homework_attach_description_span").css('color','#008000');
+            return true;
+        }
+    }
+
+    function submit_homework_form(){if(regexName()&&regexDescription()){$('#new_homework_attach').submit();}}
 </script>
 <div class="container">
   <div class="Newwork">
@@ -55,13 +72,14 @@
               <span id="homework_attach_name_span"></span>
             </p>
             <p>
-              <label style="float:left;padding-left:10px;">
+              <label style="float:left;padding-right: 3px;">
                 <span class="c_red">
-
+                   *
                 </span>
-                &nbsp;&nbsp;作业描述&nbsp;&nbsp;&nbsp;&nbsp;：
+                &nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
               </label>
-              <%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字"%>
+              <%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字", :onblur => "regexDescription();"%>
+              <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
             </p>
             <div class="cl"></div>
             <p>

app/views/homework_attach/show.html.erb

@@ -1,175 +1,2 @@
-<%= render :partial => 'layouts/base_homework_attach', :locals => {:homework_attach => @homework} %>
+<%= stylesheet_link_tag  'css', :media => 'all' %>
-<style>
+<%= render :partial => "show"%>
-    .softapplication-img  .soft-application {
-        float: left;
-        width: 25%;
-        height: 200px;
-    }
-</style>
-<% is_student = is_cur_course_student @homework.bid.courses.first %>
-<% is_teacher = is_course_teacher User.current,@homework.bid.courses.first %>
-<p id="notice"><%= notice %></p>
-<div style="height: auto; padding-bottom: 10px">
-  <tr>
-    <td colspan="2" valign="top" width="320" >
-    </td>
-    <td>
-      <table width="100%" border="0">
-        <tr style="font-size: 18px">
-          <td colspan="2" valign="top"><strong>作业基础信息<%=@count %></strong></td>
-        </tr>
-        <tr>
-          <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
-            发布人员：<%= link_to @homework.user, user_path(@homework.user)%>
-          </td>
-          <td style="width: 240px; word-wrap: break-word; word-break: break-all">
-            所属任务：<%= link_to(@homework.bid.name, course_for_bid_path(@homework.bid))%>
-          </td>
-        </tr>
-        <tr>
-          <td style="padding-left: 40px">
-            <span>作业下载：</span>
-            <% if @is_evaluation || is_teacher%>
-                <% options = {:author => true } %>
-                <%= render :partial => 'app_link', :locals => {:attachments => @homework.attachments, :options => options} %>
-            <% else %>
-                <%= l(:label_cant_download)  %>
-            <% end %>
-          </td>
-          <td  style="width: 240px; word-wrap: break-word; word-break: break-all">
-            参与人员：
-            <% @homework.users.each do |homework_user| %>
-                <%= link_to homework_user, user_path(homework_user)%>
-                <% if @homework.users.count > 1 && homework_user != @homework.users.last %>
-                    <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <% end %>
-            <% end %>
-          </td>
-        </tr>
-        <tr>
-          <td style=" padding-left: 40px">平均评分：
-            <%= render :partial => 'show_score', :locals => {:stars => @totle_score}  %>
-          </td>
-          <td  style="width: 240px; word-wrap: break-word; word-break: break-all">发布时间：<%=format_time @homework.created_at %></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</div>
-<div class="underline-contests_one"></div>
-
-<div style="height: auto; padding-bottom: 10px">
-  <tr>
-    <td colspan="2" valign="top" width="320" >
-    </td>
-    <td>
-      <table width="100%" border="0">
-        <tr>
-          <td colspan="2" valign="top"><div style="font-size: 15px;"><strong>作业描述：</strong></div></td>
-        </tr>
-        <tr>
-          <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
-            <div style="padding-top: 5px">
-              <% if @homework.description != nil && @homework.description != "" %>
-                <%= @homework.description %>
-              <% else %>
-                  <div style="font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 10px;padding-left: 10px ">
-                    <strong>该作业无任何描述！</strong>
-                  </div>
-              <% end %>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</div>
-<div class="underline-contests_one"></div>
-
-<div style="height: auto; padding-bottom: 10px">
-  <div style="font-size: 15px;">
-    <strong>作业得分：</strong>
-  </div>
-  <div style="overflow: hidden">
-    <div style="margin-left: 15%; float: left">
-      <div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
-      <div>
-        <% 100.step(20,-20) do |star|  %>
-            <div data-kls="HomeworkAttach" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled"
-                 style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
-              <div class="jRatingColor" style="width: <%=star%>%;"></div>
-              <div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
-              <div class="jStar" style="width: 115px; height: 20px; top: -40px;
-                        background: url('/images/seems_rateable/stars.png') repeat-x scroll 0% 0% transparent;">
-              </div>
-            </div>
-            <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
-            <br/>
-        <% end %>
-      </div>
-    </div>
-    <div style="float: left; padding-left: 100px; padding-top:35px ">
-      <div style="text-align: center">最终得分</div>
-      <div style="padding-top: 1px; font-size: 15px; color: blue;text-align: center">
-        <%= @totle_score  %>分
-      </div>
-      <div style="padding-top: 3px">
-        <%= render :partial => 'show_score', :locals => {:stars => @totle_score}  %>
-      </div>
-    </div>
-    <div style="float: left; padding-left: 100px; padding-top:35px ">
-      <div>打分总人数</div>
-      <div style="padding-left: 28px; padding-top: 1px; font-size: 25px; color: blue">
-        <strong>
-          <%= @homework.raters(:quality).count%>
-        </strong>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="underline-contests_one"></div>
-
-<!-- 作业综评 -->
-<div id="comprehensive_evaluation">
-  <%= render :partial => 'comprehensive_evaluation', :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score} %>
-</div>
-
-<div class="underline-contests_one"></div>
-
-<!-- 作业成员(发布人员和参与人员)不能对作业进行评分 -->
-<% if !users_for_homework(@homework).include?(User.current) %>
-    <div style="height: 50px">
-      <div style="font-size: 15px"><strong>作业评论：</strong></div>
-      <% if is_student %>
-          <% if @is_evaluation %>
-              <% if @has_evaluation %>
-                  <div style="text-align: center;">
-                    <%= l(:lable_has_evaluation)%>
-                  </div>
-              <% else %>
-                  <%= render :partial => 'evaluation', :locals => {:homework => @homework}  %>
-              <% end %>
-          <% else %>
-              <div style="text-align: center;">
-                <%= l(:lable_close_evaluation)%>
-              </div>
-          <% end %>
-      <% end %>
-    </div>
-<% end %>
-
-<% if !is_teacher %>
-    <!--提示登录后对应用进行评价-->
-    <div id="leave-message">
-      <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
-    </div>
-<% end %>
-
-
-<!-- 留言列表区 -->
-<div id="message" style="font-size: 14px;">
-  <%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %>
-</div>
-
-<div>
-</div>

app/views/layouts/base_courses.html.erb

@@ -24,7 +24,7 @@
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
-<!-- <#%= render :partial => 'courses/course_ad' %> -->
+<%= render :partial => 'courses/course_ad' %>
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">

app/views/layouts/base_homework.html.erb

@@ -21,6 +21,18 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>
+
+        <style>
+          .span_wping{}
+          .span_wping a{
+              margin-bottom: 3px;
+              background: #15bccf;
+              color: #fff;
+              text-align: center;
+              padding: 5px !important;
+          }
+          .span_wping a:hover{ background-color:#03a1b3;}
+        </style>
 	</head>
 	<body class="<%= h body_css_classes %>">
     <% course = @bid.courses.first %>
@@ -106,8 +118,8 @@
                         <% if (User.current.admin?||User.current.id==@bid.author_id) %>
                             <tr>
                               <td valign="top" style="padding-left: 8px; font-size: 15px" colspan="2">
-                                <% if @bid.open_anonymous_evaluation == 1%>
+                                <% if @bid.open_anonymous_evaluation == 1  && @bid.homeworks.count >= 2%>
-                                 <span id="<%=@bid.id %>_anonymous_comment">
+                                 <span id="<%=@bid.id %>_anonymous_comment" class="span_wping">
                                       <% case @bid.comment_status %>
                                       <% when 0 %>
                                         <%= link_to '启动匿评',  alert_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...' %>
@@ -149,31 +161,30 @@
                   <div class="user_underline"></div>
 
                     <!-- info -->
-                    <div class="inf_user_image">
+                    <% unless @bid.attachments.empty? %>
-                      <table>
+                        <div class="inf_user_image">
-                        <tr>
+                          <table>
-                          <td valign="top" colspan="2" style="font-size: 16px;padding-left: 8px;">
+                            <tr>
-                            <strong>
+                              <td valign="top" colspan="2" style="font-size: 16px;padding-left: 8px;">
-                              <%= l(:label_attachment) %> :
+                                <strong>
-                            </strong>
+                                  <%= l(:label_attachment) %> :
-                          </td>
+                                </strong>
-                        </tr>
+                              </td>
-                        <tr>
+                            </tr>
-                          <td valign="top" colspan="2">
+                            <tr>
-                            <% if @bid.attachments.any?%>
+                              <td valign="top" colspan="2">
                                 <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 7} %>
                                 <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
-                            <% end %>
+                              </td>
-                          </td>
+                            </tr>
-                        </tr>
+                            <tr>
-                        <tr>
+                              <!--td>作业类型:
-                          <!--td>作业类型:
                             <%#= @bid.homework_type==Bid::HomeworkFile ? "提交文件" : "提交项目" %>
                           </td-->
-                        </tr>
+                            </tr>
-
+                          </table>
-                      </table>
+                        </div>
-                    </div>
+                    <% end%>
                   </div>
                 </div>
                 <!-- end -->

app/views/memos/show.html.erb

@@ -8,8 +8,12 @@
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
 	<div class="lz-left">	
-		<div><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
+		<div>
-		<p class="clearfix"><%=link_to @memo.author.name, user_path(@memo.author) %></p>
+          <%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
+        </div>
+		<p class="clearfix">
+          <%=link_to @memo.author.name, user_path(@memo.author) %>
+        </p>
 	</div>
 	<div class="memo-section">
 			<div class="contextual-borad">
@@ -55,7 +59,8 @@
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"
              style="word-break: break-all;word-wrap: break-word;">
-          <%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
+          <%= label_tag l(:field_subject) %>:
+          <%=h @memo.subject %>
         </div>
 		<div class="memo-content" id="memo-content_div">
 		<%= textAreailizable(@memo,:content) %>
@@ -67,7 +72,9 @@
 			</p>
 			<div class="clearfix"></div>
 		</div>
-		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
+		<div class="memo-timestamp">
+          <%= authoring @memo.created_at, @memo.author %>
+        </div>
 
 	</div>
 	<br />

app/views/projects/show_projects_score.html.erb

@@ -66,6 +66,6 @@
   </ul>
 </div>
 <div id="show_score_detail">
-  <%= render :partial => 'projects/project_score_index', :locals => {:index => 0 } %>
+  <%= render :partial => 'projects/project_score_index', :locals => {:index => 0,:project => @project } %>
 </div>
 <% end %>

app/views/tags/_tag_add.html.erb

@@ -1,13 +1,14 @@
 <%= link_to '+ 添加标签', 'javascript:void(0);',
             :class => "yellowBtn f_l",
             :onclick=>"$('#add_tag_#{obj.id}').slideToggle();" if User.current.logged? %> <!-- $('#put-tag-form-#{obj.class}-#{obj.id}').toggle(); readmore(this); -->
-<span id="add_tag_<%= obj.id %>" style="display:none; vertical-align: middle;" class="ml10 f_l">
+
                   <%= form_for "tag_for_save",:remote=>true,:url => save_tag_path,
                                :update => "tags_show",
                                :complete => '$("#put-tag-form").hide();' do |f| %>
-			        <%= 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" %>
+                    <span id="add_tag_<%= obj.id %>" style="display:none; vertical-align: middle;" class="ml10 f_l">
-                    <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+			          <%= 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_flag,:value=> object_flag,:style=>"display:none"%>
+                      <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
-                    <%= f.submit "",:class => "submit f_l" %>
+                      <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+                      <%= f.submit "",:class => "submit f_l" %>
+                    </span>
 			      <% end %>
-</span>

app/views/tags/_tag_list.html.erb

@@ -14,7 +14,7 @@
     </span>
     <% end %>
 <% else %>
-    <span style="color:#8c8a8a" class="f_l">
+    <!-- <span style="color:#8c8a8a" class="f_l">
-	&nbsp;&nbsp;&nbsp;<%= l(:label_tags_no) %>
+	&nbsp;&nbsp;&nbsp;<#%= l(:label_tags_no) %> -->
-</span>
+    </span>
 <% end %>

app/views/welcome/_more_course.html.erb

@@ -1,8 +1,6 @@
 <% if User.current.logged?%>
-    <% if User.current.user_extensions.identity == 0 %>
         <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'},
                     :class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %>
-    <% end %>
     &nbsp;&nbsp;&nbsp;&nbsp;
     <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>
     &nbsp;&nbsp;&nbsp;&nbsp;

config/locales/en.yml

@@ -1852,3 +1852,4 @@ en:
   label_anonymous_comments: Anonymous comments
   label_anonymous: Anonymous
   label_submit_comments: Submit_comments
+  label_course_empty_select: You have not selected course！

config/locales/zh.yml

@@ -2203,4 +2203,5 @@ zh:
   label_submit_comments: 提交评论
   field_evaluation_num: 匿评分配数量
   label_my_score: 我的评分
-  field_open_anonymous_evaluation: 是否开启匿评
+  field_open_anonymous_evaluation: 是否使用匿评
+  label_course_empty_select: 尚未选择课程！

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141119011439) do
+ActiveRecord::Schema.define(:version => 20141120091234) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20141119011439) do
     t.string   "disk_directory"
     t.integer  "attachtype",                   :default => 1
     t.integer  "is_public",                    :default => 1
+    t.integer  "copy_from"
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"

public/stylesheets/application.css

@@ -2202,7 +2202,7 @@ button.tab-right {
   padding-bottom: 2px;
   text-align: center;  
   border: 1px solid #15BCCF;
-  border-bottom: 0px solid #15BCCF;
+  border-bottom: 1px solid #15BCCF;
  
   color:#606060;
   font-weight:bold;

public/stylesheets/css.css

@@ -1,5 +1,5 @@
 /* CSS Document */
-body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
+body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important;  background:#fff; font-style:normal;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
 div,img,tr,td,textarea{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -15,7 +15,7 @@ a:hover{ text-decoration:underline;}
 /* TAB 切换效果 */
 .tb_{ background-color: #eaeaea; height:40px; }
 .tb_ ul{height:40px; }
-.tb_ li{float:left;height:35px;width: 90px;cursor:pointer; font-size:14px; padding-top:5px; text-align:center; }
+.tb_ li{float:left;height:30px;width: 90px;cursor:pointer; font-size:14px; padding-top:10px; text-align:center; }
 a.tb_all{ margin-left:235px; font-size:12px; display:block; height:23px; padding-top:4px; width:90px; color:#7a7a7a; border:1px solid #cbcbcb; background:#fff; text-align: center;}
 a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
 
@@ -38,13 +38,13 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
 .pic_head a{ text-align:center; width:42px; overflow:hidden;text-overflow:ellipsis; white-space:nowrap;}
 .pic_head img{ border:1px solid #fff;}
 .pic_head img:hover{border:1px solid #15bccf;}
-.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:20px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:25px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
-.dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:35px;}
+.dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;}
-.wscore{ padding-top:22px; color:#888888; width:96px;}
+.wscore{ padding-top:25px; color:#888888; width:96px;}
 .dis ul li.wping{margin-left:12px; }
-.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
+.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:8px;}
 .dis ul li.wping a:hover{ background-color:#03a1b3;}
-ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; }
 .wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
 .wlist  a{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
 .wlist a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
@@ -84,7 +84,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;}
 .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
 a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}
-a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
+a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;line-height: 1.9;}
 a:hover.ping_sub{ background:#14a8b9;}
 .recall{ border-top:1px solid #CCC; padding:5px 0;}
 .recall_head{ float:left;}
@@ -92,7 +92,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .recall_head img{ height:30px; width:30px;}
 .recall_head a:hover{border:1px solid #15bccf;}
 .recall_head img:hover{border:1px solid #15bccf;}
-.recall_con{ float:left;color:#777777;max-width: 530px;width: 90%; margin-left:10px; }
+.recall_con{ float:left;color:#777777;max-width: 530px;width: 80%; margin-left:10px; }
 .recall_con a{ color:#15bccf; }
 
 .ping_list{ margin-top:15px;}
@@ -128,7 +128,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 
 .w430{ width:430px;}
 .w350{ width:350px;}
-.w620{ width:580px; height:160px; border:1px solid #CCC;}
+.w620{ width:580px; height:160px; border:1px solid #CCC !important; padding-left: 3px !important;}
 .bo{height:26px; border:1px solid #CCC !important; padding: 0 !important;}
 a.tijiao{ height:28px !important; display:block !important; width:80px !important; color:#fff !important; background:#15bccf !important; text-align:center !important; padding-top:4px !important; float:left !important; margin-right:10px !important;}
 a:hover.tijiao{ background:#0f99a9 !important;}

public/stylesheets/nyan.css

@@ -649,14 +649,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
 }
 
 .tools a:visited {
-    color: #fffbff;
+    color: #116699;
     text-decoration: none;
     padding: 3px 5px 0px 5px;
     width: 100px;
 }
 
 .tools a:hover {
-    color: #fffbff;
+    color: white;
     padding: 3px 3px 0px 20px;
     width: 88px;
     text-decoration: none;

public/stylesheets/resource.css

@@ -1,4 +1,4 @@
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9 !important; background:#fff !important; font-style:normal !important;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,form,span,textarea{ margin:0; padding:0;}
 div,img,tr,td,textarea{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -12,11 +12,12 @@ a:hover{ text-decoration:underline;}
 .b_lblue{ background:#64bdd9 !important;}
 .b_dblue{ background:#55a1b9 !important; cursor:pointer !important;}
 .f_b{ font-weight: bold !important;}
-.c_blue{ color:#64bdd9;}
+.c_blue{ color:#64bdd9 !important;}
 .c_grey{ color:#999999 !important;}
 .c_grey02{ color:#666666 !important;}
+.font{ font-size: 12px;}
 .f_14{ font-size:14px ;}
-.c_dblue{ color:#3e6d8e;}
+.c_dblue{ color:#3e6d8e !important;}
 .w90{width:90px;}
 .ml10{margin-left:10px;}
 .ml5{margin-left:5px;}
@@ -46,15 +47,38 @@ a:hover{ text-decoration:underline;}
     text-shadow: none !important;
 }
 a.re_fabu { display:block; width:90px; height:35px; font-size:14px; color:#fff; text-align:center; padding-top:5px; margin:5px; }
-a:hover.re_fabu{background:#55a1b9;}
+a:hover.re_fabu{background:#55a1b9 !important;}
 /****列表***/
 .re_con{ margin:5px; width:683px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
-a.re_select{ display:block; width:88px; height:22px; background:url(images/pic_select01.png) 0 0 no-repeat; color:#fff; font-weight:bold; margin-left:10px;}
+a.re_select{
-a:hover.re_select{background:url(images/pic_select02.png) 0 0 no-repeat;}
+    display: block;
-.re_open{display:block; width:46px; height:22px; background:url(images/pic_open01.png) 0 0 no-repeat; color:#fff; font-weight:bold; margin-left:10px;}
+    height: 22px;
-a:hover.re_open{background:url(images/pic_open02.png) 0 0 no-repeat;}
+    border: 1px solid #ff9900;
+    color: #ff9900;
+    margin-left: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+a:hover.re_select{
+    background: #ff9900;
+    color: #fff;
+    text-decoration: none;}
+.re_open{
+    display: block !important;
+    width: 46px !important;
+    height: 22px !important;
+    border: 1px solid #64bdd9 !important;
+    color: #64bdd9 !important;
+    margin-left: 10px !important;
+}
+a:hover.re_open
+{
+    background: #64bdd9;
+    color: #fff !important;
+    text-decoration: none !important;
+}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding:10px 0;}
 /****翻页***/
@@ -76,7 +100,6 @@ a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
     margin-top:2px !important;
     margin-left:3px !important;
     border:none !important;
-    margin-left:0px !important;
     box-shadow: none !important;
     padding: 0px !important;
     border-radius: 0 !important;

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

@@ -498,7 +498,7 @@ color: #000000;
 #sidebar a,#sidebar a.selected
 {
   display:inline-block;
-  padding:4px 4px 4px 21px !important;
+  padding:4px 4px 4px 21px;
   transition:all .2s linear;
   -moz-transition:all .2s linear;
   -o-transition:all .2s linear;
@@ -1641,7 +1641,7 @@ div.left_wf a {
 
 #sidebar a, #sidebar a.selected{
   display: inline-block;
-  padding: 0px !important;
+  padding: 0px;
   transition: all 0.2s linear 0s;
 }