diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-02-22 00:05:57 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-02-22 00:05:57 +0000 |
| commit | ca78f2c9522996624b66cddd2ac68830c5c45f23 (patch) | |
| tree | 8c20d339b18892274b9dcadbbeb737b31289c793 /app | |
| parent | 9448923f0b9f2927cf22b166373820114e272dcc (diff) | |
| download | redmine-ca78f2c9522996624b66cddd2ac68830c5c45f23.tar.gz redmine-ca78f2c9522996624b66cddd2ac68830c5c45f23.zip | |
Merged r17207 from trunk to 3.4-stable (#28079).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17208 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/members/_new_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/principal_memberships/_new_form.html.erb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f2bb2a965..fd8da95d9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1272,7 +1272,7 @@ module ApplicationHelper link_to_function '', "toggleCheckboxesBySelector('#{selector}')", :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}", - :class => 'toggle-checkboxes' + :class => 'icon icon-checked' end def progress_bar(pcts, options={}) diff --git a/app/views/members/_new_form.html.erb b/app/views/members/_new_form.html.erb index 3fe9187d1..8d5f6053b 100644 --- a/app/views/members/_new_form.html.erb +++ b/app/views/members/_new_form.html.erb @@ -7,7 +7,7 @@ </div> </fieldset> <fieldset class="box"> - <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend> + <legend><%= toggle_checkboxes_link('.roles-selection input') %> <%= l(:label_role_plural) %></legend> <div class="roles-selection"> <% User.current.managed_roles(@project).each do |role| %> <label><%= check_box_tag 'membership[role_ids][]', role.id, false, :id => nil %> <%= role %></label> diff --git a/app/views/principal_memberships/_new_form.html.erb b/app/views/principal_memberships/_new_form.html.erb index c49d84993..290e1dd60 100644 --- a/app/views/principal_memberships/_new_form.html.erb +++ b/app/views/principal_memberships/_new_form.html.erb @@ -1,5 +1,5 @@ <fieldset class="box"> - <legend><%= l(:label_project_plural) %> <%= toggle_checkboxes_link('.projects-selection input:enabled') %></legend> + <legend><%= toggle_checkboxes_link('.projects-selection input:enabled') %> <%= l(:label_project_plural) %></legend> <div class="objects-selection"> <div class="projects-selection"> <%= render_project_nested_lists(@projects) do |p| %> @@ -12,7 +12,7 @@ </fieldset> <fieldset class="box"> - <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend> + <legend><%= toggle_checkboxes_link('.roles-selection input') %><%= l(:label_role_plural) %></legend> <div class="roles-selection"> <% @roles.each do |role| %> <label> |