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

app/views/homework_common/_homework_common_form.html.erb

@@ -33,7 +33,7 @@
     <%= calendar_for('homework_end_time')%>
     <div class="cl"></div>
   </li>
-  <li class="fl ml100">
+  <li class="fl ml100" style="display: none;">
     <label class="label02">&nbsp;发布日期：&nbsp;</label>
     <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
     <%= calendar_for('homework_publish_time')%>
@@ -78,13 +78,13 @@
   <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
   <div class="cl"></div>
   <ul class="ml10">
-    <li >
+    <li style="display: none;">
       <label class="label02">互评启动时间：&nbsp;</label>
       <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
       <%= calendar_for('evaluation_start_time')%>
       <div class="cl"></div>
     </li>
-    <li >
+    <li style="display: none;">
       <label class="label02">互评结束时间：&nbsp;</label>
       <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
       <%= calendar_for('evaluation_end_time')%>

app/views/layouts/_new_header.html.erb

@@ -18,15 +18,15 @@
         <% if User.current.logged? -%>
 
             <li id="current_user_li">
-              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, :class => "uses_name"%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, target:"_blank", :class => "uses_name"%>
               <ul id="user_sub_menu" style="right: 0px;display: none;">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
-                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name}, :class => "parent" %>
-                      <ul id="my_projects_ul">
+                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name},target:"_blank", :class => "parent" %>
+                      <ul id="my_projects_ul" >
                         <% User.current.projects.each do |project| %>
                             <li title="<%=project.name%>">
-                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
+                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                             </li>
                         <% end %>
                       </ul>
@@ -37,11 +37,11 @@
                     <% user_course = get_user_course User.current%>
                     <% unless user_course.empty? %>
                         <li  id="my_courses_li">
-                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id}, :class => "parent"  %>
+                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id},target:"_blank", :class => "parent"  %>
                           <ul id="my_courses_ul">
                             <% user_course.each do |course| %>
                                 <li title="<%=course.name%>">
-                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id} %>
+                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                 </li>
                             <% end %>
                           </ul>

app/views/student_work/_evaluation_work.html.erb

@@ -3,20 +3,21 @@
   <% is_my_work = student_work.user == User.current%>
   <li style="min-height: 1px;width: 65px;">
     <% if is_my_work%>
-        <%= link_to student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id,user_path(student_work.user),:class => "c_blue02 hwork_center"%>
+        <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+        <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
     <% else%>
-        <%= link_to "--", "javascript:void(0)",:class => "c_blue02 hwork_center"%>
+        <%= link_to "--", "javascript:void(0)",:class => "c_grey hwork_center"%>
     <% end%>
   </li>
   <li>
     <% if is_my_work%>
-        <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name"%>
+        <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name %>
     <% else%>
         <%= link_to "匿名","javascript:void(0)",:class => "c_blue02 hwork_name"%>
     <% end%>
   </li>
   <li class=" hwork_tit_e" style="width: 440px">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true%>
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
   </li>
   <% my_score = student_work_score(student_work,User.current) %>
   <li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">

app/views/student_work/_student_work.html.erb

@@ -1,13 +1,14 @@
 <!-- 作品列表，显示某一个作品的信息 -->
 <ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
   <li style="min-height: 1px;width: 65px;">
-    <%= link_to student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id,user_path(student_work.user),:class => "c_blue02 hwork_center"%>
+    <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+    <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
   </li>
   <li>
-    <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name"%>
+    <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name%>
   </li>
   <li class=" hwork_tit">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true%>
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
   </li>
   <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%>">
     <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>

public/javascripts/course.js

@@ -673,8 +673,7 @@ $.fn.peSlider = function(settings){
                     friendlyVal = input.val() + ' ' + thisUnits;
                     slider.find('a').attr({
                         'aria-valuenow': ui.value,
-                        'aria-valuetext': friendlyVal,
-                        'title': friendlyVal
+                        'aria-valuetext': friendlyVal
                     });
                 })
                 .find('a')
@@ -684,7 +683,6 @@ $.fn.peSlider = function(settings){
                     'aria-valuemax': input.attr('max'),
                     'aria-valuenow': input.val(),
                     'aria-valuetext': friendlyVal,
-                    'title': friendlyVal,
                     'aria-labelledby': thisLabel
                 });
             input

public/stylesheets/courses.css

@@ -636,8 +636,8 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .hwork_tit_e a{ width:455px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .hwork_code{ width:60px; text-align:center; margin-right:15px;}
 .hwork_code02{ width:60px; text-align:center; margin-right:10px;}
-a.hwork_center{ display:block; width:60px; text-align:center; margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.hwork_name{ display:block;width:65px; text-align:center; margin-right:10px;overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.hwork_name{ display:block;width:65px;  margin-right:10px;overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
 .show_hwork ul li{ margin-bottom:5px;}
 .show_hwork_arrow{ position:relative; top:2px; left:25px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}