From 69dc22e218a444e13dc31c671b3bb49cb0b1de88 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 22 Oct 2014 16:08:47 +0800 Subject: [PATCH] =?UTF-8?q?#1247=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE--?= =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E7=89=88=E6=9C=AC=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=89=88=E6=9C=AC=EF=BC=8C=E8=BE=93=E5=85=A5=E2=80=9C?= =?UTF-8?q?wiki=E9=A1=B5=E9=9D=A2=E2=80=9D=E4=B8=BA=E9=9D=9E=E6=B1=89?= =?UTF-8?q?=E5=AD=97=E7=B1=BB=E5=9E=8B=E4=B8=94=E5=AD=97=E6=95=B0=E8=BE=83?= =?UTF-8?q?=E5=A4=9A=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/_join_private_course.html.erb | 2 +- .../projects/settings/_versions.html.erb | 82 +++++++++++++------ app/views/versions/show.html.erb | 82 ++++++++++++------- app/views/wiki/edit.html.erb | 2 +- 4 files changed, 111 insertions(+), 57 deletions(-) diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index 2d36e2ece..35e075b8c 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -43,7 +43,7 @@

快速进入课程通道

-

只要持有课程ID和密码，就课快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！

+

只要持有课程ID和密码，就可快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！

<%= form_tag({:controller => 'courses', diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 778803bf3..98d7c5563 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -1,35 +1,65 @@ <% if @project.shared_versions.any? %> - - - - - - - - +
<%= l(:label_version) %><%= l(:field_effective_date) %><%= l(:field_description) %><%= l(:field_status) %><%= l(:field_sharing) %><%= l(:label_wiki_page) %>
+ + + + + + + + -<% for version in @project.shared_versions.sort %> - - - - - - - - - -<% end; reset_cycle %> - + <% for version in @project.shared_versions.sort %> + + + + + + + + + + <% end; reset_cycle %> +
+ <%= l(:label_version) %> + + <%= l(:field_effective_date) %> + + <%= l(:field_description) %> + + <%= l(:field_status) %> + + <%= l(:field_sharing) %> + + <%= l(:label_wiki_page) %> +
<%= link_to_version version %><%= format_date(version.effective_date) %><%=h version.description %><%= l("version_status_#{version.status}") %><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> - <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> - <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %> - <%= delete_link version_path(version) %> - <% end %> -
+ <%= link_to_version version %> + + <%= format_date(version.effective_date) %> + + <%=h version.description %> + + <%= l("version_status_#{version.status}") %> + + <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', + :action => 'show', + :project_id => version.project, + :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> + + <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> + <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %> + <%= delete_link version_path(version) %> + <% end %> +
<% else %> -

<%= l(:label_no_data) %>

+

+ <%= l(:label_no_data) %> +

<% end %>
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 6517faca5..bce5bc771 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -1,48 +1,72 @@ -
+
<%= 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, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %> -<%= delete_link version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)) if User.current.allowed_to?(:manage_versions, @version.project) %> +<%= link_to_if_authorized(l(:button_edit_associated_wikipage, + :page_title => @version.wiki_page_title.truncate(30, omission: '...')), + {:controller => 'wiki', + :action => 'edit', + :project_id => @version.project, + :id => Wiki.titleize(@version.wiki_page_title)}, + :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %> +<%= delete_link version_path(@version, :back_url => url_for(:controller => 'versions', + :action => 'index', + :project_id => @version.project)) if User.current.allowed_to?(:manage_versions, @version.project) %> <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
-

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

+

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

-<%= render :partial => 'versions/overview', :locals => {:version => @version} %> -<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> + <%= render :partial => 'versions/overview', :locals => {:version => @version} %> + <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -
-<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> -
<%= l(:label_time_tracking) %> - - - - - -<% if User.current.allowed_to?(:view_time_entries, @project) %> - - - - -<% end %> -
<%= l(:field_estimated_hours) %><%= html_hours(l_hours(@version.estimated_hours)) %>
<%= l(:label_spent_time) %><%= html_hours(l_hours(@version.spent_hours)) %>
-
-<% end %> +
+ <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> +
<%= l(:label_time_tracking) %> + + + + + + <% if User.current.allowed_to?(:view_time_entries, @project) %> + + + + + <% end %> +
+ <%= l(:field_estimated_hours) %> + + <%= html_hours(l_hours(@version.estimated_hours)) %> +
+ <%= l(:label_spent_time) %> + + <%= html_hours(l_hours(@version.spent_hours)) %> +
+
+ <% end %> -
-<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %> -
+
+ <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %> +
<% if @issues.present? %> <%= form_tag({}) do -%> - + <%- @issues.each do |issue| -%> - - + + <% end %>
<%= l(:label_related_issues) %> + <%= l(:label_related_issues) %> +
<%= check_box_tag 'ids[]', issue.id, false, :id => nil %><%= link_to_issue(issue, :project => (@project != issue.project)) %> + <%= check_box_tag 'ids[]', issue.id, false, :id => nil %> + + <%= link_to_issue(issue, :project => (@project != issue.project)) %> +
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 89dcfdb7a..9d5d2e71b 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -1,7 +1,7 @@ <%= wiki_page_breadcrumb(@page) %> -

+

<%= h @page.pretty_title %>