views cleaning

git-svn-id: http://redmine.rubyforge.org/svn/trunk@22 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/redmine/app/helpers/application_helper.rb b/redmine/app/helpers/application_helper.rb
index 7a82bcd..9212a59 100644 (file)
--- 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"\r
     form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)\r
   end\r
+  \r
+  def check_all_links(form_name)\r
+    link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +\r
+    " | " +\r
+    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   \r
+  end\r
 end
 \r
 class TabularFormBuilder < ActionView::Helpers::FormBuilder\r

diff --git a/redmine/app/views/admin/mail_options.rhtml b/redmine/app/views/admin/mail_options.rhtml
index 7424d3f..54e2daf 100644 (file)
--- a/redmine/app/views/admin/mail_options.rhtml
+++ b/redmine/app/views/admin/mail_options.rhtml
@@ -1,9 +1,10 @@
 <h2><%=l(:field_mail_notification)%></h2>\r
 \r
-<p><%=l(:text_select_mail_notifications)%></p>\r
-\r
 <%= start_form_tag ({}, :id => 'mail_options_form')%>\r
 \r
+<div class="box">\r
+<p><%=l(:text_select_mail_notifications)%></p>\r
+\r
 <% actions = @actions.group_by {|p| p.group_id } %>\r
 <% actions.keys.sort.each do |group_id| %>\r
 <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>\r
@@ -15,11 +16,9 @@
 </fieldset>\r
 <% end %>\r
 \r
-\r
 <br />\r
-<p>\r
-<a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> |\r
-<a href="javascript:checkAll('mail_options_form', false)"><%=l(:button_uncheck_all)%></a>\r
-</p>\r
+<p><%= check_all_links 'mail_options_form' %></p>\r
+</div>\r
+\r
 <%= submit_tag l(:button_save) %>\r
-<%= end_form_tag %>
\ No newline at end of file
+<%= end_form_tag %>\r

diff --git a/redmine/app/views/projects/changelog.rhtml b/redmine/app/views/projects/changelog.rhtml
index fc9d2be..d5234ec 100644 (file)
--- a/redmine/app/views/projects/changelog.rhtml
+++ b/redmine/app/views/projects/changelog.rhtml
@@ -1,16 +1,15 @@
 <h2><%=l(:label_change_log)%></h2>\r
 \r
-\r
 <%= start_form_tag %>\r
 <% @trackers.each do |tracker| %>\r
   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>\r
   <%= tracker.name %>\r
 <% end %>\r
 &nbsp;&nbsp;<%= submit_tag l(:button_apply), :class => 'button-small' %>\r
-<%= end_form_tag %>\r
-\r
-<p>&nbsp;</p>\r
+<%= end_form_tag %><br />\r
+&nbsp;\r
 \r
+<div class="box">\r
 <% ver_id = nil\r
    @fixed_issues.each do |issue| %>   \r
     <% unless ver_id == issue.fixed_version_id %>\r
@@ -23,3 +22,4 @@
     <li><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %></li>\r
 <% end %>\r
 \r
+</div>
\ 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 7e6eff0..e47abce 100644 (file)
--- a/redmine/app/views/projects/list_documents.rhtml
+++ b/redmine/app/views/projects/list_documents.rhtml
@@ -1,5 +1,7 @@
 <h2><%=l(:label_document_plural)%></h2>\r
 \r
+<% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>\r
+\r
 <% documents = @documents.group_by {|d| d.category } %>\r
 <% documents.each do |category, docs| %>\r
 <h3><%= category.name %></h3>\r

diff --git a/redmine/app/views/projects/list_news.rhtml b/redmine/app/views/projects/list_news.rhtml
index f31f927..31a5f86 100644 (file)
--- a/redmine/app/views/projects/list_news.rhtml
+++ b/redmine/app/views/projects/list_news.rhtml
@@ -1,5 +1,7 @@
 <h2><%=l(:label_news_plural)%></h2>
 
+<% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
 <% for news in @news %>\r
        <p>\r
        <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />\r

diff --git a/redmine/app/views/projects/show.rhtml b/redmine/app/views/projects/show.rhtml
index b9e28ce..dcd52aa 100644 (file)
--- a/redmine/app/views/projects/show.rhtml
+++ b/redmine/app/views/projects/show.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:label_overview)%></h2> \r
        \r
 <div class="splitcontentleft">\r
-       <%= @project.description %>     \r
+       <%= simple_format auto_link @project.description %>     \r
        <ul>\r
        <li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>\r
        <li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>\r

diff --git a/redmine/app/views/roles/_form.rhtml b/redmine/app/views/roles/_form.rhtml
index ea7bafc..e0ab1c0 100644 (file)
--- a/redmine/app/views/roles/_form.rhtml
+++ b/redmine/app/views/roles/_form.rhtml
@@ -14,8 +14,7 @@
 <% end %>\r
 </fieldset>\r
 <% end %>\r
-<br />\r
-<a href="javascript:checkAll('role_form', true)"><%=l(:button_check_all)%></a> |\r
-<a href="javascript:checkAll('role_form', false)"><%=l(:button_uncheck_all)%></a><br />\r
+<br />
+<%= check_all_links 'role_form' %>\r
 <!--[eoform:role]-->
 </div>