From db85ff2946509e1766cea62f23bc672c216489a0 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyanggfkd@gmail.com>
Date: Tue, 6 Aug 2013 10:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86member=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=97=AE=E9=A2=98=EF=BC=9B=E5=B0=86=E2=80=9C=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E2=80=9D=E5=8F=98=E4=B8=BA=E2=80=9C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E2=80=9D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb |  4 +--
 app/views/users/index.html.erb           |  6 ++---
 app/views/versions/show.html.erb         | 32 +++++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

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 @@
 											<td class="font_index"><%= @project.attachments.count %></td>
 											
 										<tr>
-											<td align="center" width="80px"><strong><%= link_to('成员 ', {:controller => 'projects', :action => 'member'}, :class => 'project_infor_tag') %></strong></td>
-											<td align="center" width="80px"><strong><%= link_to('缺陷 ',project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
+											<td align="center" width="80px"><strong><%= link_to('成员 ', project_member_path(@project), :class => 'project_infor_tag') %></strong></td>
+											<td align="center" width="80px"><strong><%= link_to('缺陷 ', project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
 											<td align="center" width="80px"><strong><%= link_to('文件 ', project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
 										</tr>
 									</table>
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 @@
 
 	<label for='name'><%= l(:label_user) %>:</label>
 	<%= 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 %><!--Modified by young-->
 </fieldset>
 <% end %>
 &nbsp;
@@ -87,8 +86,7 @@
 
 	<label for='name'><%= l(:label_user) %>:</label>
 	<%= 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 %><!--Modified by young-->
 </fieldset>
 <% end %>
 &nbsp;
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 -%>
+  <table class="list related-issues">
+  <caption>&#187;<%= l(:label_related_issues) %></caption>
+  <%- @issues.each do |issue| -%>
+    <tr class="hascontextmenu">
+      <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
+      <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
+    </tr>
+  <% end %>
+  </table>
+<% end %>
+<%= context_menu issues_context_menu_path %>
+<% end %>
+
 <div class="splitcontent">
 <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
 <fieldset class="time-tracking"><legend><%= l(:label_time_tracking) %></legend>
@@ -34,21 +51,6 @@
 <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
 </div>
 </div>
-
-<% if @issues.present? %>
-<%= form_tag({}) do -%>
-  <table class="list related-issues">
-  <caption><%= l(:label_related_issues) %></caption>
-  <%- @issues.each do |issue| -%>
-    <tr class="hascontextmenu">
-      <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
-      <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
-    </tr>
-  <% end %>
-  </table>
-<% end %>
-<%= context_menu issues_context_menu_path %>
-<% end %>
 </div>
 
 <%= call_hook :view_versions_show_bottom, :version => @version %>