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

app/views/homework_common/index.html.erb

@@ -9,7 +9,7 @@
     <span><%= @obj_count%></span>
     <%= l(:label_homework_count)%>
   </p>
-  <%= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
+  <%#= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
   <div class="cl"></div>
 </div>
 <% @homeworks.each do |homework|%>
@@ -27,7 +27,8 @@
         <% if @is_teacher%>
             <%= homework_anonymous_comment(homework)%>
             <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
-            <%= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
+            <%#= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
+            <%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %>
         <% elsif @is_student%>
             <%= student_anonymous_comment homework %>
             <%= student_new_homework homework %>

app/views/layouts/base_courses.html.erb

@@ -123,7 +123,7 @@
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
           <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+          <%#= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>

app/views/student_work/index.html.erb

@@ -124,7 +124,7 @@
         </h4>
         <% if @is_teacher%>
             <%= homework_anonymous_comment(@homework)%>
-            <%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %>
+            <%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %>
         <% else%>
             <%= student_anonymous_comment @homework %>
             <%= student_new_homework @homework %>

app/views/users/_course_homework.html.erb

@@ -19,7 +19,7 @@
         <div class="homepagePostSubmit">
           <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
         </div>
-        <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         作业描述：<%= activity.description.html_safe %>

app/views/users/_course_message.html.erb

@@ -21,7 +21,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        发帖时间：<%= format_date(activity.created_on) %>
+        发帖时间：<%= format_time(activity.created_on) %>
       </div>
 
 
@@ -100,7 +100,7 @@
                       <% else %>
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word">
                       <%= reply.content.html_safe %>

app/views/users/_course_news.html.erb

@@ -16,7 +16,7 @@
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
       </div>
       <div class="homepagePostDate">
-        发布时间：<%= format_date(activity.created_on) %>
+        发布时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
         通知描述：
@@ -72,7 +72,7 @@
                       <% else %>
                           <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(comment.created_on) %>
+                      <%= format_time(comment.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
                   </div>

app/views/users/_course_poll.html.erb

@@ -26,7 +26,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        发布时间：<%= format_date(activity.published_at) %>
+        发布时间：<%= format_time(activity.published_at) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">

app/views/users/_project_issue.html.erb

@@ -30,7 +30,7 @@
         </div>
         <div class="homepagePostDeadline">
           时间：
-          <%=format_date(activity.created_on) %>
+          <%=format_time(activity.created_on) %>
         </div>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
@@ -109,7 +109,7 @@
                       <% else %>
                           <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <% if reply.details.any? %>
                         <% details_to_strings(reply.details).each do |string| %>

app/views/users/_project_message.html.erb

@@ -24,7 +24,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        时间：<%= format_date(activity.created_on) %>
+        时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
         <% if activity.parent_id.nil? %>
@@ -86,7 +86,7 @@
                       <% else %>
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                   </div>

public/stylesheets/courses.css

@@ -139,6 +139,7 @@ a:hover.tb_all{ background:#ff5d31; color:#fff; text-decoration:none;}
 .work_tb_{ background-color: #eaeaea; height:40px; }
 a.work_edit{color: #64bdd9; display:block; padding:1px 5px; border:1px solid #64bdd9;}
 a:hover.work_edit{color: #fff; background: #64bdd9;}
+a.un_work_edit{color: white; display:block; padding:1px 5px; background-color: darkgray;border:1px solid darkgray;}
 
 /* 控制显示与隐藏css类 */
 .normaltab   { color:#64bdd9 ;  }