diff --git a/app/views/account/_auth_providers.html.erb b/app/views/account/_auth_providers.html.erb index e1d4e342fa..0532684480 100644 --- a/app/views/account/_auth_providers.html.erb +++ b/app/views/account/_auth_providers.html.erb @@ -15,8 +15,8 @@ pclass = no_pwd ? 'no-pwd' : ''
<% unless no_pwd %>

- <%= I18n.t('account.login_with_auth_provider')%> -

+ <%= I18n.t('account.login_with_auth_provider')%> + <% end %>
<%= auth_provider_html %> diff --git a/app/views/account/_password_login_form.html.erb b/app/views/account/_password_login_form.html.erb index 0e9c6069b6..458615da38 100644 --- a/app/views/account/_password_login_form.html.erb +++ b/app/views/account/_password_login_form.html.erb @@ -43,8 +43,8 @@ See doc/COPYRIGHT.rdoc for more details. - <% unless OpenProject::Configuration.disable_password_login? %>
- <%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %> + <%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %>
<% end %> - <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb index 0b6e9d1708..9c52261122 100644 --- a/app/views/settings/_general.html.erb +++ b/app/views/settings/_general.html.erb @@ -26,63 +26,46 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_tag({:action => 'edit'}) do %> - -
-

<%= setting_text_field :app_title, :size => 30 %>

- -

- <%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit', :'ng-non-bindable' => '' %> - <%= wikitoolbar_for 'settings_welcome_text' %> -

- -

- - <%= setting_text_field :attachment_max_size, :size => 6 %> - <%= l(:"number.human.storage_units.units.kb") %> - -

- -

- <%= setting_text_field :per_page_options, :size => 20 %> - <%= l(:text_comma_separated) %>
- <%= l(:text_notice_too_many_values_are_inperformant) %> -

- -

- - <%= setting_text_field :activity_days_default, :size => 6 %> - <%= l(:label_day_plural) %> - -

- -

<%= setting_text_field :host_name, :size => 60 %> -<%= l(:label_example) %>: <%= @guessed_host %>

- -

<%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %>

- -

<%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %>

- -

<%= setting_check_box :cache_formatted_text %>

- -

<%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %>

- -

<%= setting_check_box :feeds_enabled, :size => 6 %>

- -

<%= setting_text_field :feeds_limit, :size => 6 %>

- -

- - <%= setting_text_field :file_max_size_displayed, :size => 6 %> - <%= l(:"number.human.storage_units.units.kb") %> - -

- -

<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>

- -<%= call_hook(:view_settings_general_form) %> -
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> +
+

<%= setting_text_field :app_title, :size => 30 %>

+

+ <%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit', :'ng-non-bindable' => '' %> + <%= wikitoolbar_for 'settings_welcome_text' %> +

+

+ + <%= setting_text_field :attachment_max_size, :size => 6 %> + <%= l(:"number.human.storage_units.units.kb") %> + +

+

+ <%= setting_text_field :per_page_options, :size => 20 %> + <%= l(:text_comma_separated) %>
+ <%= l(:text_notice_too_many_values_are_inperformant) %> +

+

+ + <%= setting_text_field :activity_days_default, :size => 6 %> + <%= l(:label_day_plural) %> + +

+

<%= setting_text_field :host_name, :size => 60 %> + <%= l(:label_example) %>: <%= @guessed_host %>

+

<%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %>

+

<%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %>

+

<%= setting_check_box :cache_formatted_text %>

+

<%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %>

+

<%= setting_check_box :feeds_enabled, :size => 6 %>

+

<%= setting_text_field :feeds_limit, :size => 6 %>

+

+ + <%= setting_text_field :file_max_size_displayed, :size => 6 %> + <%= l(:"number.human.storage_units.units.kb") %> + +

+

<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>

+ <%= call_hook(:view_settings_general_form) %> +
+ <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb index 6447c2aab4..8cb829aad6 100644 --- a/app/views/settings/_mail_handler.html.erb +++ b/app/views/settings/_mail_handler.html.erb @@ -26,27 +26,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_tag({:action => 'edit', :tab => 'mail_handler'}) do %> - -
-

- <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %> -
<%= l(:text_line_separated) %> -

-
- -
-

<%= setting_check_box :mail_handler_api_enabled, +

+

+ <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %> +
+ <%= l(:text_line_separated) %> +

+
+
+

<%= setting_check_box :mail_handler_api_enabled, :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%>

- -

<%= setting_text_field :mail_handler_api_key, :size => 30, +

<%= setting_text_field :mail_handler_api_key, :size => 30, :id => 'settings_mail_handler_api_key', :disabled => !Setting.mail_handler_api_enabled? %> - <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %> -

-
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> - + <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %> +

+
+ <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb index 24f74d7728..67de158532 100644 --- a/app/views/settings/_notifications.html.erb +++ b/app/views/settings/_notifications.html.erb @@ -26,58 +26,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% if @deliveries %> -<%= form_tag({:action => 'edit', :tab => 'notifications'}) do %> - -
-

<%= setting_text_field :mail_from, :size => 60 %>

- -

<%= setting_check_box :bcc_recipients %>

- -

<%= setting_check_box :plain_text_mail %>

- -

<%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %>

- -
- -
<%=l(:text_select_mail_notifications)%> -<%= hidden_field_tag 'settings[notified_events][]', '' %> -<% @notifiables.each do |notifiable| %> -<%= notification_field notifiable %> -
-<% end %> -

<%= check_all_links('notified_events') %>

-
- -
<%= l(:setting_emails_header) %> & <%= l(:setting_emails_footer) %> - <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s), :id => 'emails_decorators_switch', :onchange => "toggleEmailDecoratorFields()" %> - - <% Setting.available_languages.each do |lang| %> -
- -<%= javascript_tag do -%> - jQuery(document).ready(function () { +
<%=l(:text_select_mail_notifications)%> + <%= hidden_field_tag 'settings[notified_events][]', '' %> + <% @notifiables.each do |notifiable| %> + <%= notification_field notifiable %> +
+ <% end %> +

<%= check_all_links('notified_events') %>

+
+
<%= l(:setting_emails_header) %> & <%= l(:setting_emails_footer) %> + <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s), :id => 'emails_decorators_switch', :onchange => "toggleEmailDecoratorFields()" %> + <% Setting.available_languages.each do |lang| %> + + <% end %> +
+ <%= javascript_tag do -%> + jQuery(document).ready(function () { toggleEmailDecoratorFields(); }); -<% end -%> - -
-<%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %> -
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> -<% end %> + <% end -%> +
+ <%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %> +
+ <%= submit_tag l(:button_save), class: 'button -highlight' %> + <% end %> <% else %> -
-<%= simple_format(l(:text_email_delivery_not_configured)) %> -
+
+ <%= simple_format(l(:text_email_delivery_not_configured)) %> +
<% end %> diff --git a/app/views/settings/_projects.html.erb b/app/views/settings/_projects.html.erb index df09aaaca7..f05626b50a 100644 --- a/app/views/settings/_projects.html.erb +++ b/app/views/settings/_projects.html.erb @@ -26,21 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_tag({:action => 'edit', :tab => 'projects'}) do %> - -
-

<%= setting_check_box :default_projects_public %>

- -

<%= setting_multiselect(:default_projects_modules, +

+

<%= setting_check_box :default_projects_public %>

+

<%= setting_multiselect(:default_projects_modules, Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %>

- -

<%= setting_check_box :sequential_project_identifiers %>

- -

<%= setting_select :new_project_user_role_id, +

<%= setting_check_box :sequential_project_identifiers %>

+

<%= setting_select :new_project_user_role_id, Role.find_all_givable.collect {|r| [r.name, r.id.to_s]}, :blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %>

-
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> +
+ <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index 80fa28f4de..5627fa6c78 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -26,56 +26,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_tag({:action => 'edit', :tab => 'repositories'}) do %> - -
-

<%= setting_check_box :autofetch_changesets %>

- -

<%= setting_check_box :sys_api_enabled, +

+

<%= setting_check_box :autofetch_changesets %>

+

<%= setting_check_box :sys_api_enabled, :onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %>

- -

<%= setting_text_field :sys_api_key, :size => 30, +

<%= setting_text_field :sys_api_key, :size => 30, :id => 'settings_sys_api_key', :disabled => !Setting.sys_api_enabled?, :label => :setting_mail_handler_api_key %> - <%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %> -

- -

<%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %>

- -

<%= setting_text_field :repositories_encodings, :size => 60 %> -<%= l(:text_comma_separated) %>

- -

<%= setting_text_field :repository_log_display_limit, :size => 6 %>

- -

<%= setting_check_box :repository_authentication_caching_enabled %>

-
- -
<%= l(:text_work_packages_ref_in_commit_messages) %> -

<%= setting_text_field :commit_ref_keywords, :size => 30 %> -<%= l(:text_comma_separated) %>

- -

<%= setting_text_field :commit_fix_keywords, :size => 30 %> - -

+

<%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %>

+

<%= setting_text_field :repositories_encodings, :size => 60 %> + <%= l(:text_comma_separated) %>

+

<%= setting_text_field :repository_log_display_limit, :size => 6 %>

+

<%= setting_check_box :repository_authentication_caching_enabled %>

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

<%= setting_text_field :commit_ref_keywords, :size => 30 %> + <%= l(:text_comma_separated) %>

+

<%= setting_text_field :commit_fix_keywords, :size => 30 %> + + - + - -
<%= l(:text_comma_separated) %>

- -

<%= setting_check_box :commit_logtime_enabled, + + +
+ <%= l(:text_comma_separated) %>

+

<%= setting_check_box :commit_logtime_enabled, :onclick => "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%>

- -

<%= setting_select :commit_logtime_activity_id, +

<%= setting_select :commit_logtime_activity_id, [[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]}, :disabled => !Setting.commit_logtime_enabled?%>

-
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> + + <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb index 90d2d27728..c8598aff38 100644 --- a/app/views/settings/_users.html.erb +++ b/app/views/settings/_users.html.erb @@ -37,7 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.

<%= setting_check_box :users_deletable_by_self %>

-
-<%= submit_tag l(:button_save), class: 'button -highlight' %> + <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/_work_packages.html.erb b/app/views/settings/_work_packages.html.erb index 7d523622e9..b25c0df550 100644 --- a/app/views/settings/_work_packages.html.erb +++ b/app/views/settings/_work_packages.html.erb @@ -26,27 +26,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_tag({:action => 'edit', :tab => 'work_packages'}) do %> - -
-

<%= setting_check_box :cross_project_work_package_relations %>

- -

<%= setting_check_box :work_package_group_assignment %>

- -

<%= setting_check_box :display_subprojects_work_packages %>

- -

<%= setting_check_box :work_package_startdate_is_adddate %>

- -

<%= setting_select :work_package_done_ratio, WorkPackage::DONE_RATIO_OPTIONS.collect {|i| [l("setting_work_package_done_ratio_#{i}"), i]} %>

- -

<%= setting_text_field :work_packages_export_limit, :size => 6 %>

-
- -
<%= l(:setting_column_options) %> -<%= settings_multiselect([:work_package_list_default_columns, :work_package_list_summable_columns], +
+

<%= setting_check_box :cross_project_work_package_relations %>

+

<%= setting_check_box :work_package_group_assignment %>

+

<%= setting_check_box :display_subprojects_work_packages %>

+

<%= setting_check_box :work_package_startdate_is_adddate %>

+

<%= setting_select :work_package_done_ratio, WorkPackage::DONE_RATIO_OPTIONS.collect {|i| [l("setting_work_package_done_ratio_#{i}"), i]} %>

+

<%= setting_text_field :work_packages_export_limit, :size => 6 %>

+
+
<%= l(:setting_column_options) %> + <%= settings_multiselect([:work_package_list_default_columns, :work_package_list_summable_columns], Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label_choices => :setting_work_package_properties) %> -
- -<%= submit_tag l(:button_save), class: 'button -highlight' %> +
+ <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb index 956e5b0c03..dab839f582 100644 --- a/app/views/settings/plugin.html.erb +++ b/app/views/settings/plugin.html.erb @@ -26,14 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

<%= l(:label_settings) %>: <%=h @plugin.name %>

-
-<%= form_tag({:action => 'plugin'}) do %> -
-<%= render :partial => @partial, :locals => {:settings => @settings}%> -
-<%= submit_tag l(:button_apply), class: 'button -highlight' %> -<% end %> + <%= form_tag({:action => 'plugin'}) do %> +
+ <%= render :partial => @partial, :locals => {:settings => @settings}%> +
+ <%= submit_tag l(:button_apply), class: 'button -highlight' %> + <% end %>
diff --git a/app/views/statuses/index.html.erb b/app/views/statuses/index.html.erb index 265229d05a..4be9c7107e 100644 --- a/app/views/statuses/index.html.erb +++ b/app/views/statuses/index.html.erb @@ -31,40 +31,37 @@ See doc/COPYRIGHT.rdoc for more details. <%= link_to l(:label_work_package_status_new), new_status_path, :class => 'icon icon-add' %> <%= link_to(l(:label_update_work_package_done_ratios), update_work_package_done_ratio_statuses_path, :class => 'icon icon-reload2', :method => 'post', :confirm => l(:text_are_you_sure)) if WorkPackage.use_status_for_done_ratio? %> <% end %> - <% html_title l(:label_administration), l(:label_work_package_status_plural) -%> -

<%=l(:label_work_package_status_plural)%>

- <%= render :partial => 'layouts/action_menu_specific' %> - - - - <% if WorkPackage.use_status_for_done_ratio? %> - - <% end %> - - - - - + + + + <% if WorkPackage.use_status_for_done_ratio? %> + + <% end %> + + + + + + -<% for status in @statuses %> - "> - - <% if WorkPackage.use_status_for_done_ratio? %> - - <% end %> - - - - - -<% end %> + <% for status in @statuses %> + "> + + <% if WorkPackage.use_status_for_done_ratio? %> + + <% end %> + + + + + + <% end %>
<%= Status.model_name.human %><%= WorkPackage.human_attribute_name(:done_ratio) %><%= Status.human_attribute_name(:is_default) %><%= Status.human_attribute_name(:is_closed) %><%=l(:button_sort)%>
<%= Status.model_name.human %><%= WorkPackage.human_attribute_name(:done_ratio) %><%= Status.human_attribute_name(:is_default) %><%= Status.human_attribute_name(:is_closed) %><%=l(:button_sort)%>
<%= link_to h(status.name), edit_status_path(status) %><%= h status.default_done_ratio %><%= checked_image status.is_default? %><%= checked_image status.is_closed? %> - <%= reorder_links('status', {:action => 'update', :id => status}, :method => :put) %> - <%= delete_link status_path(status) %>
<%= link_to h(status.name), edit_status_path(status) %><%= h status.default_done_ratio %><%= checked_image status.is_default? %><%= checked_image status.is_closed? %> + <%= reorder_links('status', {:action => 'update', :id => status}, :method => :put) %> + <%= delete_link status_path(status) %>
- <%= pagination_links_full @statuses %> diff --git a/app/views/time_entries/reports/_report_criteria.html.erb b/app/views/time_entries/reports/_report_criteria.html.erb index d055266db1..678e6d17f7 100644 --- a/app/views/time_entries/reports/_report_criteria.html.erb +++ b/app/views/time_entries/reports/_report_criteria.html.erb @@ -30,18 +30,18 @@ See doc/COPYRIGHT.rdoc for more details. <% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %> <% hours_for_value = select_hours(hours, criterias[level], value) -%> <% next if hours_for_value.empty? -%> - - <%= ('' * level).html_safe %> - <%= h(format_criteria_value(criterias[level], value)) %> - <%= ('' * (criterias.length - level - 1)).html_safe -%> - <% total = 0 -%> - <% @periods.each do |period| -%> - <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%> - <%= html_hours("%.2f" % sum) if sum > 0 %> + + <%= ('' * level).html_safe %> + <%= h(format_criteria_value(criterias[level], value)) %> + <%= ('' * (criterias.length - level - 1)).html_safe -%> + <% total = 0 -%> + <% @periods.each do |period| -%> + <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%> + <%= html_hours("%.2f" % sum) if sum > 0 %> + <% end -%> + <%= html_hours("%.2f" % total) if total > 0 %> + + <% if criterias.length > level+1 -%> + <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %> <% end -%> - <%= html_hours("%.2f" % total) if total > 0 %> - - <% if criterias.length > level+1 -%> - <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %> - <% end -%> -<% end %> + <% end %> diff --git a/app/views/time_entries/reports/show.html.erb b/app/views/time_entries/reports/show.html.erb index 1e6acb28ab..ee97d53295 100644 --- a/app/views/time_entries/reports/show.html.erb +++ b/app/views/time_entries/reports/show.html.erb @@ -52,15 +52,13 @@ See doc/COPYRIGHT.rdoc for more details. [l(:label_month), 'month'], [l(:label_week), 'week'], [l(:label_day_plural).titleize, 'day']], @columns) %> - - : <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}), + : <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}), :style => 'width: 200px', :id => nil, :disabled => (@criterias.length >= 3), :id => "criterias") %> - <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %> - <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-undo' %>

+ <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %> + <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-undo' %>

<% end %> - <% unless @criterias.empty? %>

<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>

diff --git a/app/views/timelines/_custom_fields.html.erb b/app/views/timelines/_custom_fields.html.erb index babf7f1653..f6a96e48d1 100644 --- a/app/views/timelines/_custom_fields.html.erb +++ b/app/views/timelines/_custom_fields.html.erb @@ -48,7 +48,7 @@ custom_fields.each do |custom_field| { :class => "cf_boolean_select", :multiple => false, :size => 1} %> <% elsif custom_field.field_format == "list" then %> - <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]", + <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]", timeline.custom_field_list_value(custom_field.id.to_s), { :"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json, @@ -57,7 +57,7 @@ custom_fields.each do |custom_field| ) %> <% end %>

-<% + <% end end %> diff --git a/app/views/timelines/_timeline.html.erb b/app/views/timelines/_timeline.html.erb index 8a92904866..5de6c5c942 100644 --- a/app/views/timelines/_timeline.html.erb +++ b/app/views/timelines/_timeline.html.erb @@ -47,12 +47,11 @@ See doc/COPYRIGHT.rdoc for more details. <%= javascript_include_tag "autocompleter.js" %> <%= javascript_include_tag "timelines_select_boxes.js" %> <% end %> - <% unless @timeline_header_included %> <% content_for :header_tags do %> - - <%= stylesheet_link_tag 'timelines.css', :media => "all" %> - <%= + + <%= stylesheet_link_tag 'timelines.css', :media => "all" %> + <%= case I18n.locale when :de javascript_include_tag 'date-de-DE.js' @@ -60,12 +59,9 @@ See doc/COPYRIGHT.rdoc for more details. javascript_include_tag 'date-en-US.js' end %> - - <%= include_calendar_headers_tags %> - - <%= javascript_include_tag 'timelines_modal.js' %> - - <% @timeline_header_included = true %> + <%= include_calendar_headers_tags %> + <%= javascript_include_tag 'timelines_modal.js' %> + <% @timeline_header_included = true %> <% end %> <% end %> <% end %> diff --git a/app/views/timelines/filter/_projects.html.erb b/app/views/timelines/filter/_projects.html.erb index 739032e643..cf4a414eff 100644 --- a/app/views/timelines/filter/_projects.html.erb +++ b/app/views/timelines/filter/_projects.html.erb @@ -103,9 +103,8 @@ See doc/COPYRIGHT.rdoc for more details. timeline.selected_project_status, :name, :id).to_json }) %> - <% end %> + <% end %>

-

<%= label_tag 'timeline_options_project_responsibles', l("timelines.filter.project_responsible") %> diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb index f267c4f5c6..3004491afd 100644 --- a/app/views/timelog/_date_range.html.erb +++ b/app/views/timelog/_date_range.html.erb @@ -26,23 +26,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

<%= l(:label_date_range) %> -
-

-<%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %> -<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%> -<%= select_tag 'period', options_for_period_select(params[:period]), +

+

+ <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %> + <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%> + <%= select_tag 'period', options_for_period_select(params[:period]), :onfocus => '$("period_type_1").checked = true;', :disabled => @free_period %> -

-

-<%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %> -<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %> - - -<%= +

+

+ <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %> + <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %> + + <%= raw l(:label_date_from_to, :start => raw( label_tag("from", l(:description_date_from), :class => "hidden-for-sighted") + @@ -56,9 +54,9 @@ raw l(:label_date_from_to, ) ) %> - -

-
+ +

+

<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %> diff --git a/app/views/timelog/_time_entry_tab.html.erb b/app/views/timelog/_time_entry_tab.html.erb index a064b1614c..cecbe80c52 100644 --- a/app/views/timelog/_time_entry_tab.html.erb +++ b/app/views/timelog/_time_entry_tab.html.erb @@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

  • -<%= link_to(tab_path, :class => (tab_selected ? 'selected' : nil)) do %> - <%= tab_selected ? you_are_here_info : nil %> - <%= tab_title %> -<% end %> + <%= link_to(tab_path, :class => (tab_selected ? 'selected' : nil)) do %> + <%= tab_selected ? you_are_here_info : nil %> + <%= tab_title %> + <% end %>
    • diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb index bd2633870c..ddba517a08 100644 --- a/app/views/timelog/edit.html.erb +++ b/app/views/timelog/edit.html.erb @@ -26,25 +26,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= l(:label_spent_time) %>

    - <%= labelled_tabular_form_for [@time_entry.project, @time_entry], :as => :time_entry do |f| %> -<%= error_messages_for 'time_entry' %> -<%= back_url_hidden_field_tag %> - -
    -

    <%= f.text_field :work_package_id, :size => 6 %> <%= h("#{(@time_entry.work_package.kind.nil?) ? '' : @time_entry.work_package.kind.name} ##{@time_entry.work_package.id}: #{@time_entry.work_package.subject}") if @time_entry.work_package%>

    -

    <%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

    -

    <%= f.text_field :hours, :size => 6, :required => true %>

    -

    <%= f.text_field :comments, :size => 100 %>

    -

    <%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

    -<% @time_entry.custom_field_values.each do |value| %> -

    <%= custom_field_tag_with_label :time_entry, value %>

    -<% end %> -<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> -
    - -<%= submit_tag l(:button_save), class: 'button -highlight' %> - + <%= error_messages_for 'time_entry' %> + <%= back_url_hidden_field_tag %> +
    +

    <%= f.text_field :work_package_id, :size => 6 %> <%= h("#{(@time_entry.work_package.kind.nil?) ? '' : @time_entry.work_package.kind.name} ##{@time_entry.work_package.id}: #{@time_entry.work_package.subject}") if @time_entry.work_package%>

    +

    <%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

    +

    <%= f.text_field :hours, :size => 6, :required => true %>

    +

    <%= f.text_field :comments, :size => 100 %>

    +

    <%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

    + <% @time_entry.custom_field_values.each do |value| %> +

    <%= custom_field_tag_with_label :time_entry, value %>

    + <% end %> + <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> +
    + <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 4f78cf7977..12bf7550ec 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -45,13 +45,10 @@ See doc/COPYRIGHT.rdoc for more details. <%= form_tag(polymorphic_path([@issue || @project, :time_entries]), :method => :get, :id => 'query_form') do %> <%= render :partial => 'date_range' %> <% end %> - <%= render 'time_entry_tabs' %> -
    -

    <%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>

    +

    <%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>

    -
    <% unless @entries.empty? %> <%= render :partial => 'list', :locals => { :entries => @entries }%> @@ -65,9 +62,7 @@ See doc/COPYRIGHT.rdoc for more details. <% end %> <% end %>
    - <% html_title l(:label_spent_time), l(:label_details) %> - <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %> + <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %> <% end %> diff --git a/app/views/types/_form.html.erb b/app/views/types/_form.html.erb index 783986de17..22b526d665 100644 --- a/app/views/types/_form.html.erb +++ b/app/views/types/_form.html.erb @@ -26,50 +26,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= error_messages_for 'type' %> -
    -
    - -

    <%= f.text_field :name, :required => true, :disabled => @type.is_standard? %>

    -

    <%= f.check_box :is_in_roadmap %>

    -

    <%= f.select :color_id, options_for_colors(controller.type) %>

    -

    <%= f.check_box :in_aggregation %>

    -

    <%= f.check_box :is_default %>

    -

    <%= f.check_box :is_milestone %>

    - -<% if WorkPackageCustomField.all.any? %> -

    - - <% WorkPackageCustomField.all.each do |field| %> - - <% end %> -

    -<%= hidden_field_tag 'type[custom_field_ids][]', '' %> -<% end %> - -<% if controller.type.new_record? && @types.any? %> -

    -<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@types, :id, :name)) %>

    -<% end %> - -
    -<%= submit_tag l(controller.type.new_record? ? :button_create : :button_save), +
    + +

    <%= f.text_field :name, :required => true, :disabled => @type.is_standard? %>

    +

    <%= f.check_box :is_in_roadmap %>

    +

    <%= f.select :color_id, options_for_colors(controller.type) %>

    +

    <%= f.check_box :in_aggregation %>

    +

    <%= f.check_box :is_default %>

    +

    <%= f.check_box :is_milestone %>

    + <% if WorkPackageCustomField.all.any? %> +

    + + <% WorkPackageCustomField.all.each do |field| %> + + <% end %> +

    + <%= hidden_field_tag 'type[custom_field_ids][]', '' %> + <% end %> + <% if controller.type.new_record? && @types.any? %> +

    + <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@types, :id, :name)) %>

    + <% end %> + +
    + <%= submit_tag l(controller.type.new_record? ? :button_create : :button_save), class: 'button -highlight' %>
    -
    -<% if @projects.any? %> -
    <%= l(:label_project_plural) %> -<%= project_nested_ul(@projects) do |p| + <% if @projects.any? %> +
    <%= l(:label_project_plural) %> + <%= project_nested_ul(@projects) do |p| content_tag('label', check_box_tag('type[project_ids][]', p.id, controller.type.projects.include?(p), :id => nil) + ' ' + h(p)) end %> -<%= hidden_field_tag('type[project_ids][]', '', :id => nil) %> -

    <%= check_all_links 'type_project_ids' %>

    -
    -<% end %> + <%= hidden_field_tag('type[project_ids][]', '', :id => nil) %> +

    <%= check_all_links 'type_project_ids' %>

    +
    + <% end %>
    diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb index bb68a4866c..0ed7ec6c38 100644 --- a/app/views/types/index.html.erb +++ b/app/views/types/index.html.erb @@ -45,7 +45,8 @@ See doc/COPYRIGHT.rdoc for more details. <%= Type.human_attribute_name(:name) %> - + + <%= Type.human_attribute_name(:color) %> @@ -60,29 +61,28 @@ See doc/COPYRIGHT.rdoc for more details. <%=l(:button_sort)%> - + -<% for type in @types %> - "> - <%= link_to type.name, edit_type_path(type) %> - <% if type.workflows.empty? %><%= l(:text_type_no_workflow) %> (<%= link_to l(:button_edit), {:controller => '/workflows', :action => 'edit', :type_id => type} %>)<% end %> - <%= icon_for_type type %> - <%= checked_image(type.is_default) %> - <%= checked_image(type.in_aggregation) %> - <%= checked_image(type.is_milestone) %> - <%= reorder_links('type', {:action => 'move', :id => type}) %> - - <% if !type.is_standard? %> - <%= link_to type, :method => :delete, :confirm => t(:text_are_you_sure), :class => 'icon-context icon-delete' do %> - <%= t(:button_delete) %> - <%=h type.name %> - <% end %> - <% end %> - - -<% end %> + <% for type in @types %> + "> + <%= link_to type.name, edit_type_path(type) %> + <% if type.workflows.empty? %><%= l(:text_type_no_workflow) %> (<%= link_to l(:button_edit), {:controller => '/workflows', :action => 'edit', :type_id => type} %>)<% end %> + <%= icon_for_type type %> + <%= checked_image(type.is_default) %> + <%= checked_image(type.in_aggregation) %> + <%= checked_image(type.is_milestone) %> + <%= reorder_links('type', {:action => 'move', :id => type}) %> + + <% if !type.is_standard? %> + <%= link_to type, :method => :delete, :confirm => t(:text_are_you_sure), :class => 'icon-context icon-delete' do %> + <%= t(:button_delete) %> + <%=h type.name %> + <% end %> + <% end %> + + + <% end %> - <%= pagination_links_full @types %> diff --git a/app/views/user_mailer/account_information.html.erb b/app/views/user_mailer/account_information.html.erb index ac0c8f31db..58d2c15c36 100644 --- a/app/views/user_mailer/account_information.html.erb +++ b/app/views/user_mailer/account_information.html.erb @@ -26,15 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% if @user.auth_source %> -

    <%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>

    +

    <%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %>

    <% else %> -

    <%= t(:mail_body_account_information) %>:

    -
      -
    • <%= User.human_attribute_name(:login) %>: <%= @user.login %>
      • -
    • <%= User.human_attribute_name(:password) %>: <%= @password %>
      • -
    +

    <%= t(:mail_body_account_information) %>:

    +
      +
    • <%= User.human_attribute_name(:login) %>: <%= @user.login %>
      • +
    • <%= User.human_attribute_name(:password) %>: <%= @password %>
      • +
    <% end %> -

    <%= t(:label_login) %>: <%= link_to signin_url, signin_url %>

    diff --git a/app/views/user_mailer/account_information.text.erb b/app/views/user_mailer/account_information.text.erb index 0f52c83ba3..8c38640340 100644 --- a/app/views/user_mailer/account_information.text.erb +++ b/app/views/user_mailer/account_information.text.erb @@ -26,12 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% if @user.auth_source %> -<%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %> + <%= t(:mail_body_account_information_external, :value => @user.auth_source.name) %> <% else %> -<%= t(:mail_body_account_information) %>: + <%= t(:mail_body_account_information) %>: * <%= User.human_attribute_name(:login) %>: <%= @user.login %> -* <%= User.human_attribute_name(:password) %>: <%= @password %> + * <%= User.human_attribute_name(:password) %>: <%= @password %> <% end %> <%= l(:label_login) %>: <%= signin_url %> diff --git a/app/views/user_mailer/attachments_added.html.erb b/app/views/user_mailer/attachments_added.html.erb index 86d67e45c9..e1399bb5eb 100644 --- a/app/views/user_mailer/attachments_added.html.erb +++ b/app/views/user_mailer/attachments_added.html.erb @@ -30,8 +30,8 @@ See doc/COPYRIGHT.rdoc for more details.

    <%= link_to @added_to, @added_to_url %>

      - <% @attachments.each do |attachment | %> -
    • <%= attachment.filename %>
      • - <% end %> + <% @attachments.each do |attachment | %> +
    • <%= attachment.filename %>
      • + <% end %>

    diff --git a/app/views/user_mailer/attachments_added.text.erb b/app/views/user_mailer/attachments_added.text.erb index 87d8cd552b..0fa3053adf 100644 --- a/app/views/user_mailer/attachments_added.text.erb +++ b/app/views/user_mailer/attachments_added.text.erb @@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= @added_to %> <% @attachments.each do |attachment | %> -* <%= attachment.filename %> + * <%= attachment.filename %> <% end %> - <%= @added_to_url %> diff --git a/app/views/user_mailer/copy_project_succeeded.text.erb b/app/views/user_mailer/copy_project_succeeded.text.erb index 1afe6aec24..8253e069c4 100644 --- a/app/views/user_mailer/copy_project_succeeded.text.erb +++ b/app/views/user_mailer/copy_project_succeeded.text.erb @@ -26,13 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= @target_project.name %> <%= project_url(@target_project) %> - <%= t('copy_project.text.succeeded', source_project_name: @source_project.name, target_project_name: @target_project.name) %> - <% unless @errors.empty? %> ----------------------------------------- -<%= render partial: 'errors', locals: { errors: @errors } %> + ---------------------------------------- + <%= render partial: 'errors', locals: { errors: @errors } %> <% end %> diff --git a/app/views/user_mailer/password_lost.html.erb b/app/views/user_mailer/password_lost.html.erb index eb30d2bad0..d20be9b877 100644 --- a/app/views/user_mailer/password_lost.html.erb +++ b/app/views/user_mailer/password_lost.html.erb @@ -26,8 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= t(:mail_body_lost_password) %>
    -<%= link_to(@reset_password_url, @reset_password_url) %>

    - + <%= link_to(@reset_password_url, @reset_password_url) %>

    <%= User.human_attribute_name(:login) %>: <%= @token.user.login %>

    diff --git a/app/views/user_mailer/reminder_mail.html.erb b/app/views/user_mailer/reminder_mail.html.erb index 7f894e7ff1..582898ba97 100644 --- a/app/views/user_mailer/reminder_mail.html.erb +++ b/app/views/user_mailer/reminder_mail.html.erb @@ -26,13 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= t(:mail_body_reminder, :count => @issues.size, :days => @days) %>

    -
      -<% @issues.each do |issue| -%> -
    • <%= issue.project %> - <%= link_to "#{issue.type} ##{issue.id}", work_package_url(issue) %>: <%= issue.subject %>
      • -<% end -%> + <% @issues.each do |issue| -%> +
    • <%= issue.project %> - <%= link_to "#{issue.type} ##{issue.id}", work_package_url(issue) %>: <%= issue.subject %>
      • + <% end -%>
    -

    <%= link_to t(:label_work_package_view_all), @assigned_issues_url %>

    diff --git a/app/views/user_mailer/reminder_mail.text.erb b/app/views/user_mailer/reminder_mail.text.erb index 7c39cbbc22..4b15aebcfa 100644 --- a/app/views/user_mailer/reminder_mail.text.erb +++ b/app/views/user_mailer/reminder_mail.text.erb @@ -26,11 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= t(:mail_body_reminder, :count => @issues.size, :days => @days) %> - <% @issues.each do |issue| -%> -* <%= "#{issue.project} - #{issue.type} ##{issue.id}: #{issue.subject}" %> + * <%= "#{issue.project} - #{issue.type} ##{issue.id}: #{issue.subject}" %> <% end -%> - <%= @assigned_issues_url %> diff --git a/app/views/user_mailer/test_mail.html.erb b/app/views/user_mailer/test_mail.html.erb index 73a3876334..41d9f1440e 100644 --- a/app/views/user_mailer/test_mail.html.erb +++ b/app/views/user_mailer/test_mail.html.erb @@ -26,6 +26,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    This is a test email sent by OpenProject.
    -OpenProject URL: <%= link_to @welcome_url, @welcome_url %>

    + OpenProject URL: <%= link_to @welcome_url, @welcome_url %>

    diff --git a/app/views/user_mailer/user_signed_up.html.erb b/app/views/user_mailer/user_signed_up.html.erb index 76331a8109..843ba1dcb0 100644 --- a/app/views/user_mailer/user_signed_up.html.erb +++ b/app/views/user_mailer/user_signed_up.html.erb @@ -26,6 +26,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= l(:mail_body_register) %>
    -<%= link_to @activation_url, @activation_url %>

    + <%= link_to @activation_url, @activation_url %>

    diff --git a/app/views/user_mailer/work_package_updated.html.erb b/app/views/user_mailer/work_package_updated.html.erb index 4b6861bf0f..1c260f2a96 100644 --- a/app/views/user_mailer/work_package_updated.html.erb +++ b/app/views/user_mailer/work_package_updated.html.erb @@ -26,15 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= t(:text_work_package_updated, :id => "##{@issue.id}", :author => @journal.user) %> -
      -<% @journal.details.each do |detail| %> -
    • <%= @journal.render_detail(detail, :only_path => false) %>
      • -<% end %> + <% @journal.details.each do |detail| %> +
    • <%= @journal.render_detail(detail, :only_path => false) %>
      • + <% end %>
    - <%= format_text(@journal.notes, :only_path => false) %>
    <%= render :partial => 'issue_details', :locals => { :issue => @issue } %> diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb index 72f3ec57bd..c42a55f8cc 100644 --- a/app/views/users/_groups.html.erb +++ b/app/views/users/_groups.html.erb @@ -26,13 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %> -
    -<% Group.all.sort.each do |group| %> - -<% end %> -<%= hidden_field_tag 'user[group_ids][]', '' %> -
    -<%= submit_tag l(:button_save), class: 'button -highlight' %> +
    + <% Group.all.sort.each do |group| %> + + <% end %> + <%= hidden_field_tag 'user[group_ids][]', '' %> +
    + <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb index a5646dbecf..05a0666675 100644 --- a/app/views/users/_mail_notifications.html.erb +++ b/app/views/users/_mail_notifications.html.erb @@ -26,16 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    -<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %> -<%= select_tag 'user[mail_notification]', options_for_select(user_mail_notification_options(@user), @user.mail_notification), + <%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %> + <%= select_tag 'user[mail_notification]', options_for_select(user_mail_notification_options(@user), @user.mail_notification), :onchange => 'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>

    <%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %> -

    <% @user.projects.each do |project| %> -
    -<% end %>

    -

    <%= l(:text_user_mail_option) %>

    +

    <% @user.projects.each do |project| %> +
    + <% end %>

    +

    <%= l(:text_user_mail_option) %>

    <% end %>

    diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb index d9d9c4098d..1cb7c79c80 100644 --- a/app/views/users/_memberships.html.erb +++ b/app/views/users/_memberships.html.erb @@ -26,76 +26,75 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% roles = Role.find_all_givable %> <% projects = Project.active.find(:all, :order => 'lft') %> -
    -<% if @user.memberships.any? %> - - - - - - <%= call_hook(:view_users_memberships_table_header, :user => @user )%> - - - <% @user.memberships.each do |membership| %> - <% next if membership.new_record? %> - - - + <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%> + + <% end; reset_cycle %> + +
    <%= Project.model_name.human %><%= l(:label_role_plural) %>
    - <%= link_to_project membership.project %> - - <%=h membership.roles.sort.collect(&:to_s).join(', ') %> - <%= form_for(:membership, :remote => true, + <% if @user.memberships.any? %> + + + + + + + <%= call_hook(:view_users_memberships_table_header, :user => @user )%> + + + + <% @user.memberships.each do |membership| %> + <% next if membership.new_record? %> + + + - + - <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%> - - <% end; reset_cycle %> - -
    <%= Project.model_name.human %><%= l(:label_role_plural) %>
    + <%= link_to_project membership.project %> + + <%=h membership.roles.sort.collect(&:to_s).join(', ') %> + <%= form_for(:membership, :remote => true, :url => edit_membership_user_path(:id => @user, :membership_id => membership), :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %> -

    <% roles.each do |role| %> -

    <% roles.each do |role| %> +
    - <% end %>

    -

    <%= submit_tag l(:button_change), class: 'button -highlight' %> - <%= link_to_function l(:button_cancel), + <% end %>

    +

    <%= submit_tag l(:button_change), class: 'button -highlight' %> + <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;", class: 'button' %>

    - <% end %> -     		- <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> - <%= link_to(l(:button_delete), { :controller => 'users', + <% end %> + + <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> + <%= link_to(l(:button_delete), { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership }, :remote => true, :method => :post, :class => 'icon icon-delete') if membership.deletable? %> -
    -<% else %> -

    <%= l(:label_no_data) %>

    -<% end %> - - -
    -<% if projects.any? %> -
    <%=l(:label_project_new)%> -<%= form_for(:membership, :url => {:controller => 'users', +
    + <% else %> +

    <%= l(:label_no_data) %>

    + <% end %> +
    +
    + <% if projects.any? %> +
    <%=l(:label_project_new)%> + <%= form_for(:membership, :url => {:controller => 'users', :action => 'edit_membership', :id => @user, :membership_id => nil }, :remote => true, :html => {:id => "new_project_membership"}) do %> -<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %> -
    - <%= l(:label_role_plural) %>: + <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %> +
    + <%= l(:label_role_plural) %>: <%= labeled_check_box_tags 'membership[role_ids][]', roles %> -
    -

    <%= submit_tag l(:button_add), class: 'button -highlight' %>

    -<% end %> -
    -<% end %> -
    +
    +

    <%= submit_tag l(:button_add), class: 'button -highlight' %>

    + <% end %> + + <% end %> +
    diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3bf9637447..9a65182158 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -33,24 +33,20 @@ See doc/COPYRIGHT.rdoc for more details. <% end %> <%= call_hook(:user_admin_action_menu) %> <% end %> -

    <%=l(:label_user_plural)%>

    - <%= render :partial => 'layouts/action_menu_specific' %> - <%= form_tag({}, :method => :get) do %> -
    <%= l(:label_filter_plural) %> -
    -
    -
    - - <%= select_tag 'status', users_status_options_for_select(@status), :class => "form--select -small", :onchange => "this.form.submit(); return false;" %> -
    - - <% if @groups.present? %> +
    <%= l(:label_filter_plural) %> +
    +
    - - <%= collection_select :group, + + <%= select_tag 'status', users_status_options_for_select(@status), :class => "form--select -small", :onchange => "this.form.submit(); return false;" %> +
    + <% if @groups.present? %> +
    + + <%= collection_select :group, :id, @groups, :id, @@ -60,63 +56,59 @@ See doc/COPYRIGHT.rdoc for more details. { :name => "group_id", :onchange => "this.form.submit(); return false;", class: 'form--select -small' } %> +
    + <% end %> +
    + + <%= text_field_tag 'name', params[:name], :size => 30, class: 'form--text-field -small' %>
    - <% end %> - +
    - - <%= text_field_tag 'name', params[:name], :size => 30, class: 'form--text-field -small' %> + <%= submit_tag l(:button_apply), :class => 'button -highlight -small', :name => nil %> + <%= link_to l(:button_clear), users_path, :class => 'button -small icon icon-undo' %>
    - -
    - <%= submit_tag l(:button_apply), :class => 'button -highlight -small', :name => nil %> - <%= link_to l(:button_clear), users_path, :class => 'button -small icon icon-undo' %> -
    -
    -
    + <% end %>  
    - - - - <%= sort_header_tag('login', :caption => User.human_attribute_name(:login)) %> - <%= sort_header_tag('firstname', :caption => User.human_attribute_name(:firstname)) %> - <%= sort_header_tag('lastname', :caption => User.human_attribute_name(:lastname)) %> - <%= sort_header_tag('mail', :caption => User.human_attribute_name(:mail)) %> - <%= sort_header_tag('admin', :caption => User.human_attribute_name(:admin), :default_order => 'desc') %> - <%= sort_header_tag('created_on', :caption => User.human_attribute_name(:created_on), :default_order => 'desc') %> - <%= sort_header_tag('last_login_on', :caption => User.human_attribute_name(:last_login_on), :default_order => 'desc') %> - - - - - - <% for user in @users -%> - <%= %w(anon active registered locked)[user.status] %> <%= 'blocked' if user.failed_too_many_recent_login_attempts? %>"> - - - - - - - - - +
    <%= User.human_attribute_name(:status) %>
    <%= avatar(user, class: 'avatar-mini') %><%= link_to h(user.login), edit_user_path(user) %><%= h(user.firstname) %><%= h(user.lastname) %><%= checked_image user.admin? %><%= format_time(user.created_on) %><%= full_user_status(user) %> - - <%= change_user_status_links(user) unless user.id == current_user.id %> - -
    + + + <%= sort_header_tag('login', :caption => User.human_attribute_name(:login)) %> + <%= sort_header_tag('firstname', :caption => User.human_attribute_name(:firstname)) %> + <%= sort_header_tag('lastname', :caption => User.human_attribute_name(:lastname)) %> + <%= sort_header_tag('mail', :caption => User.human_attribute_name(:mail)) %> + <%= sort_header_tag('admin', :caption => User.human_attribute_name(:admin), :default_order => 'desc') %> + <%= sort_header_tag('created_on', :caption => User.human_attribute_name(:created_on), :default_order => 'desc') %> + <%= sort_header_tag('last_login_on', :caption => User.human_attribute_name(:last_login_on), :default_order => 'desc') %> + + - <% end -%> - -
    <%= User.human_attribute_name(:status) %>
    + + + <% for user in @users -%> + <%= %w(anon active registered locked)[user.status] %> <%= 'blocked' if user.failed_too_many_recent_login_attempts? %>"> + <%= avatar(user, class: 'avatar-mini') %><%= link_to h(user.login), edit_user_path(user) %> + <%= h(user.firstname) %> + <%= h(user.lastname) %> + <%= mail_to(h(user.mail)) %> + <%= checked_image user.admin? %> + <%= format_time(user.created_on) %> + + <%= format_time(user.last_login_on) unless user.last_login_on.nil? %> + + <%= full_user_status(user) %> + + + <%= change_user_status_links(user) unless user.id == current_user.id %> + + + + <% end -%> + +
    - <%= pagination_links_full @users %> - <% html_title(l(:label_user_plural)) -%> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 37bc53f7a0..cf660a3327 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -49,9 +49,9 @@ See doc/COPYRIGHT.rdoc for more details.
  • <%= User.human_attribute_name(:mail) %>: <%= mail_to(h(escape_javascript(@user.mail)), nil, :encode => 'javascript') %>
    • <% end %> <% @user.visible_custom_field_values.each do |custom_value| %> - <% if !custom_value.value.blank? %> -
  • <%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
    • - <% end %> + <% if !custom_value.value.blank? %> +
  • <%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
    • + <% end %> <% end %> <% unless @user.last_login_on.nil? %>
  • <%= User.human_attribute_name(:last_login_on) %>: <%= format_date(@user.last_login_on) %>
    • diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index 1bc02a3bd6..a8411e8c88 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -26,22 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= error_messages_for 'version' %> - <%= back_url_hidden_field_tag %> -
    -

    <%= f.text_field :name, :size => 60, :required => true %>

    -

    <%= f.text_field :description, :size => 60 %>

    -

    <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>

    -

    <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>

    -

    <%= f.text_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %>

    -

    <%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>

    -

    <%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>

    - -<% @version.custom_field_values.each do |value| %> -

    <%= custom_field_tag_with_label :version, value %>

    -<% end %> - +

    <%= f.text_field :name, :size => 60, :required => true %>

    +

    <%= f.text_field :description, :size => 60 %>

    +

    <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>

    +

    <%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>

    +

    <%= f.text_field :start_date, :size => 10 %><%= calendar_for('version_start_date') %>

    +

    <%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %>

    +

    <%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>

    + <% @version.custom_field_values.each do |value| %> +

    <%= custom_field_tag_with_label :version, value %>

    + <% end %>
    diff --git a/app/views/versions/_work_package_counts.html.erb b/app/views/versions/_work_package_counts.html.erb index 9299cc6814..d1c539ccf5 100644 --- a/app/views/versions/_work_package_counts.html.erb +++ b/app/views/versions/_work_package_counts.html.erb @@ -44,20 +44,16 @@ See doc/COPYRIGHT.rdoc for more details.

    <%= l(:label_no_data) %>

    - <% else %> - - <% counts.each do |count| %> - diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb index 7af2a3357d..b8f6c48c2a 100644 --- a/app/views/versions/edit.html.erb +++ b/app/views/versions/edit.html.erb @@ -26,12 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% html_title l("label_roadmap_edit", name: @version.name) %> -

    <%= Version.model_name.human %>

    - <%= labelled_tabular_form_for @version do |f| %> -<%= render :partial => 'form', :locals => { :f => f } %> -<%= submit_tag l(:button_save), class: 'button -highlight' %> + <%= render :partial => 'form', :locals => { :f => f } %> + <%= submit_tag l(:button_save), class: 'button -highlight' %> <% end %> diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 648c058f7f..6421ead6db 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -26,59 +26,53 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%=l(:label_roadmap)%>

    - <% if @versions.empty? %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

    <% else %> -
    -<% @versions.each do |version| %> -

    - <%= link_to_version 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 %> - - <% if (issues = @issues_by_version[version]) && issues.size > 0 %> - <%= l(:label_related_work_packages) %> - <%= form_tag({}) do -%> -
    - <%= link_to h(count[:group]), + <%= link_to h(count[:group]), project_version_property_path(version, "#{criteria}_id", count[:group].id) %> - <%= progress_bar((count[:closed].to_f / count[:total])*100, + <%= progress_bar((count[:closed].to_f / count[:total])*100, :legend => "#{count[:closed]}/#{count[:total]}", :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
    - <%- issues.each do |issue| -%> - - - - - <%- end -%> -
    <%= check_box_tag 'ids[]', issue.id %><%= link_to_work_package(issue, :project => (@project != issue.project)) %>
    - <% end %> +
    + <% @versions.each do |version| %> +

    + <%= link_to_version 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 %> + <% if (issues = @issues_by_version[version]) && issues.size > 0 %> + <%= l(:label_related_work_packages) %> + <%= form_tag({}) do -%> + + <%- issues.each do |issue| -%> + + + + + <%- end -%> +
    <%= check_box_tag 'ids[]', issue.id %><%= link_to_work_package(issue, :project => (@project != issue.project)) %>
    + <% end %> + <% end %> + <%= call_hook :view_projects_roadmap_version_bottom, :version => version %> <% end %> - <%= call_hook :view_projects_roadmap_version_bottom, :version => version %> +
    <% end %> - -<% end %> - <% content_for :sidebar do %> -<%= form_tag({}, :method => :get) do %> -

    <%= l(:description_filter) %>

    -<% @types.each do |type| %> -
    -<% end %> -
    - -<% if @project.descendants.active.any? %> - <%= hidden_field_tag 'with_subprojects', 0 %> -
    -<% end %> -

    <%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %>

    -<% end %> - -

    <%= l(:label_version_plural) %>

    -<% @versions.each do |version| %> -<%= link_to format_version_name(version), "##{version.name}" %>
    -<% end %> - + <%= form_tag({}, :method => :get) do %> +

    <%= l(:description_filter) %>

    + <% @types.each do |type| %> +
    + <% end %> +
    + + <% if @project.descendants.active.any? %> + <%= hidden_field_tag 'with_subprojects', 0 %> +
    + + <% end %> +

    <%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %>

    + <% end %> +

    <%= l(:label_version_plural) %>

    + <% @versions.each do |version| %> + <%= link_to format_version_name(version), "##{version.name}" %>
    + <% end %> <% end %> - <% html_title(l(:label_roadmap)) %> diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb index 7a6bed6491..9eb8b038ee 100644 --- a/app/views/versions/new.html.erb +++ b/app/views/versions/new.html.erb @@ -26,12 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% html_title l("label_version_new") %> -

    <%=l(:label_version_new)%>

    - <%= labelled_tabular_form_for [@project, @version] do |f| %> -<%= render :partial => 'versions/form', :locals => { :f => f } %> -<%= submit_tag l(:button_create), class: 'button -highlight' %> + <%= render :partial => 'versions/form', :locals => { :f => f } %> + <%= submit_tag l(:button_create), class: 'button -highlight' %> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 55c6e979d4..3c22740890 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -49,23 +49,22 @@ See doc/COPYRIGHT.rdoc for more details.

    <%=l(:label_project_latest)%>

    <% end %> <%= call_hook(:view_welcome_index_right, :projects => @projects) %> - <% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, {:controller => '/news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, + <%= auto_discovery_link_tag(:atom, {:controller => '/news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %> -<%= auto_discovery_link_tag(:atom, {:controller => '/activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, + <%= auto_discovery_link_tag(:atom, {:controller => '/activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, :title => "#{Setting.app_title}: #{l(:label_activity)}") %> <% end %> diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb index aed9469070..162bd767a9 100644 --- a/app/views/welcome/robots.text.erb +++ b/app/views/welcome/robots.text.erb @@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - User-agent: * <% @projects.each do |p| -%> -Disallow: /projects/<%= p.to_param %>/repository + Disallow: /projects/<%= p.to_param %>/repository Disallow: /projects/<%= p.to_param %>/issues Disallow: /projects/<%= p.to_param %>/activity <% end -%> diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb index 0dffd7f14d..f7b48fff2c 100644 --- a/app/views/wiki/annotate.html.erb +++ b/app/views/wiki/annotate.html.erb @@ -34,29 +34,26 @@ See doc/COPYRIGHT.rdoc for more details. :accesskey => accesskey(:edit)) %> <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %> <% end %> -

    <%= h(@page.pretty_title) %>

    - <%= render :partial => 'layouts/action_menu_specific' %> -

    -<%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %> -(<%= h(@annotate.content.journable.author ? @annotate.content.journable.author.name : l(:label_user_anonymous)) %>, <%= format_time(@annotate.content.journable.updated_on) %>) + <%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %> + (<%= h(@annotate.content.journable.author ? @annotate.content.journable.author.name : l(:label_user_anonymous)) %>, <%= format_time(@annotate.content.journable.updated_on) %>)

    - <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %> - - -<% line_num = 1 %> -<% @annotate.lines.each do |line| -%> - - - - - - -<% line_num += 1 %> -<% end -%> - + + <% line_num = 1 %> + <% @annotate.lines.each do |line| -%> + + + + + + + <% line_num += 1 %> + <% end -%> +
    <%= line_num %><%= link_to line[0], :controller => '/wiki', :action => 'show', :project_id => @project, :id => @page, :version => line[0] %><%= h(line[1]) %>
    <%=h line[2] %>
    <%= line_num %><%= link_to line[0], :controller => '/wiki', :action => 'show', :project_id => @project, :id => @page, :version => line[0] %><%= h(line[1]) %> + 
    <%=h line[2] %>
    +
    diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb index b894181502..a5f249ad18 100644 --- a/app/views/wiki/date_index.html.erb +++ b/app/views/wiki/date_index.html.erb @@ -30,35 +30,28 @@ See doc/COPYRIGHT.rdoc for more details. <% content_for :action_menu_specific do %> <%= watcher_link(@wiki, User.current) %> <% end %> -

    <%= l(:label_index_by_date) %>

    - <%= render :partial => 'layouts/action_menu_specific' %> - <% if @pages.empty? %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

    <% end %> - <% @pages_by_date.keys.sort.reverse.each do |date| %> -

    <%= format_date(date) %>

    - +

    <%= format_date(date) %>

    + <% end %> - <% content_for :sidebar do %> <%= render :partial => 'sidebar' %> <% end %> - <% unless @pages.empty? %> -<%= other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %> - <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %> + <%= other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %> + <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %> + <% end %> <% end %> -<% end %> - <% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %> + <%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %> <% end %> diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb index 7df186d922..401f09baab 100644 --- a/app/views/wiki/destroy.html.erb +++ b/app/views/wiki/destroy.html.erb @@ -26,26 +26,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%=h @page.pretty_title %>

    - <%= form_tag({}, :method => :delete) do %> -
    -

    <%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %>

    -


    - -<% if @reassignable_to.any? %> -
    -: -<%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %> -<%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to), +

    +

    <%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %>

    +


    + + <% if @reassignable_to.any? %> +
    + : + <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %> + <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to), :onclick => "$('todo_reassign').checked = true;" %> -<% end %> -

    -
    - -<%= submit_tag l(:button_apply), class: 'button -highlight' %> -<%= link_to l(:button_cancel), + <% end %> +

    +
    + <%= submit_tag l(:button_apply), class: 'button -highlight' %> + <%= link_to l(:button_cancel), { controller: '/wiki', action: 'show', project_id: @project, id: @page }, class: 'button' %> <% end %> diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb index 78d6c446f6..bd4fbe5904 100644 --- a/app/views/wiki/diff.html.erb +++ b/app/views/wiki/diff.html.erb @@ -30,19 +30,15 @@ See doc/COPYRIGHT.rdoc for more details. <% content_for :action_menu_specific do %> <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %> <% end %> -

    <%= h(@page.pretty_title) %>

    - <%= render :partial => 'layouts/action_menu_specific' %> -

    -<%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %> -(<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_from.created_at) %>) -→ -<%= Version.model_name.human %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %> -(<%= @diff.content_to.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.created_at) %>) + <%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %> + (<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_from.created_at) %>) + → + <%= Version.model_name.human %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %> + (<%= @diff.content_to.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.created_at) %>)

    -
    <%= nl2br @html_diff %>
    diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 38513131a1..8b0cf6e340 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -26,29 +26,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%=h @page.pretty_title %>

    - <%= form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %> -<%= f.hidden_field :lock_version %> -<%= error_messages_for 'content' %> - -

    - <%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit), + <%= f.hidden_field :lock_version %> + <%= error_messages_for 'content' %> +

    + <%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit), :value => format_text(@content, :text, :attachments => @content.page.attachments, :edit => true), :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json), :'ng-non-bindable' => '' %> -

    -


    <%= f.text_field :comments, :size => 120 %>

    -


    <%= render :partial => 'attachments/form' %>

    -

    <%= submit_tag l(:button_save), class: 'button -highlight' %> - <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form', class: 'button' %> -

    -<%= wikitoolbar_for 'content_text' %> +

    +


    + <%= f.text_field :comments, :size => 120 %>

    +


    + <%= render :partial => 'attachments/form' %>

    +

    <%= submit_tag l(:button_save), class: 'button -highlight' %> + <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form', class: 'button' %> +

    + <%= wikitoolbar_for 'content_text' %> <% end %> -
    - <% content_for :header_tags do %> <%= robot_exclusion_tag %> <% end %> diff --git a/app/views/wiki/export.html.erb b/app/views/wiki/export.html.erb index e896097419..4de9d9d63a 100644 --- a/app/views/wiki/export.html.erb +++ b/app/views/wiki/export.html.erb @@ -26,26 +26,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - - -<%=h @page.pretty_title %> - -" /> - - - -<%= format_text @content, :text, :wiki_links => :local, :only_path => false %> - + + <%=h @page.pretty_title %> + + " /> + + + + <%= format_text @content, :text, :wiki_links => :local, :only_path => false %> + diff --git a/app/views/wiki/export_multiple.html.erb b/app/views/wiki/export_multiple.html.erb index c762c702d1..5e4e0dc0ed 100644 --- a/app/views/wiki/export_multiple.html.erb +++ b/app/views/wiki/export_multiple.html.erb @@ -26,38 +26,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - - -<%=h @wiki.project.name %> - - - - - -<%= l(:label_index_by_title) %> - - -<% @pages.each do |page| %> -
    - -<%= format_text page.content ,:text, :wiki_links => :anchor %> -<% end %> - - - + + <%=h @wiki.project.name %> + + + + + <%= l(:label_index_by_title) %> + + <% @pages.each do |page| %> +
    + + <%= format_text page.content ,:text, :wiki_links => :anchor %> + <% end %> + + diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb index d9c86548f3..05814b3b79 100644 --- a/app/views/wiki/history.html.erb +++ b/app/views/wiki/history.html.erb @@ -26,51 +26,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= h(@page.pretty_title) %>

    -

    <%= l(:label_history) %>

    - <%= form_tag({:action => "diff"}, :method => :get) do %> - - - - - - - - - - - -<% show_diff = @versions.size > 1 %> -<% line_num = 1 %> -<% @versions.each do |ver| %> -"> - - - +
    #<%= Journal.human_attribute_name(:updated_on) %><%= Journal.human_attribute_name(:author) %><%= Journal.human_attribute_name(:comments) %>
    <%= link_to h(ver.version), :action => 'show', :id => @page, :project_id => @page.project, :version => ver.version %> - <% if show_diff && (line_num < @versions.size) %> - - <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") %> - <% end %> - - <% if show_diff && (line_num > 1) %> - - <%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") %> + + + + + + + + + + + + + + <% show_diff = @versions.size > 1 %> + <% line_num = 1 %> + <% @versions.each do |ver| %> + "> + + + + + + + + + <% line_num += 1 %> <% end %> - - - - - - -<% line_num += 1 %> -<% end %> - -
    #<%= Journal.human_attribute_name(:updated_on) %><%= Journal.human_attribute_name(:author) %><%= Journal.human_attribute_name(:comments) %>
    <%= link_to h(ver.version), :action => 'show', :id => @page, :project_id => @page.project, :version => ver.version %> + <% if show_diff && (line_num < @versions.size) %> + + <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") %> + <% end %> + + <% if show_diff && (line_num > 1) %> + + <%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") %> + <% end %> + <%= format_time(ver.created_at) %><%= link_to_user ver.user %><%=h ver.notes %><%= link_to l(:button_annotate), :action => 'annotate', :id => @page, :version => ver.version %>
    <%= format_time(ver.created_at) %><%= link_to_user ver.user %><%=h ver.notes %><%= link_to l(:button_annotate), :action => 'annotate', :id => @page, :version => ver.version %>
    -<%= submit_tag l(:label_view_diff), :class => 'button -highlight -small' if show_diff %> - -<%= pagination_links_full @versions %> - +
    + <%= submit_tag l(:label_view_diff), :class => 'button -highlight -small' if show_diff %> + <%= pagination_links_full @versions %> <% end %> diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb index 4d2bfcc2b3..cde25822c3 100644 --- a/app/views/wiki/index.html.erb +++ b/app/views/wiki/index.html.erb @@ -36,30 +36,22 @@ See doc/COPYRIGHT.rdoc for more details. <% content_for :action_menu_specific do %> <%= watcher_link(@wiki, User.current) %> <% end %> - <% html_title l(:label_wiki_toc) %> -

    <%= l(:label_index_by_title) %>

    - <%= render :partial => 'layouts/action_menu_specific' %> - <% if @pages.empty? %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

    <% end %> - <%= render_page_hierarchy(@pages_by_parent_id, nil, :timestamp => true) %> - <% content_for :sidebar do %> <%= render :partial => 'sidebar' %> <% end %> - <% unless @pages.empty? %> -<%= other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %> - <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %> + <%= other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:controller => '/activities', :action => 'index', :show_wiki_edits => 1, :key => User.current.rss_key} %> + <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %> + <% end %> <% end %> -<% end %> - <% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %> + <%= auto_discovery_link_tag(:atom, :controller => '/activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %> <% end %> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 69c353f69d..ae5f64ced2 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -56,13 +56,10 @@ See doc/COPYRIGHT.rdoc for more details. <% end %> <%= li_unless_nil(link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon-context icon-wiki')) %> <%= li_unless_nil(link_to_if_authorized(l(:button_manage_menu_entry), {:controller => '/wiki_menu_items', :action => 'edit', :project_id => @project.identifier, :id => @page}, :class => 'icon-context icon-settings')) %> - <% end %> - <% breadcrumb_paths(*(@page.ancestors.reverse.collect {|parent| link_to h(parent.breadcrumb_title), {:id => parent, :project_id => parent.project}} + [h(@page.breadcrumb_title)])) %> - <% if @content.version != @page.content.version %> -

    +

    <%= link_to(l(:label_previous), { :action => 'show', :id => @page, :project_id => @page.project, :version => (@content.version - 1) }, :class => 'navigate-left') + " - " if @content.version > 1 %> <%= "#{Version.model_name.human} #{@content.version}/#{@page.content.version}" %> <%= '(' + link_to(l(:label_diff), :controller => '/wiki', :action => 'diff', :id => @page, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> - @@ -71,30 +68,26 @@ See doc/COPYRIGHT.rdoc for more details.
    <%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous) %>, <%= format_time(@content.updated_on) %>
    <%=h @content.comments %> -

    -
    +

    +
    <% end %> - <%= render(:partial => "wiki/content", :locals => {:content => @content}) %> - <%= link_to_attachments @page %> - <% if @editable && authorize_for('wiki', 'add_attachment') %> -
    -

    <%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;", +

    +

    <%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;", :id => 'attach_files_link' %>

    -<%= form_tag({ :controller => '/wiki', :action => 'add_attachment', :project_id => @project, :id => @page }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> -
    -

    <%= render :partial => 'attachments/form' %>

    -
    -<%= submit_tag l(:button_add), class: 'button -highlight' %> -<%= link_to l(:button_cancel), {}, + <%= form_tag({ :controller => '/wiki', :action => 'add_attachment', :project_id => @project, :id => @page }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %> +
    +

    <%= render :partial => 'attachments/form' %>

    +
    + <%= submit_tag l(:button_add), class: 'button -highlight' %> + <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;", class: 'button' %> + <% end %> +
    <% end %> -
    -<% end %> - <%= other_formats_links do |f| %> <%= f.link_to 'Atom', :url => { :controller => '/activities', :action => 'index', diff --git a/app/views/wikis/destroy.html.erb b/app/views/wikis/destroy.html.erb index 49e090d128..99b9434975 100644 --- a/app/views/wikis/destroy.html.erb +++ b/app/views/wikis/destroy.html.erb @@ -26,14 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%=l(:label_confirmation)%>

    -
    -

    <%= h(@project.name) %>
    <%=l(:text_wiki_destroy_confirmation)%>

    - -<%= form_tag({:controller => '/wikis', :action => 'destroy', :id => @project}) do %> -<%= hidden_field_tag "confirm", 1 %> -<%= submit_tag l(:button_delete), class: 'button -highlight' %> -<% end %> -
    +

    <%= h(@project.name) %>
    + <%=l(:text_wiki_destroy_confirmation)%>

    + <%= form_tag({:controller => '/wikis', :action => 'destroy', :id => @project}) do %> + <%= hidden_field_tag "confirm", 1 %> + <%= submit_tag l(:button_delete), class: 'button -highlight' %> + <% end %> + diff --git a/app/views/work_packages/_changesets.html.erb b/app/views/work_packages/_changesets.html.erb index aa4c4bb787..720f4eb095 100644 --- a/app/views/work_packages/_changesets.html.erb +++ b/app/views/work_packages/_changesets.html.erb @@ -26,14 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% changesets.each do |changeset| %> -
    +

    <%= link_to_revision(changeset, changeset.project, :text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
    - <%= authoring(changeset.committed_on, changeset.author) %>

    + <%= authoring(changeset.committed_on, changeset.author) %>

    - <%= format_text(changeset, :comments) %> -
    + <%= format_text(changeset, :comments) %>
    +
    <% end %> diff --git a/app/views/work_packages/_list_simple.html.erb b/app/views/work_packages/_list_simple.html.erb index 3518edd712..618f438c51 100644 --- a/app/views/work_packages/_list_simple.html.erb +++ b/app/views/work_packages/_list_simple.html.erb @@ -26,33 +26,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% if work_packages && work_packages.any? %> -<%= form_tag({}) do %> - - - - - - - - - <% for work_package in work_packages %> - - - - - + <% end %> + +
    #<%= WorkPackage.human_attribute_name(:project)%><%= WorkPackage.human_attribute_name(:type)%><%= WorkPackage.human_attribute_name(:subject)%>
    - <%= check_box_tag("ids[]", work_package.id, false, :style => 'display:none;') %> - <%= link_to_work_package(work_package, :id_only => true) %> - <%= link_to_project(work_package.project) %><%=h work_package.type %> - <%= link_to_work_package(work_package, :subject_only => true) %> (<%=h work_package.status %>) + <%= form_tag({}) do %> + + + + + + + + + + + <% for work_package in work_packages %> + + + + + - - <% end %> - -
    #<%= WorkPackage.human_attribute_name(:project)%><%= WorkPackage.human_attribute_name(:type)%><%= WorkPackage.human_attribute_name(:subject)%>
    + <%= check_box_tag("ids[]", work_package.id, false, :style => 'display:none;') %> + <%= link_to_work_package(work_package, :id_only => true) %> + <%= link_to_project(work_package.project) %><%=h work_package.type %> + <%= link_to_work_package(work_package, :subject_only => true) %> (<%=h work_package.status %>)
    -<% end %> +
    + <% end %> <% else %>

    <%= l(:label_no_data) %>

    <% end %> diff --git a/app/views/work_packages/_two_column_attributes.html.erb b/app/views/work_packages/_two_column_attributes.html.erb index c96e8374c0..161c8a0df5 100644 --- a/app/views/work_packages/_two_column_attributes.html.erb +++ b/app/views/work_packages/_two_column_attributes.html.erb @@ -27,20 +27,15 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> <% left_attributes, right_attributes = attributes.in_groups(2, false) %> -
    - <% left_attributes.each do |attribute| %> - + <% left_attributes.each do |attribute| %>
    <%= attribute.field %>
    - <% end %>
    -
    - <% right_attributes.each do |attribute| %> - + <% right_attributes.each do |attribute| %>
    <%= attribute.field %>
    diff --git a/app/views/work_packages/auto_completes/index.html.erb b/app/views/work_packages/auto_completes/index.html.erb index 626feb65d7..cba812e34b 100644 --- a/app/views/work_packages/auto_completes/index.html.erb +++ b/app/views/work_packages/auto_completes/index.html.erb @@ -26,13 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -
      -<% if @work_packages.any? -%> - <% @work_packages.each do |work_package| -%> - <%= content_tag 'li', h(work_package.to_s), id: work_package.id %> + <% if @work_packages.any? -%> + <% @work_packages.each do |work_package| -%> + <%= content_tag 'li', h(work_package.to_s), id: work_package.id %> + <% end -%> + <% else -%> + <%= content_tag("li", l(:label_none), style: 'display:none') %> <% end -%> -<% else -%> - <%= content_tag("li", l(:label_none), style: 'display:none') %> -<% end -%>
    diff --git a/app/views/work_packages/bulk/edit.html.erb b/app/views/work_packages/bulk/edit.html.erb index c08ad9d283..f13c6ceab6 100644 --- a/app/views/work_packages/bulk/edit.html.erb +++ b/app/views/work_packages/bulk/edit.html.erb @@ -26,108 +26,98 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= l(:label_bulk_edit_selected_work_packages) %>

    -
      <%= @work_packages.collect {|i| content_tag('li', link_to(h("#{i.type} ##{i.id}"), work_package_path(i)) + h(": #{i.subject}")) }.join("\n").html_safe %>
    - <%= form_tag(url_for(controller: '/work_packages/bulk', action: :update, ids: @work_packages), method: :put) do %> -<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> -
    -
    -<%= l(:label_change_properties) %> - -
    -

    - - <%= select_tag('work_package[type_id]', "".html_safe + options_from_collection_for_select(@types, :id, :name)) %> -

    -<% if @available_statuses.any? %> -

    - - <%= select_tag('work_package[status_id]', "".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %> -

    -<% end %> -

    - - <%= select_tag('work_package[priority_id]', "".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %> -

    -

    - - <%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') + + <%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> +

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

    + + <%= select_tag('work_package[type_id]', "".html_safe + options_from_collection_for_select(@types, :id, :name)) %> +

    + <% if @available_statuses.any? %> +

    + + <%= select_tag('work_package[status_id]', "".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %> +

    + <% end %> +

    + + <%= select_tag('work_package[priority_id]', "".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %> +

    +

    + + <%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@assignables, :id, :name)) %> -

    -

    - - <%= select_tag('work_package[responsible_id]', content_tag('option', l(:label_no_change_option), :value => '') + +

    +

    + + <%= select_tag('work_package[responsible_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@responsibles, :id, :name)) %> -

    -<% if @project %> -

    - - <%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') + +

    + <% if @project %> +

    + + <%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + options_from_collection_for_select(@project.categories, :id, :name)) %> -

    -<% end %> -<% #TODO: allow editing versions when multiple projects %> -<% if @project %> -

    - - <%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') + +

    + <% end %> + <% #TODO: allow editing versions when multiple projects %> + <% if @project %> +

    + + <%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + version_options_for_select(@project.shared_versions.open.sort)) %> -

    -<% end %> - -<% @custom_fields.each do |custom_field| %> -

    - <%= blank_custom_field_label_tag('work_package', custom_field) %> - <%= custom_field_tag_for_bulk_edit('work_package', custom_field) %> -

    -<% end %> - -<%= call_hook(:view_work_packages_bulk_edit_details_bottom, { work_packages: @work_packages }) %> -
    - -
    -<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %> -

    - - <%= text_field_tag 'work_package[parent_id]', '', :size => 10 %> -

    -
    -<%= javascript_tag "observeParentIssueField('#{work_packages_auto_complete_path(project_id: @project.id)}')" %> -<% end %> -

    - - <%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %> -

    -

    - - <%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %> -

    -<% if WorkPackage.use_field_for_done_ratio? %> -

    - - <%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %> -

    -<% end %> -
    - -
    - -
    <%= Journal.human_attribute_name(:notes) %> -<%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %> -<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', +

    + <% end %> + <% @custom_fields.each do |custom_field| %> +

    + <%= blank_custom_field_label_tag('work_package', custom_field) %> + <%= custom_field_tag_for_bulk_edit('work_package', custom_field) %> +

    + <% end %> + <%= call_hook(:view_work_packages_bulk_edit_details_bottom, { work_packages: @work_packages }) %> +
    +
    + <% if @project && User.current.allowed_to?(:manage_subtasks, @project) %> +

    + + <%= text_field_tag 'work_package[parent_id]', '', :size => 10 %> +

    +
    + <%= javascript_tag "observeParentIssueField('#{work_packages_auto_complete_path(project_id: @project.id)}')" %> + <% end %> +

    + + <%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %> +

    +

    + + <%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %> +

    + <% if WorkPackage.use_field_for_done_ratio? %> +

    + + <%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %> +

    + <% end %> +
    +
    +
    <%= Journal.human_attribute_name(:notes) %> + <%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %> + <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %> -<%= wikitoolbar_for 'notes' %> -

    <%= send_notification_option %>

    -
    -
    - -

    <%= submit_tag l(:button_submit), class: 'button -highlight' %>

    + <%= wikitoolbar_for 'notes' %> +

    <%= send_notification_option %>

    + +
    +

    <%= submit_tag l(:button_submit), class: 'button -highlight' %>

    <% end %> diff --git a/app/views/work_packages/calendars/index.html.erb b/app/views/work_packages/calendars/index.html.erb index 2a426544bb..57b51037db 100644 --- a/app/views/work_packages/calendars/index.html.erb +++ b/app/views/work_packages/calendars/index.html.erb @@ -26,59 +26,51 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -

    <%= @query.new_record? ? l(:label_calendar) : h(@query.name) %>

    - <%= form_tag(work_packages_calendar_index_path, :method => :get, :id => 'query_form') do %> <%= hidden_field_tag('project_id', @project.to_param) if @project%> -
    "> - <%= l(:label_filter_plural) %> -
    > - <%= render :partial => 'queries/filters', :locals => {:query => @query} %> -
    -
    - -

    - <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %> -

    - -
    -
    - <%= label_tag('month', l(:label_month)) %> - <%= select_month(@month, { :prefix => "month", :discard_type => true }, class: 'form--select -small') %> -
    -
    - <%= label_tag('year', l(:label_year)) %> - <%= select_year(@year, { :prefix => "year", :discard_type => true }, class: 'form--select -small') %> -
    -
    - <%= link_to_remote l(:button_apply), +
    "> + <%= l(:label_filter_plural) %> +
    > + <%= render :partial => 'queries/filters', :locals => {:query => @query} %> +
    +
    +

    + <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %> +

    +
    +
    + <%= label_tag('month', l(:label_month)) %> + <%= select_month(@month, { :prefix => "month", :discard_type => true }, class: 'form--select -small') %> +
    +
    + <%= label_tag('year', l(:label_year)) %> + <%= select_year(@year, { :prefix => "year", :discard_type => true }, class: 'form--select -small') %> +
    +
    + <%= link_to_remote l(:button_apply), { :url => { :set_filter => 1 }, :method => :get, :update => "content", :with => "jQuery('#query_form').serialize()" }, :class => 'button -small icon icon-yes' %> - - <%= link_to_remote l(:button_clear), + <%= link_to_remote l(:button_clear), { :url => { :project_id => @project, :set_filter => 1 }, :method => :get, :update => "content", }, :class => 'button -small icon icon-undo' %> +
    -
    <% end %> - <%= error_messages_for 'query' %> <% if @query.valid? %> -<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %> - -

    - <%= l(:text_tip_work_package_begin_day) %> - <%= l(:text_tip_work_package_end_day) %> - <%= l(:text_tip_work_package_begin_end_day) %> -

    + <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %> +

    + <%= l(:text_tip_work_package_begin_day) %> + <%= l(:text_tip_work_package_end_day) %> + <%= l(:text_tip_work_package_begin_end_day) %> +

    <% end %> - <% content_for :sidebar do %> <%= render :partial => 'work_packages/sidebar' %> <% end %> diff --git a/app/views/work_packages/moves/new.html.erb b/app/views/work_packages/moves/new.html.erb index 111c5d6a53..b76d9e0b18 100644 --- a/app/views/work_packages/moves/new.html.erb +++ b/app/views/work_packages/moves/new.html.erb @@ -26,102 +26,85 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= header_tags %> -

    <%= @copy ? l(:button_copy) : l(:button_move) %>

    - - <%= form_tag({:action => 'create'}, :id => 'move_form') do %> -<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> - -
    -
    -<%= l(:label_change_properties) %> - -
    -

    -<%= select_tag "new_project_id", + <%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> +

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

    + <%= select_tag "new_project_id", project_tree_options_for_select(@allowed_projects, :selected => @target_project), :onchange => remote_function(:url => { :action => 'new' }, :method => :get, :update => 'content', :with => "Form.serialize('move_form')") %>

    - -

    - <%= select_tag("new_type_id", +

    + <%= select_tag("new_type_id", content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@types, "id", "name")) %> -

    - -

    - - <%= select_tag('status_id', +

    +

    + + <%= select_tag('status_id', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@available_statuses, :id, :name)) %> -

    - -

    - - <%= select_tag('priority_id', +

    +

    + + <%= select_tag('priority_id', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(IssuePriority.all, :id, :name)) %> -

    - -

    - - <%= select_tag('assigned_to_id', +

    +

    + + <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@target_project.possible_assignees, :id, :name)) %> -

    -

    - - <%= select_tag('responsible_id', +

    +

    + + <%= select_tag('responsible_id', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@target_project.possible_responsibles, :id, :name)) %> -

    -
    - -
    -

    - - <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %> -

    - -

    - - <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %> -

    -
    - -
    - -
    <%= Journal.human_attribute_name(:notes) %> - -<%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %> -<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', +

    +
    +
    +

    + + <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %> +

    +

    + + <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %> +

    +
    +
    +
    <%= Journal.human_attribute_name(:notes) %> + <%= label_tag 'notes', Journal.human_attribute_name(:notes), :class => 'hidden-for-sighted' %> + <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @target_project, :format => :json) %> -<%= wikitoolbar_for 'notes' %> -
    - -<%= call_hook(:view_work_packages_move_bottom, :work_packages => @work_packages, :target_project => @target_project, :copy => !!@copy) %> -
    - -<% if @copy %> - <%= hidden_field_tag("copy") %> - <%= submit_tag l(:button_copy), class: 'button -highlight' %> - <%= submit_tag l(:button_copy_and_follow), :name => 'follow', class: 'button -highlight' %> -<% else %> - <%= submit_tag l(:button_move), class: 'button -highlight' %> - <%= submit_tag l(:button_move_and_follow), :name => 'follow', class: 'button -highlight' %> -<% end %> + <%= wikitoolbar_for 'notes' %> + + <%= call_hook(:view_work_packages_move_bottom, :work_packages => @work_packages, :target_project => @target_project, :copy => !!@copy) %> +
    + <% if @copy %> + <%= hidden_field_tag("copy") %> + <%= submit_tag l(:button_copy), class: 'button -highlight' %> + <%= submit_tag l(:button_copy_and_follow), :name => 'follow', class: 'button -highlight' %> + <% else %> + <%= submit_tag l(:button_move), class: 'button -highlight' %> + <%= submit_tag l(:button_move_and_follow), :name => 'follow', class: 'button -highlight' %> + <% end %> <% end %> <% content_for :header_tags do %> <%= robot_exclusion_tag %> diff --git a/app/views/work_packages/reports/_report.html.erb b/app/views/work_packages/reports/_report.html.erb index 9fe59c800f..f3085836f1 100644 --- a/app/views/work_packages/reports/_report.html.erb +++ b/app/views/work_packages/reports/_report.html.erb @@ -31,59 +31,59 @@ See doc/COPYRIGHT.rdoc for more details.

    <%=l(:label_no_data)%>

    <% else %> <% column_names = report.statuses.map(&:name) + [l(:label_open_work_packages), l(:label_closed_work_packages), l(:label_total)] %> -<% col_width = 70 / (column_names.length+3) %> - - - - -<% column_names.each do |name| %> - -<% end %> - - - -<% for row in report.rows %> -"> - + + <% end %> + +
    <%= name %>
    - <%= link_to h(row.name), + <% col_width = 70 / (column_names.length+3) %> + + + + + <% column_names.each do |name| %> + + <% end %> + + + + <% for row in report.rows %> + "> + -<% for status in report.statuses %> - + <% for status in report.statuses %> + -<% end %> - + <% end %> + - + - + - -<% end %> - -
    <%= name %>
    + <%= link_to h(row.name), project_report_property_path((row.is_a?(Project) ? row : @project), "#{report.field}", row.id) %> - - <%= aggregate_link report.data, + + <%= aggregate_link report.data, { report.field => row.id, "status_id" => status.id }, project_report_property_status_path((row.is_a?(Project) ? row : @project), status.id, "#{report.field}", row.id) %> - - <%= aggregate_link report.data, + + <%= aggregate_link report.data, { report.field => row.id, "closed" => 0 }, project_report_property_open_path((row.is_a?(Project) ? row : @project), "#{report.field}", row.id) %> - - <%= aggregate_link report.data, + + <%= aggregate_link report.data, { report.field => row.id, "closed" => 1 }, project_report_property_closed_path((row.is_a?(Project) ? row : @project), "#{report.field}", row.id) %> - - <%= aggregate_link report.data, + + <%= aggregate_link report.data, { report.field => row.id }, project_report_property_path((row.is_a?(Project) ? row : @project), "#{report.field}", row.id) %> -
    +
    <% end reset_cycle %> diff --git a/app/views/work_packages/reports/report.html.erb b/app/views/work_packages/reports/report.html.erb index 64a8aad216..12afafe206 100644 --- a/app/views/work_packages/reports/report.html.erb +++ b/app/views/work_packages/reports/report.html.erb @@ -26,29 +26,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <% html_title l(:label_summary) %> -

    <%=l(:label_summary)%>

    -
    -<% + <% [@type_report, @priority_report, @assignee_report, @responsible_report, @author_report].each do |report| %> - <%= render :partial => 'report_category', :locals => { report: report} %> -<% end %> -<%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %> + <%= render :partial => 'report_category', :locals => { report: report} %> + <% end %> + <%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
    -
    -<% + <% additional_reports = [@version_report] additional_reports << @subproject_report if @project.children.any? additional_reports << @category_report %> - -<% additional_reports.each do |report| %> - <%= render :partial => 'report_category', :locals => { report: report } %> -
    -<% end %> -<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %> + <% additional_reports.each do |report| %> + <%= render :partial => 'report_category', :locals => { report: report } %> +
    + <% end %> + <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
    diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index ba9e70f5c0..d56d4313d5 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -26,50 +26,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - - - - + + - - - - - <% for new_status in @statuses %> - + + + + <% for new_status in @statuses %> + - <% end %> - - - - <% for old_status in @statuses %> - "> - + <% end %> + + + + <% for old_status in @statuses %> + "> + - <% for new_status in @statuses -%> - + <% for new_status in @statuses -%> + - <% end -%> - - <% end %> - + + <% end -%> + + <% end %> +
    - <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input')", +
    + <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input')", :class => 'no-decoration-on-hover', :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%=l(:label_current_status)%> - <%=l(:label_new_statuses_allowed)%>
    - <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')", + <%=l(:label_current_status)%> + + <%=l(:label_new_statuses_allowed)%>
    + <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')", :class => 'no-decoration-on-hover', :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%=h new_status.name %> -
    - <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')", + <%=h new_status.name %> +
    + <%= link_to_function(icon_wrapper('icon-context icon-yes',"#{l(:button_check_all)}/#{l(:button_uncheck_all)}"), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')", :class => 'no-decoration-on-hover', :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", :alt => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - - <%=h old_status.name %> - - <%= check_box_tag "status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id}, + <%=h old_status.name %> + + <%= check_box_tag "status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id}, :class => "old-status-#{old_status.id} new-status-#{new_status.id}" %> -
    diff --git a/app/views/workflows/copy.html.erb b/app/views/workflows/copy.html.erb index c88e728142..429dc03880 100644 --- a/app/views/workflows/copy.html.erb +++ b/app/views/workflows/copy.html.erb @@ -51,7 +51,7 @@ See doc/COPYRIGHT.rdoc for more details. "".html_safe + "".html_safe + options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %> - +

    @@ -66,7 +66,7 @@ See doc/COPYRIGHT.rdoc for more details.
    - <%= select_tag 'target_role_ids', + <%= select_tag 'target_role_ids', "".html_safe + options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>     diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb index 20b8dbc701..81cd0628b7 100644 --- a/app/views/workflows/edit.html.erb +++ b/app/views/workflows/edit.html.erb @@ -26,31 +26,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= render :partial => 'action_menu' %> -

    <%= Workflow.model_name.human %>

    - <%= render :partial => 'layouts/action_menu_specific' %> -

    <%=l(:text_workflow_edit)%>:

    - <%= form_tag({}, :method => 'get') do %> -

    -

    + - -

    -

    -<%= submit_tag l(:button_edit), :name => nil, :accesskey => accesskey(:edit), class: 'button' %> -

    + <%= hidden_field_tag 'used_statuses_only', '0' %> + +

    +

    + <%= submit_tag l(:button_edit), :name => nil, :accesskey => accesskey(:edit), class: 'button' %> +

    <% end %> - <% if @type && @role && @statuses.any? %> <%= form_tag({}, :id => 'workflow_form' ) do %> <%= hidden_field_tag 'type_id', @type.id %> @@ -69,7 +61,7 @@ See doc/COPYRIGHT.rdoc for more details.
    <%= l(:label_additional_workflow_transitions_for_assignee) %>
    - <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %> + <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
    <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %> diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb index fc2d0059f9..e80fa8dfd7 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -26,43 +26,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> - <%= render :partial => 'action_menu' %> - <% html_title l(:label_administration), l(:label_workflow_plural) -%> -

    <%= l(:label_workflow_plural) %>

    - <%= render :partial => 'layouts/action_menu_specific' %> - <% if @workflow_counts.empty? %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

    <% else %> -
    - - - - - <% @workflow_counts.first.last.each do |role, count| %> - - - <% end %> - - - -<% @workflow_counts.each do |type, roles| -%> - - - <% roles.each do |role, count| -%> - - <% end -%> - -<% end -%> - -
    - <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %> -
    <%= h type %> - <%= link_to((count > 0 ? count : image_tag('webalys/red_x.png')), {:action => 'edit', :role_id => role, :type_id => type}, :title => l(:button_edit)) %> -
    -
    +
    + + + + + <% @workflow_counts.first.last.each do |role, count| %> + + <% end %> + + + + <% @workflow_counts.each do |type, roles| -%> + + + <% roles.each do |role, count| -%> + + <% end -%> + + <% end -%> + +
    + <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %> +
    <%= h type %> + <%= link_to((count > 0 ? count : image_tag('webalys/red_x.png')), {:action => 'edit', :role_id => role, :type_id => type}, :title => l(:button_edit)) %> +
    +
    <% end %>