diff --git a/redmine/app/helpers/application_helper.rb b/redmine/app/helpers/application_helper.rb index 7a82bcd3a..9212a5952 100644 --- a/redmine/app/helpers/application_helper.rb +++ b/redmine/app/helpers/application_helper.rb @@ -115,6 +115,12 @@ module ApplicationHelper options[:html].store :class, "tabular" form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc) end + + def check_all_links(form_name) + link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") + + " | " + + link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)") + end end class TabularFormBuilder < ActionView::Helpers::FormBuilder diff --git a/redmine/app/views/admin/mail_options.rhtml b/redmine/app/views/admin/mail_options.rhtml index 7424d3f8c..54e2daf3e 100644 --- a/redmine/app/views/admin/mail_options.rhtml +++ b/redmine/app/views/admin/mail_options.rhtml @@ -1,9 +1,10 @@

<%=l(:field_mail_notification)%>

-

<%=l(:text_select_mail_notifications)%>

- <%= start_form_tag ({}, :id => 'mail_options_form')%> +
+

<%=l(:text_select_mail_notifications)%>

+ <% actions = @actions.group_by {|p| p.group_id } %> <% actions.keys.sort.each do |group_id| %>
<%= l(Permission::GROUPS[group_id]) %> @@ -15,11 +16,9 @@
<% end %> -
-

-<%=l(:button_check_all)%> | -<%=l(:button_uncheck_all)%> -

+

<%= check_all_links 'mail_options_form' %>

+
+ <%= submit_tag l(:button_save) %> -<%= end_form_tag %> \ No newline at end of file +<%= end_form_tag %> diff --git a/redmine/app/views/projects/changelog.rhtml b/redmine/app/views/projects/changelog.rhtml index fc9d2beba..d5234ec61 100644 --- a/redmine/app/views/projects/changelog.rhtml +++ b/redmine/app/views/projects/changelog.rhtml @@ -1,16 +1,15 @@

<%=l(:label_change_log)%>

- <%= start_form_tag %> <% @trackers.each do |tracker| %> <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %> <% end %>   <%= submit_tag l(:button_apply), :class => 'button-small' %> -<%= end_form_tag %> - -

 

+<%= end_form_tag %>
+  +
<% ver_id = nil @fixed_issues.each do |issue| %> <% unless ver_id == issue.fixed_version_id %> @@ -23,3 +22,4 @@
  • <%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %>
  • <% end %> +
    \ No newline at end of file diff --git a/redmine/app/views/projects/list_documents.rhtml b/redmine/app/views/projects/list_documents.rhtml index 7e6eff0ba..e47abceb3 100644 --- a/redmine/app/views/projects/list_documents.rhtml +++ b/redmine/app/views/projects/list_documents.rhtml @@ -1,5 +1,7 @@

    <%=l(:label_document_plural)%>

    +<% if @documents.empty? %>

    <%= l(:label_no_data) %>

    <% end %> + <% documents = @documents.group_by {|d| d.category } %> <% documents.each do |category, docs| %>

    <%= category.name %>

    diff --git a/redmine/app/views/projects/list_news.rhtml b/redmine/app/views/projects/list_news.rhtml index f31f927ac..31a5f86a4 100644 --- a/redmine/app/views/projects/list_news.rhtml +++ b/redmine/app/views/projects/list_news.rhtml @@ -1,5 +1,7 @@

    <%=l(:label_news_plural)%>

    +<% if @news.empty? %>

    <%= l(:label_no_data) %>

    <% end %> + <% for news in @news %>

    <%= news.title %> (<%= link_to_user news.author %> <%= format_time(news.created_on) %>)
    diff --git a/redmine/app/views/projects/show.rhtml b/redmine/app/views/projects/show.rhtml index b9e28ce33..dcd52aa3a 100644 --- a/redmine/app/views/projects/show.rhtml +++ b/redmine/app/views/projects/show.rhtml @@ -1,7 +1,7 @@

    <%=l(:label_overview)%>

    - <%= @project.description %> + <%= simple_format auto_link @project.description %>