diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-08 22:38:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-08 22:38:02 +0000 |
| commit | aa030bf39ac6fd92829ad5977283d8b7331f551a (patch) | |
| tree | 4fa82373e899f480cfff7232882d3dcf97417d71 | |
| parent | a1c37e7d6cd58d97b119f27605ba92453205c7a4 (diff) | |
| download | redmine-aa030bf39ac6fd92829ad5977283d8b7331f551a.tar.gz redmine-aa030bf39ac6fd92829ad5977283d8b7331f551a.zip | |
Adds a tooltip to cells on workflow page (#12598).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@16163 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/workflows/_form.html.erb | 11 | ||||
| -rw-r--r-- | app/views/workflows/permissions.html.erb | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index 9fb2705e7..ccdee2385 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -29,12 +29,17 @@ <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :class => 'icon-only icon-checked') %> - - <%= old_status ? old_status.name : content_tag('em', l(:label_issue_new)) %> + <% if old_status %> + <% old_status_name = old_status.name %> + <%= old_status_name %> + <% else %> + <% old_status_name = l(:label_issue_new) %> + <%= content_tag('em', old_status_name) %> + <% end %> </td> <% for new_status in @statuses -%> <% checked = workflows.detect {|w| w.old_status == old_status && w.new_status == new_status} %> - <td class="<%= checked ? 'enabled' : '' %>"> + <td class="<%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> » <%= new_status.name %>"> <%= transition_tag workflows, old_status, new_status, name %> </td> <% end -%> diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 0fb4c8bb6..dadffe354 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -65,7 +65,7 @@ <%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> - <td class="<%= @permissions[status.id][field].try(:join, ' ') %>"> + <td class="<%= @permissions[status.id][field].try(:join, ' ') %>" title="<%= name %> (<%= status.name %>)"> <%= field_permission_tag(@permissions, status, field, @roles) %> <% unless status == @statuses.last %><a href="#" class="repeat-value">»</a><% end %> </td> @@ -85,7 +85,7 @@ <%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> - <td class="<%= @permissions[status.id][field.id.to_s].try(:join, ' ') %>"> + <td class="<%= @permissions[status.id][field.id.to_s].try(:join, ' ') %>" title="<%= field.name %> (<%= status.name %>)"> <%= field_permission_tag(@permissions, status, field, @roles) %> <% unless status == @statuses.last %><a href="#" class="repeat-value">»</a><% end %> </td> |