@@ -77,11 +77,16 module CustomFieldsHelper | |||
|
77 | 77 | :class => "#{custom_value.custom_field.field_format}_cf" |
|
78 | 78 | end |
|
79 | 79 | |
|
80 | # Return custom field name tag | |
|
81 | def custom_field_name_tag(custom_field) | |
|
82 | title = custom_field.description.presence | |
|
83 | content_tag 'span', custom_field.name, :title => title | |
|
84 | end | |
|
85 | ||
|
80 | 86 | # Return custom field label tag |
|
81 | 87 | def custom_field_label_tag(name, custom_value, options={}) |
|
82 | 88 | required = options[:required] || custom_value.custom_field.is_required? |
|
83 | title = custom_value.custom_field.description.presence | |
|
84 | content = content_tag 'span', custom_value.custom_field.name, :title => title | |
|
89 | content = custom_field_name_tag custom_value.custom_field | |
|
85 | 90 | |
|
86 | 91 | content_tag "label", content + |
|
87 | 92 | (required ? " <span class=\"required\">*</span>".html_safe : ""), |
@@ -192,7 +192,7 module IssuesHelper | |||
|
192 | 192 | ordered_values.compact.each do |value| |
|
193 | 193 | css = "cf_#{value.custom_field.id}" |
|
194 | 194 | s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0 |
|
195 |
s << "\t<th class=\"#{css}\">#{ |
|
|
195 | s << "\t<th class=\"#{css}\">#{ custom_field_name_tag(value.custom_field) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n" | |
|
196 | 196 | n += 1 |
|
197 | 197 | end |
|
198 | 198 | s << "</tr>\n" |
@@ -60,7 +60,7 | |||
|
60 | 60 | <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), |
|
61 | 61 | :disabled => (custom_field.is_for_all? ? "disabled" : nil), |
|
62 | 62 | :id => nil %> |
|
63 |
<%= custom_field |
|
|
63 | <%= custom_field_name_tag(custom_field) %> | |
|
64 | 64 | </label> |
|
65 | 65 | <% end %> |
|
66 | 66 | <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %> |
@@ -327,7 +327,7 legend {color: #484848;} | |||
|
327 | 327 | hr { width: 100%; height: 1px; background: #ccc; border: 0;} |
|
328 | 328 | blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;} |
|
329 | 329 | blockquote blockquote { margin-left: 0;} |
|
330 | abbr { border-bottom: 1px dotted; cursor: help; } | |
|
330 | abbr, span[title] { border-bottom: 1px dotted #aaa; cursor: help; } | |
|
331 | 331 | textarea.wiki-edit {width:99%; resize:vertical;} |
|
332 | 332 | li p {margin-top: 0;} |
|
333 | 333 | div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;} |
@@ -491,7 +491,6 html>body .tabular p {overflow:hidden;} | |||
|
491 | 491 | |
|
492 | 492 | .tabular input, .tabular select {max-width:95%} |
|
493 | 493 | .tabular textarea {width:95%; resize:vertical;} |
|
494 | .tabular span[title] {border-bottom:1px dotted #aaa;} | |
|
495 | 494 | |
|
496 | 495 | .tabular label{ |
|
497 | 496 | font-weight: bold; |
General Comments 0
You need to be logged in to leave comments.
Login now