From c376c0e38f8dba52b49f4409ef5c1b0adcc73786 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 1 Aug 2015 11:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC=20--?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/_overview.html.erb | 2 +- app/views/versions/show.html.erb | 10 +++++----- config/locales/zh.yml | 2 +- public/stylesheets/project.css | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/versions/_overview.html.erb b/app/views/versions/_overview.html.erb index 47d65c34a..8d34a20da 100644 --- a/app/views/versions/_overview.html.erb +++ b/app/views/versions/_overview.html.erb @@ -13,5 +13,5 @@ project_issues_path(version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1), :class =>"c_dblue") %>)

<% else %> -

<%= l(:label_roadmap_no_issues) %>

+
<%= l(:label_roadmap_no_issues) %>
<% end %> diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 1a7fce16d..6bfacbe86 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -4,7 +4,7 @@
<%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> -<%= link_to_if_authorized(l(:button_edit_associated_wikipage, +<%#= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title.truncate(30, omission: '...')), {:controller => 'wiki', :action => 'edit', @@ -17,7 +17,7 @@ <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
-

+

<%= h(@version.name) %>

@@ -27,11 +27,11 @@
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> -
<%= l(:label_time_tracking) %> +
<%= l(:label_time_tracking) %>
-

<%= l(:field_estimated_hours) %>:

+

<%= l(:field_estimated_hours) %>:

<%= html_hours(l_hours(@version.estimated_hours)) %> @@ -40,7 +40,7 @@ <% if User.current.allowed_to?(:view_time_entries, @project) %>
-

<%= l(:label_spent_time) %>:

+

<%= l(:label_spent_time) %>:

<%= html_hours(l_hours(@version.spent_hours)) %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1018a213a..d6242e3b5 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -690,7 +690,7 @@ zh: label_sort_lowest: 置底 label_roadmap_due_in: "截止日期到 %{value}" label_roadmap_overdue: "%{value} 延期" - label_roadmap_no_issues: 该版本没有问题 + label_roadmap_no_issues: 该版本暂时未发布缺陷! label_user_search_type: 搜索类型 label_search_by_login: 登录名 label_search_by_name: 名字 diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index cce9b7673..8d86a6873 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -775,4 +775,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} #about_newtalk{ display:none;} +/*version*/ +.time_tracter{color: #64BDD9;padding: 5px;}