jro_apps/redmine Commit - r15869:b40d66f39fa8

app/helpers/issues_helper.rb +22 -2

                  r.to_html
                end
-               def render_custom_fields_rows(issue)
-                 values = issue.visible_custom_field_values
+               def render_half_width_custom_fields_rows(issue)
+                 values = issue.visible_custom_field_values.reject {|value| value.custom_field.full_width_layout?}
                  return if values.empty?
                  half = (values.size / 2.0).ceil
                  issue_fields_rows do |rows|
                  end
                end
+               def render_full_width_custom_fields_rows(issue)
+                 values = issue.visible_custom_field_values.select {|value| value.custom_field.full_width_layout?}
+                 return if values.empty?
+                 s = ''
+                 values.each_with_index do |value, i|
+                   if value.custom_field.text_formatting == 'full'
+                     attr_value = content_tag('div', show_value(value), class: 'wiki')
+                   else
+                     attr_value = show_value(value)
+                   end
+                   content =
+                       content_tag('hr') +
+                       content_tag('p', content_tag('strong', custom_field_name_tag(value.custom_field) )) +
+                       content_tag('div', attr_value, class: 'value')
+                   s << content_tag('div', content, class: "cf_#{value.custom_field.id} attribute")
+                 end
+                 s.html_safe
+               end
                # Returns the path for updating the issue form
                # with project as the current project
                def update_issue_form_path(project, issue)

app/models/custom_field.rb +6 -1

                  'edit_tag_style',
                  'user_role',
                  'version_status',
-                 'extensions_allowed'
+                 'extensions_allowed',
+                 'full_width_layout'
                def format
                  @format ||= Redmine::FieldFormat.find(field_format)
                  format.totalable_supported
                end
+               def full_width_layout?
+                 full_width_layout == '1'
+               end
                # Returns a ORDER BY clause that can used to sort customized
                # objects by their value of the custom field.
                # Returns nil if the custom field can not be used for sorting.

app/views/custom_fields/formats/_text.html.erb +3 0

              <%= render :partial => 'custom_fields/formats/regexp', :locals => {:f => f, :custom_field => custom_field} %>
              <p><%= f.check_box :text_formatting, {:label => :setting_text_formatting}, 'full', '' %></p>
+             <% if @custom_field.class.name == "IssueCustomField" %>
+             <p><%= f.check_box :full_width_layout %></p>
+             <% end %>
              <p><%= f.text_area(:default_value, :rows => 5) %></p>

app/views/issues/_form_custom_fields.html.erb +7 0

              <% custom_field_values = @issue.editable_custom_field_values %>
+             <% custom_field_values_full_width = custom_field_values.select { |value| value.custom_field.full_width_layout? } %>
+             <% custom_field_values -= custom_field_values_full_width %>
              <% if custom_field_values.present? %>
              <div class="splitcontent">
              <div class="splitcontentleft">
              </div>
              </div>
              <% end %>
+             <% custom_field_values_full_width.each do |value| %>
+               <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
+             <% end %>

app/views/issues/show.html.erb +3 -1

                  end
                end
              end %>
-             <%= render_custom_fields_rows(@issue) %>
+             <%= render_half_width_custom_fields_rows(@issue) %>
              <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
              </div>
              <%= link_to_attachments @issue, :thumbnails => true %>
              <% end -%>
+             <%= render_full_width_custom_fields_rows(@issue) %>
              <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
              <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>

config/locales/en.yml +1 0

                field_textarea_font: Font used for text areas
                field_updated_by: Updated by
                field_last_updated_by: Last updated by
+               field_full_width_layout: Full width layout
                setting_app_title: Application title
                setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

                field_textarea_font: Police utilisée pour les champs texte
                field_updated_by: Mise à jour par
                field_last_updated_by: Dernière mise à jour par
+               field_full_width_layout: Afficher sur toute la largeur
                setting_app_title: Titre de l'application
                setting_app_subtitle: Sous-titre de l'application

lib/redmine/field_format.rb +1 -1

                      CustomField.store_accessor :format_store, *args
                    end
-                   field_attributes :url_pattern
+                   field_attributes :url_pattern, :full_width_layout
                    def name
                      self.class.format_name

public/stylesheets/application.css +2 -2

              div.issue span.private, div.journal span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
              div.issue .next-prev-links {color:#999;}
              div.issue .attributes {margin-top: 2em;}
-             div.issue .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
-             div.issue .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left; overflow:hidden; text-overflow: ellipsis;}
+             div.issue .attributes .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
+             div.issue .attributes .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;  overflow:hidden; text-overflow: ellipsis;}
              div.issue .attribute .value {overflow:hidden; text-overflow: ellipsis;}
              div.issue.overdue .due-date .value { color: #c22; }

test/functional/custom_fields_controller_test.rb +14 0

                  assert_select '[name=?]', 'custom_field[default_value]', 0
                end
+               def test_setting_full_width_layout_shoul_be_present_only_for_long_text_issue_custom_field
+                 get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'text'}
+                 assert_response :success
+                 assert_select '[name=?]', 'custom_field[full_width_layout]'
+                 get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}
+                 assert_response :success
+                 assert_select '[name=?]', 'custom_field[full_width_layout]', 0
+                 get :new, :type => 'TimeEntryCustomField', :custom_field => {:field_format => 'text'}
+                 assert_response :success
+                 assert_select '[name=?]', 'custom_field[full_width_layout]', 0
+               end
                def test_new_js
                  xhr :get, :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
                  assert_response :success

test/functional/issues_controller_test.rb +19 0

                  assert_select ".cf_1 .value", :text => 'MySQL, Oracle'
                end
+               def test_show_with_full_width_layout_custom_field_should_show_field_under_description
+                 field = IssueCustomField.create!(:name => 'Long text', :field_format => 'text', :full_width_layout => '1',
+                   :tracker_ids => [1], :is_for_all => true)
+                 issue = Issue.find(1)
+                 issue.custom_field_values = {field.id => 'This is a long text'}
+                 issue.save!
+                 get :show, :id => 1
+                 assert_response :success
+                 # long text custom field should not be render in the attributes div
+                 assert_select "div.attributes div.attribute.cf_#{field.id} p strong", 0, :text => 'Long text'
+                 assert_select "div.attributes div.attribute.cf_#{field.id} div.value", 0, :text => 'This is a long text'
+                 # long text custom field should be render under description field
+                 assert_select "div.description ~ div.attribute.cf_#{field.id} p strong", :text => 'Long text'
+                 assert_select "div.description ~ div.attribute.cf_#{field.id} div.value", :text => 'This is a long text'
+               end
                def test_show_with_multi_user_custom_field
                  field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
                    :tracker_ids => [1], :is_for_all => true)

	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