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

app/controllers/projects_controller.rb

@@ -20,11 +20,12 @@
 class ProjectsController < ApplicationController
   layout :select_project_layout
 
-  menu_item :overview
+  menu_item :overview, :only => :show
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
   menu_item :homework, :only => [:homework, :new_homework]
   menu_item :feedback, :only => :feedback
+  menu_item :share, :only => :share
 
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join,
                                             :course, :enterprise_course, :course_enterprise,:view_homework_attaches]

app/views/attachments/_links.html.erb

@@ -1,14 +1,15 @@
 <div class="attachments" style="font-weight:normal;">
 <% for attachment in attachments %>
 <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-  <span title="<%= attachment.filename%>" id = "attachment_">
+  <div style="width:65%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
-    <% if options[:length] %>
+      <span title="<%= attachment.filename%>" id = "attachment_">
-      <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
+        <% if options[:length] %>
-    <% else %>
+          <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
-      <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+        <% else %>
-    <% end %>
+          <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
-
+        <% end %>
-  </span>
+      </span>
+  </div>
   <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
                 :controller => 'attachments',
@@ -19,8 +20,9 @@
   <span title="<%= attachment.description%>">
     <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
   </span>
-  <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
+  <span class="size">(
-
+    <%= number_to_human_size attachment.filesize %>)
+  </span>
   <% if options[:deletable] %>
   	<% if attachment.container_type == 'HomeworkAttach' %>
     <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id},
@@ -39,8 +41,8 @@
   	<% end %>
   <% end %>
   <% if options[:wrap] %>
-      <br/>
+    <br/>
-      &nbsp;
+    &nbsp;
   <% end %>
   <% if options[:author] %>
     <span class="author" title="<%= attachment.author%>">

app/views/poll/_poll.html.erb

@@ -46,7 +46,7 @@
           </a>
         </li>
     <% else%>
-      <li class="pollsbtn fl ml10 pollsbtn_grey">
+      <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >
         发布问卷
       </li>
     <% end%>

app/views/users/show.html.erb

@@ -158,14 +158,14 @@
                                                 <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
-                                            <div style="display: inline-block; float: right; margin-top: 0px">
+                                            <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
-                                              <span>
+                                              <!--<span>-->
-                                                <%= link_to l(:label_find_all_comments), respond_path(e.act_id) %>
+                                                <!--<%#= link_to l(:label_find_all_comments), respond_path(e.act_id) %>-->
-                                              </span>
+                                              <!--</span>-->
-                                              <a class="font_lighter">
+                                              <!--<a class="font_lighter">-->
-                                                <%= l(:label_comments_count, :count => e.act.commit) %>
+                                                <!--<%#= l(:label_comments_count, :count => e.act.commit) %>-->
-                                              </a>
+                                              <!--</a>-->
-                                            </div>
+                                            <!--</div>-->
                                           </td>
                                         </tr>
                                     <% when 'Journal' %>

config/locales/zh.yml

@@ -999,7 +999,7 @@ zh:
   label_project_course_unadd: "你还未创建课程，赶快去创建吧！"  
   label_project_cousre_studentun: "你还未加入任何课程，赶快加入吧！" 
   #end by huang
-  label_user_mail_option_selected: "收取选中项目的所有通知..."
+  label_user_mail_option_selected: "收取选中项目的所有通知"
   label_user_mail_option_none: "不收取任何通知"
   label_user_mail_option_only_my_events: "只收取我跟踪或参与的项目的通知"
   label_user_mail_option_only_assigned: "只收取分配给我的"