From ad90811e4016be9504ae1e0e4846843baa41e0af Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 5 Jul 2009 12:22:02 +0000 Subject: [PATCH] Administration panel breadcrumbs (#3314). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2810 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/custom_fields/edit.rhtml | 3 ++- app/views/custom_fields/new.rhtml | 3 ++- app/views/enumerations/edit.rhtml | 2 +- app/views/enumerations/new.rhtml | 2 +- app/views/issue_statuses/edit.rhtml | 2 +- app/views/issue_statuses/new.rhtml | 2 +- app/views/roles/edit.rhtml | 2 +- app/views/roles/new.rhtml | 2 +- app/views/roles/report.rhtml | 2 +- app/views/trackers/edit.rhtml | 2 +- app/views/trackers/new.rhtml | 2 +- app/views/users/add.rhtml | 2 +- app/views/users/edit.rhtml | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/views/custom_fields/edit.rhtml b/app/views/custom_fields/edit.rhtml index ef056fa41..8ca7e33ba 100644 --- a/app/views/custom_fields/edit.rhtml +++ b/app/views/custom_fields/edit.rhtml @@ -1,4 +1,5 @@ -

<%=l(:label_custom_field)%> (<%=l(@custom_field.type_name)%>)

+

<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %> + » <%=h @custom_field.name %> (<%=l(@custom_field.type_name)%>)

<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/custom_fields/new.rhtml b/app/views/custom_fields/new.rhtml index 2e8aa2750..14a35b1f5 100644 --- a/app/views/custom_fields/new.rhtml +++ b/app/views/custom_fields/new.rhtml @@ -1,4 +1,5 @@ -

<%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)

+

<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %> + » <%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)

<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/enumerations/edit.rhtml b/app/views/enumerations/edit.rhtml index 7baea028a..5a292550a 100644 --- a/app/views/enumerations/edit.rhtml +++ b/app/views/enumerations/edit.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_enumerations)%>

+

<%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> » <%=h @enumeration %>

<% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %> <%= render :partial => 'form' %> diff --git a/app/views/enumerations/new.rhtml b/app/views/enumerations/new.rhtml index 5c2ccd133..34882834a 100644 --- a/app/views/enumerations/new.rhtml +++ b/app/views/enumerations/new.rhtml @@ -1,4 +1,4 @@ -

<%= l(@enumeration.option_name) %>: <%=l(:label_enumeration_new)%>

+

<%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> » <%=l(:label_enumeration_new)%>

<% form_tag({:action => 'create'}, :class => "tabular") do %> <%= render :partial => 'form' %> diff --git a/app/views/issue_statuses/edit.rhtml b/app/views/issue_statuses/edit.rhtml index b81426a02..4120ad34b 100644 --- a/app/views/issue_statuses/edit.rhtml +++ b/app/views/issue_statuses/edit.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_issue_status)%>

+

<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> » <%=h @issue_status %>

<% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %> <%= render :partial => 'form' %> diff --git a/app/views/issue_statuses/new.rhtml b/app/views/issue_statuses/new.rhtml index ede1699b0..bc74c8dc7 100644 --- a/app/views/issue_statuses/new.rhtml +++ b/app/views/issue_statuses/new.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_issue_status_new)%>

+

<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> » <%=l(:label_issue_status_new)%>

<% form_tag({:action => 'create'}, :class => "tabular") do %> <%= render :partial => 'form' %> diff --git a/app/views/roles/edit.rhtml b/app/views/roles/edit.rhtml index e53a0f545..df3a4f320 100644 --- a/app/views/roles/edit.rhtml +++ b/app/views/roles/edit.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_role)%>: <%= @role.name %>

+

<%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%= @role.name %>

<% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/roles/new.rhtml b/app/views/roles/new.rhtml index 8f03aefac..fb3e96f8b 100644 --- a/app/views/roles/new.rhtml +++ b/app/views/roles/new.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_role_new)%>

+

<%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%=l(:label_role_new)%>

<% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/roles/report.rhtml b/app/views/roles/report.rhtml index b30730adc..e2b01994e 100644 --- a/app/views/roles/report.rhtml +++ b/app/views/roles/report.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_permissions_report)%>

+

<%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%=l(:label_permissions_report)%>

<% form_tag({:action => 'report'}, :id => 'permissions_form') do %> <%= hidden_field_tag 'permissions[0]', '', :id => nil %> diff --git a/app/views/trackers/edit.rhtml b/app/views/trackers/edit.rhtml index 038acc86e..b5d6f9dc2 100644 --- a/app/views/trackers/edit.rhtml +++ b/app/views/trackers/edit.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_tracker)%>

+

<%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> » <%=h @tracker %>

<% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/trackers/new.rhtml b/app/views/trackers/new.rhtml index 3f8384cdd..6dccf0d72 100644 --- a/app/views/trackers/new.rhtml +++ b/app/views/trackers/new.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_tracker_new)%>

+

<%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> » <%=l(:label_tracker_new)%>

<% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/users/add.rhtml b/app/views/users/add.rhtml index 636bdcbcd..56298455d 100644 --- a/app/views/users/add.rhtml +++ b/app/views/users/add.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_user_new)%>

+

<%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=l(:label_user_new)%>

<% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml index 4714bcecb..96e089c15 100644 --- a/app/views/users/edit.rhtml +++ b/app/views/users/edit.rhtml @@ -2,7 +2,7 @@ <%= change_status_link(@user) %> -

<%=l(:label_user)%>: <%=h @user.login %>

+

<%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=h @user.login %>

<% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>