diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 64706887b..02bfc9e19 100644
--- a/app/controllers/projects_controller.rb
+++ b/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]
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 2954adbcb..e604409d3 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -1,14 +1,15 @@
<% for attachment in attachments %>
-
- <% if options[:length] %>
- <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
- <% else %>
- <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
- <% end %>
-
-
+
+
+ <% if options[:length] %>
+ <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
+ <% else %>
+ <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+ <% end %>
+
+
<% if attachment.is_text? %>
<%= link_to image_tag('magnifier.png'),
:controller => 'attachments',
@@ -19,8 +20,9 @@
<%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
-
(<%= number_to_human_size attachment.filesize %>)
-
+
(
+ <%= number_to_human_size attachment.filesize %>)
+
<% 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] %>
-
-
+
+
<% end %>
<% if options[:author] %>
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 644b678b8..33bff6258 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -46,7 +46,7 @@
<% else%>
-
+
发布问卷
<% end%>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index aac2c72b4..00543557d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -158,14 +158,14 @@
<%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
-
+
+
+
+
+
+
+
+
<% when 'Journal' %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 15ab84133..d5c56fe13 100644
--- a/config/locales/zh.yml
+++ b/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: "只收取分配给我的"