jro_apps/redmine Commit - r20:893a43316548

views cleaning...

Jean-Philippe Lang -

r20:893a43316548

parent child

Context file:

r20:893a43316548

Collapse all files

redmine/app/helpers/application_helper.rb +6 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
               # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime(time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html =''
                 html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
                 html << (pagination_links(paginator, options, html_options) || '')
                 html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
                 html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select
                 (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 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
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                   label = @template.content_tag("label", label_text,
                                 :class => (@object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

redmine/app/views/admin/mail_options.rhtml +7 -8

             <h2><%=l(:field_mail_notification)%></h2>
-            <p><%=l(:text_select_mail_notifications)%></p>
             <%= start_form_tag ({}, :id => 'mail_options_form')%>
+            <div class="box">
+            <p><%=l(:text_select_mail_notifications)%></p>
             <% actions = @actions.group_by {|p| p.group_id } %>
             <% actions.keys.sort.each do |group_id| %>
             <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
             <% actions[group_id].each do |p| %>
               <div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %>
               <%= l(p.description.to_sym) %>
               </div>
             <% end %>
             </fieldset>
             <% end %>
             <br />
-            <p>
+            <p><%= check_all_links 'mail_options_form' %></p>
-            <a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> |
+            </div>
-            <a href="javascript:checkAll('mail_options_form', false)"><%=l(:button_uncheck_all)%></a>
-            </p>
             <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
  No newline at end of file
+            <%= end_form_tag %>

redmine/app/views/projects/changelog.rhtml +4 -4

             <h2><%=l(:label_change_log)%></h2>
             <%= 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 %>
             &nbsp;&nbsp;<%= submit_tag l(:button_apply), :class => 'button-small' %>
-            <%= end_form_tag %>
+            <%= end_form_tag %><br />
+            &nbsp;
-            <p>&nbsp;</p>
+            <div class="box">
             <% ver_id = nil
                @fixed_issues.each do |issue| %>
                 <% unless ver_id == issue.fixed_version_id %>
                 <% if ver_id %></ul><% end %>
                 <p><strong><%= issue.fixed_version.name %></strong> - <%= format_date(issue.fixed_version.effective_date) %><br />
                 <%=h issue.fixed_version.description %></p>
                 <ul>
                 <% ver_id = issue.fixed_version_id
                 end %>
                 <li><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %></li>
             <% end %>
+            </div>
  No newline at end of file

redmine/app/views/projects/list_documents.rhtml +2 0

             <h2><%=l(:label_document_plural)%></h2>
+            <% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% documents = @documents.group_by {|d| d.category } %>
             <% documents.each do |category, docs| %>
             <h3><%= category.name %></h3>
             <ul>
             <% docs.each do |d| %>
               <li>
                 <b><%= link_to d.title, :controller => 'documents', :action => 'show', :id => d %></b>
                 <br />
                 <%=l(:field_description)%>: <%= d.description %><br />
                 <%= format_time(d.created_on) %>
               </li>
             <% end %>
             </ul>
             <% end %>
             <p>
             <%= link_to_if_authorized '&#187; ' + l(:label_document_new), :controller => 'projects', :action => 'add_document', :id => @project %>
             </p>

redmine/app/views/projects/list_news.rhtml +2 0

             <h2><%=l(:label_news_plural)%></h2>
+            <% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% for news in @news %>
             	<p>
             	<b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
             	<%= news.summary %><br />
             	<small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
             	</p>
             <% end %>
             <%= pagination_links_full @news_pages %>
             <p>
             <%= link_to_if_authorized '&#187; ' + l(:label_news_new), :controller => 'projects', :action => 'add_news', :id => @project %>
             </p>

redmine/app/views/projects/show.rhtml +1 -1

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
-            	<%= @project.description %>
+            	<%= simple_format auto_link @project.description %>
             	<ul>
             	<li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>
             	<% end %>
             	<% end %>
             	</ul>
               <div class="box">
                 <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
                   <%= lwr(:label_open_issues, issue_count) %>
                   </li>
                 <% end %>
                 </ul>
                 <% if authorize_for 'projects', 'add_issue' %>
                     &#187; <%=l(:label_issue_new)%>:
                     <ul>
                     <% @trackers.each do |tracker| %>
                     <li><%= link_to tracker.name, :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
                     <% end %>
                     </ul>
                 <% end %>
                 <center><small>[ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>
             		<% for member in @members %>
             		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
             		<% end %>
             	</div>
               <% if @subprojects %>
              	<div class="box">
             		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>
             		<% for subproject in @subprojects %>
             		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
             		<% end %>
             	</div>
               <% end %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <% for news in @news %>
                   <p><b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.summary %>
                   <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small></p>
                   <hr />
                 <% end %>
                 <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
               </div>
             </div>

redmine/app/views/roles/_form.rhtml +2 -3

             <%= error_messages_for 'role' %>
             <div class="box">
             <!--[form:role]-->
             <p><%= f.text_field :name, :required => true %></p>
             <strong><%=l(:label_permissions)%>:</strong>
             <% permissions = @permissions.group_by {|p| p.group_id } %>
             <% permissions.keys.sort.each do |group_id| %>
             <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
             <% permissions[group_id].each do |p| %>
               <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
               <%= l(p.description.to_sym) %>
               </div>
             <% end %>
             </fieldset>
             <% end %>
             <br />
-            <a href="javascript:checkAll('role_form', true)"><%=l(:button_check_all)%></a> |
+            <%= check_all_links 'role_form' %>
-            <a href="javascript:checkAll('role_form', false)"><%=l(:button_uncheck_all)%></a><br />
             <!--[eoform:role]-->
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages