diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 6f0b6883c..7e05d5d6b 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -64,8 +64,8 @@
<%= @project.attachments.count %> |
- <%= link_to('成员 ', {:controller => 'projects', :action => 'member'}, :class => 'project_infor_tag') %> |
- <%= link_to('缺陷 ',project_issues_path(@project), :class => 'project_infor_tag') %> |
+ <%= link_to('成员 ', project_member_path(@project), :class => 'project_infor_tag') %> |
+ <%= link_to('缺陷 ', project_issues_path(@project), :class => 'project_infor_tag') %> |
<%= link_to('文件 ', project_files_path(@project), :class => 'project_infor_tag') %> |
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cf19ee30b..69775f698 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -20,8 +20,7 @@
<%= text_field_tag 'name', params[:name], :size => 30 %>
- <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
- <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
+ <%= submit_tag l(:label_search), :class => "small", :name => nil %>
<% end %>
@@ -87,8 +86,7 @@
<%= text_field_tag 'name', params[:name], :size => 30 %>
- <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
- <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
+ <%= submit_tag l(:label_search), :class => "small", :name => nil %>
<% end %>
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 9bf379ced..2bc1eb90d 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -12,6 +12,23 @@
<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
+
+
+<% if @issues.present? %>
+<%= form_tag({}) do -%>
+
+<% end %>
+<%= context_menu issues_context_menu_path %>
+<% end %>
+
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
-
-<% if @issues.present? %>
-<%= form_tag({}) do -%>
-
-<% end %>
-<%= context_menu issues_context_menu_path %>
-<% end %>
<%= call_hook :view_versions_show_bottom, :version => @version %>