jro_apps/redmine Commit - r3222:d4525828b9d8

Fixed some labels to be more accessible....

Eric Davis -

r3222:d4525828b9d8

parent child

Context file:

r3222:d4525828b9d8

Collapse all files

app/helpers/projects_helper.rb +1 -1

             # 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 ProjectsHelper
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options
               end
               def project_settings_tabs
                 tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                         {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
                         {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
                         {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
                         {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
                         {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
                         {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
                         {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
                         {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
                         ]
                 tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
               end
               def parent_project_select_tag(project)
                 selected = project.parent
                 # retrieve the requested parent project
                 parent_id = (params[:project] && params[:project][:parent_id]) || params[:parent_id]
                 if parent_id
                   selected = (parent_id.blank? ? nil : Project.find(parent_id))
                 end
                 options = ''
                 options << "<option value=''></option>" if project.allowed_parents.include?(nil)
                 options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
-                content_tag('select', options, :name => 'project[parent_id]')
+                content_tag('select', options, :name => 'project[parent_id]', :id => 'project_parent_id')
               end
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_hierarchy(projects)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>" +
                            link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
                     s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s
               end
               # Returns a set of options for a select field, grouped by project.
               def version_options_for_select(versions, selected=nil)
                 grouped = Hash.new {|h,k| h[k] = []}
                 versions.each do |version|
                   grouped[version.project.name] << [version.name, version.id]
                 end
                 # Add in the selected
                 if selected && !versions.include?(selected)
                   grouped[selected.project.name] << [selected.name, selected.id]
                 end
                 if grouped.keys.size > 1
                   grouped_options_for_select(grouped, selected && selected.id)
                 else
                   options_for_select((grouped.values.first || []), selected && selected.id)
                 end
               end
               def format_version_sharing(sharing)
                 sharing = 'none' unless Version::VERSION_SHARINGS.include?(sharing)
                 l("label_version_sharing_#{sharing}")
               end
             end

app/views/projects/_form.rhtml +1 -1

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
             <p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
             <% unless @project.allowed_parents.compact.empty? %>
-                <p><label><%= l(:field_parent) %></label><%= parent_project_select_tag(@project) %></p>
+                <p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
             <% end %>
             <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
             <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
             <% unless @project.identifier_frozen? %>
             <br /><em><%= l(:text_length_between, :min => 1, :max => 20) %> <%= l(:text_project_identifier_info) %></em>
             <% end %></p>
             <p><%= f.text_field :homepage, :size => 60 %></p>
             <p><%= f.check_box :is_public %></p>
             <%= wikitoolbar_for 'project_description' %>
             <% @project.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :project, value %></p>
             <% end %>
             <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
             </div>
             <% unless @trackers.empty? %>
             <fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
             <% @trackers.each do |tracker| %>
                 <label class="floating">
                 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
                 <%= tracker %>
                 </label>
             <% end %>
             <%= hidden_field_tag 'project[tracker_ids][]', '' %>
             </fieldset>
             <% end %>
             <% unless @issue_custom_fields.empty? %>
             <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
             <% @issue_custom_fields.each do |custom_field| %>
                 <label class="floating">
             	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
             	<%= custom_field.name %>
             	</label>
             <% end %>
             <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
             </fieldset>
             <% end %>
             <!--[eoform:project]-->

app/views/projects/settings/_modules.rhtml +4 -2

             <% form_for :project, @project,
                         :url => { :action => 'modules', :id => @project },
                         :html => {:id => 'modules-form'} do |f| %>
-            <div class=box>
+            <div class="box">
-            <strong><%= l(:text_select_project_modules) %></strong>
+            <fieldset>
+            <legend><%= l(:text_select_project_modules) %></legend>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
             <p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%>
              <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
             <% end %>
+            </fieldset>
             </div>
             <p><%= check_all_links 'modules-form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/projects/settings/_repository.rhtml +1 -1

             <% remote_form_for :repository, @repository,
                                :url => { :controller => 'repositories', :action => 'edit', :id => @project },
                                :builder => TabularFormBuilder,
                                :lang => current_language do |f| %>
             <%= error_messages_for 'repository' %>
             <div class="box tabular">
-            <p><label><%= l(:label_scm) %></label><%= scm_select_tag(@repository) %></p>
+            <p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %></p>
             <%= repository_field_tags(f, @repository) if @repository %>
             </div>
             <div class="contextual">
             <% if @repository && !@repository.new_record? %>
             <%= link_to(l(:label_user_plural), {:controller => 'repositories', :action => 'committers', :id => @project}, :class => 'icon icon-user') %>
             <%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project},
                         :confirm => l(:text_are_you_sure),
                         :method => :post,
                         :class => 'icon icon-del') %>
             <% end %>
             </div>
             <%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository.nil?) %>
             <% end %>

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