Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/git_usage_controller.rb

@@ -1,6 +1,6 @@
 #added by baiyu
 class GitUsageController < ApplicationController
-  layout "base_projects"
+  layout "new_base"
   def ch_usage
     
   end

app/controllers/homework_common_controller.rb

@@ -206,7 +206,7 @@ class HomeworkCommonController < ApplicationController
 
   #当前用户是不是课程的成员
   def member_of_course
-    render_403 unless User.current.member_of_course?(@course) || User.current.admin?
+    render_403 unless @course.is_public || User.current.member_of_course?(@course) || User.current.admin?
   end
 
   def get_assigned_homeworks(student_works, n, index)

app/controllers/student_work_controller.rb

@@ -284,7 +284,7 @@ class StudentWorkController < ApplicationController
   #是不是当前课程的成员
   #当前课程成员才可以看到作品列表
   def member_of_course
-    render_403 unless User.current.member_of_course? @course || User.current.admin?
+    render_403 unless User.current.member_of_course?(@course) || User.current.admin?
   end
 
   #判断是不是当前作品的提交者

app/helpers/courses_helper.rb

@@ -35,7 +35,7 @@ module CoursesHelper
 
   #生成课程老师成员链接
   def course_teacher_link teacher_num
-    if User.current.member_of_course?(@course)
+    if User.current.member_of_course?(@course) || User.current.admin?
       link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue'
     else
       content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
@@ -44,7 +44,7 @@ module CoursesHelper
 
   #生成课程学生列表连接
   def course_student_link student_num
-    if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
+    if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
       link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue'
     else
       content_tag 'span',student_num, :class => 'info_foot_num c_blue'

app/views/courses/_history.html.erb

@@ -18,6 +18,7 @@
                   <p>
                     <%= journal.notes.html_safe %>
                   </p>
+                  <div class="cl"></div>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>

app/views/courses/join_private_courses.js.erb

@@ -1,5 +1,5 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
-showModal('ajax-modal', '510px');
+showModal('ajax-modal', '540px');
 $('#ajax-modal').css('height','330px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +

app/views/homework_common/_alert_anonyoms.html.erb

@@ -5,7 +5,11 @@
         <p>
           开启匿评后学生将不能对作品进行
           <span class="c_blue">修改、删除</span>
-          等操作，目前有
+          等操作，开启匿评后的提交作品，将
+          <span class="c_blue">不能参与匿评</span>，
+          匿评评分将被记为
+          <span class="c_pink">0分</span>
+          。目前有
           <span class="c_pink"><%= @totle_size%>个</span>
           学生，共提交了
           <span class="c_pink"><%= @cur_size %></span>

app/views/mailer/send_for_user_activities.html.erb

@@ -25,7 +25,7 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
 
-                  <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -47,9 +47,9 @@
 
                   <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice_reply) %></span>
 
-                  <%= link_to truncate(course_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -156,7 +156,7 @@
       <% unless @attachments.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_course_attendingcontestwork_download) %>
+              <%= l(:label_course_mail_files) %>
             </span>
             <% @attachments.each do |attachment|%>
                 <li style="clear: both; list-style: none;">
@@ -223,7 +223,7 @@
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
                   <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
                   <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
                       <%= link_to truncate(l(:label_isuue_mail_status),length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
                                   :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
@@ -327,6 +327,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
+            <!--新闻回复-->
             <% @project_news_comments.each do |project_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
@@ -339,9 +340,9 @@
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
                   <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_notice) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:lable_project_mail_notice_reply) %></span>
 
-                  <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_news_comment.created_on) %></span>

app/views/mailer/send_for_user_activities.text.erb

@@ -23,7 +23,7 @@
             <% end %>
             ]
             <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
-            <%= l(:label_project_notice) %>
+            <%= l(:label_project_notice_reply) %>
             <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
             <%= format_time(course_news_comment.created_on) %>
         <% end %>
@@ -49,7 +49,7 @@
             [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
             <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
             <%= format_time(course_journal_message.created_on) %>
         <% end %>
     <% end %>
@@ -66,7 +66,7 @@
     <% end %>
 
     <% unless @attachments.first.nil? %>
-        <%= l(:label_course_attendingcontestwork_download) %>
+        <%= l(:label_course_mail_files) %>
         <% @attachments.each do |attachment|%>
             ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
             <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
@@ -101,11 +101,11 @@
         <% @issues_journals.each do |issues_journal| %>
             ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
             <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
-            <%= l(:label_project_issue) %>
+            <%= l(:label_project_issue_update) %>
             <% if issues_journal.notes.nil? %>
                 <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
             <% else %>
-                <%= link_to truncate(issues_journal.notes,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
             <% end %>
             <%= format_time(issues_journal.created_on) %>
         <% end %>
@@ -148,7 +148,7 @@
             ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
             <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
             <%= l(:label_project_mail_notice) %>
-            <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
             <%= format_time(project_new.created_on) %>
         <% end %>
     <% end %>
@@ -161,7 +161,7 @@
                 <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
             <% end %>]
             <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
-            <%= l(:label_project_mail_notice) %>
+            <%= l(:lable_project_mail_notice_reply) %>
             <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
             <%= format_time(project_news_comment.created_on) %>
         <% end %>
@@ -204,7 +204,7 @@
     <% @user_journal_messages.each do |user_journal_message|%>
         ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
         <%= l(:label_show_your_message) %>
-        <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
         <%= format_time(user_journal_message.created_on) %>
     <% end %>
 <% end %>
@@ -216,7 +216,7 @@
         <% @forums.each do |forum|%>
             ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
             <%= l(:label_forum_new) %>
-            <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
             <%= format_time(forum.created_at) %>
         <% end %>
         <!-- 新建贴吧 end-->
@@ -226,7 +226,7 @@
         <% @memos.each do |memo|%>
             ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
             <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
-            <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
+            <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
             <%= format_time(memo.created_at) %>
         <% end %>
      <!-- 新建贴吧 end-->

app/views/projects/join_project.js.erb

@@ -1,5 +1,5 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/join_project') %>');
-showModal('ajax-modal', '510px');
+showModal('ajax-modal', '540px');
 $('#ajax-modal').css('height','260px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +

app/views/student_work/_new_student_work_alert.html.erb

@@ -0,0 +1,14 @@
+<div id="popbox02">
+  <div class="ni_con_work">
+    <p>
+      当前作业
+      <span class="c_pink">已开启匿评</span>
+      您提交作品后将
+      <span class="c_pink">不会收到任何匿评作品</span>,
+      您的作品也
+      <span class="c_pink">不会被其他用户匿评</span>.
+      如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分
+    </p>
+    <a href="javascript:void(0)" class="tijiao" style="margin-left:200px;" onclick="clickCanel()">确定</a>
+  </div>
+</div>

app/views/student_work/_praise_alert.html.erb

@@ -0,0 +1,9 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <h2><img src="/images/bid/pic_top.jpg" width="188" height="37" alt="匿名评价" /></h2>
+    <p>&nbsp;&nbsp;&nbsp;&nbsp;据说雷锋做完好事是从来不留名的呢，我们这次评分也不留名！！！但是，但是，您给的分数一定要公正哦，老天爷看不到，我们的系统可是清楚得很！</p>
+    <p style="margin-bottom:15px;">&nbsp;&nbsp;&nbsp;&nbsp;别怪我没告诉你，系统分配给你的作品不评价可是要扣分的哈！</p>
+    <a href="javascript:" class="tijiao" style="margin-left:100px;" onclick="clickCanel()">匿名评分</a>
+    <a href="javascript:" style="color:#15bccf; margin-top:20px; display:block;" onclick="clickCanel()">冒着扣分的危险残忍拒绝</a>
+  </div>
+</div>

app/views/student_work/index.html.erb

@@ -1,3 +1,17 @@
+<script type="text/javascript">
+  <% if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher && @stundet_works.count > 1%>
+      $(function(){
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/praise_alert') %>');
+          showModal('ajax-modal', '500px');
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+          $('#ajax-modal').parent().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("anonymos");
+      });
+  <% end%>
+</script>
+
 <div class="project_r_h">
   <div id="menu_r">
     <ul class="menu_r">
@@ -41,11 +55,20 @@
       <% if @is_teacher%>
           <div class="fr">
             <% if @homework.student_works.empty?%>
-                <%= link_to "附件", "javascript:void(0)", class: "down_btn fr", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
+                <%= link_to "附件", "javascript:void(0)", class: "down_btn fr zip_download_alert", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
             <% else%>
                 <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
-                            remote: true, class: "down_btn fr", :id => "download_homework_attachments" %>
+                            remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %>
             <% end%>
+            <div class="info_ni">
+              使用
+              <span class="c_red">winzip</span>
+              工具进行解压可能会导致
+              <span class="c_red">下载文件乱码</span>
+              ，建议您使用
+              <span class="c_red">winrar</span>
+              工具进行解压
+            </div>
 
             <%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%>
             <span class="mt3 fr " style="color:#136b3b;">导出全部：</span>

app/views/student_work/new.html.erb

@@ -1,3 +1,17 @@
+<script type="text/javascript">
+  <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
+    $(function(){
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
+        showModal('ajax-modal', '360px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("anonymos_work");
+//        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
+    });
+  <% end%>
+</script>
 <div class="project_r_h">
   <h2 class="project_h2">创建作品</h2>
 </div>

app/views/users/show.html.erb

@@ -53,7 +53,7 @@
                       <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
                     </td>
                     <td>
-                    <table width="580" border="0" class="info-break">
+                    <table border="0" class="info-break" style="width:580px;">
                     <% case e.act_type %>
                     <% when 'JournalsForMessage' %>
                         <tr>
@@ -97,7 +97,7 @@
                           </td>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act.notes %>
                             </p>
@@ -144,7 +144,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p></td>
@@ -204,7 +204,7 @@
                           <% else %>
                               <% desStr= textAreailizable(act, :notes) %>
                           <% end %>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= desStr %>
                             </p>
@@ -259,7 +259,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :long_comments %>
                             </p>
@@ -320,7 +320,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable(act, :content) %>
                             </p>
@@ -361,7 +361,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description"></p>
                           </td>
                         </tr>
@@ -404,7 +404,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p>
@@ -446,7 +446,7 @@
                               </td>
                             </tr>
                             <tr>
-                              <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
+                              <td colspan="2" class="upload_img" style="max-width:580px;">
                                 <%= textAreailizable act, :description %>
                               </td>
                             </tr>
@@ -482,7 +482,7 @@
                             </td>
                             </tr>
                             <tr>
-                              <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
+                              <td colspan="2" class="upload_img" style="max-width:580px;">
                                 <%= textAreailizable act, :description %>
                               </td>
                             </tr>
@@ -535,7 +535,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p>
@@ -609,7 +609,7 @@
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="2" width="580" class="upload_img">
+                        <td colspan="2" class="upload_img" style="max-width:580px;">
                           <p class="font_description">
                             <%= textAreailizable e.notes %>
                           </p>

app/views/welcome/_course_list.html.erb

@@ -1,7 +1,7 @@
 <% course_list.map do |course| %>
     <li class='<%= cycle("odd", "even") %>' title="<%= course.description.to_s.gsub(/<\/?.*?>/,'') %>"  style="min-height: 69px;">
       <div class='avatar'>
-        <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
+        <%= image_tag(url_to_avatar(course), :class => "avatar-4") %>
       </div>
       <!-- 上左下右 -->
       <div class='desc_item'>
@@ -27,7 +27,7 @@
         (<%= course.members.count %>人)
         <% files_count = visable_attachemnts_incourse(course).count %>
         <% if files_count > 0%>
-            (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料)
+            (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>资料)
         <% end %>
       </div>
     </li>

app/views/words/_journal_reply_items.html.erb

@@ -24,6 +24,7 @@
         <p>
           <%= reply.notes.html_safe %>
         </p>
+        <div class="cl"></div>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
             </span>

config/locales/en.yml

@@ -961,6 +961,8 @@ en:
   label_overview: "Overview"
   label_project_tool: "Tool"
   label_project_issues: "Issues"
+  label_project_issue: "Created the Issue:"
+  label_project_issue_update: "Upadated the Issue:"
   label_project_newother: "See other comments"
   label_project_newshare: "has shared"
   label_project_newadd: "added"
@@ -1469,6 +1471,7 @@ en:
   label_borad_course: Course-borad
 
   label_project_notice: release the notice
+  label_project_notice_reply: reply the notice
 
   label_forum_new: New forum
   label_memo_new_from_forum: Release memo

config/locales/zh.yml

@@ -783,8 +783,13 @@ zh:
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
   label_project_notice: "发布了通知："
+  label_project_notice_reply: "回复了通知："
+  label_course_notice_point: "通知有了新的回复！"
+  lable_project_notice_point: "新闻有了新的回复！"
   label_project_mail_notice: "发布了新闻："
-  label_project_issue: "发布了问题:"
+  lable_project_mail_notice_reply: "回复了新闻："
+  label_project_issue: "发布了问题："
+  label_project_issue_update: "更新了问题："
   label_project_newadd: "添加了"
   label_project_unadd: "暂无项目，赶快去创建吧！"
   label_project_un: "该用户暂未参与任何项目！"
@@ -1845,6 +1850,7 @@ zh:
   label_attendingcontestwork_adaptive_system: 系统支持
   label_attendingcontestwork_download: 作品下载
   label_course_attendingcontestwork_download: 课件下载
+  label_course_mail_files: 课程资源
   label_attendingcontestwork_developers: 开发人员
   label_attendingcontestwork_average_scores: 平均评分
   label_attendingcontestwork_release_time: 发布时间

public/javascripts/course.js

@@ -671,6 +671,8 @@ function edit_student_work(id)
     {$("#edit_student_work_" + id).submit();}
 }
 
+//
+
 //滑动打分
 $.fn.peSlider = function(settings){
     //configurable options (none so far)
@@ -795,6 +797,18 @@ $(function(){
     });
 
     $("#about_project label").eq(1).remove();
+
+    //附件下载提示
+    $(".zip_download_alert").bind("mouseover",function(e){
+        //alert($(this).html());
+        $(this).next("div").show();
+        $(this).next("div").css("top",e.pageY);
+        $(this).next("div").css("left",e.pageX);
+    });
+    $(".zip_download_alert").bind("mouseout",function(e){
+        //alert($(this).html());
+        $(this).next("div").hide();
+    });
 });
 
 //匿评弹框取消按钮

public/stylesheets/courses.css

@@ -278,14 +278,11 @@ a:hover.member_btn{ background:#329cbd;}
 /* 匿名评分弹框 */
 /*.popbox02{width:480px;height:200px;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;}
-.ni_con { width:425px; margin:25px 30px;}
-.ni_con h2{ display:block; height:40px; width:188px;  margin:0 auto;}
-.ni_con p{ color:#808181;}
-.ni_con a:hover{ text-decoration:none;}
 a.xls{ margin-left:5px; color:#136b3b;}
 
 /* 开启匿评弹框 */
 .anonymos{width:480px;height:180px;position:fixed !important;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;}
+.anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .ni_con { width:425px; margin:25px 30px;}
 .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
 .ni_con p{ color:#808181; }
@@ -294,6 +291,8 @@ a.xls{ margin-left:5px; color:#136b3b;}
 a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
 a:hover.tijiao{ background:#0f99a9;}
 .c_pink{ color:#e65d5e;}
+.ni_con_work { width:300px; margin:25px 20px;}
+.ni_con_work p{ color:#808181; }
 
 /* 学生列表*/
 .st_list{ width:670px;}