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

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

@@ -55,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/welcome/_course_list.html.erb

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

public/javascripts/course.js

@@ -797,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();
+    });
 });
 
 //匿评弹框取消按钮