@@ -5,8 +5,8 | |||
|
5 | 5 | <% form_tag({:token => @token.value}) do %> |
|
6 | 6 | <div class="box tabular"> |
|
7 | 7 | <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label> |
|
8 |
<%= password_field_tag 'new_password', nil, :size => 25 %> |
|
|
9 | <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
8 | <%= password_field_tag 'new_password', nil, :size => 25 %> | |
|
9 | <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
10 | 10 | |
|
11 | 11 | <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label> |
|
12 | 12 | <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p> |
@@ -7,8 +7,8 | |||
|
7 | 7 | <% if @user.auth_source_id.nil? %> |
|
8 | 8 | <p><%= f.text_field :login, :size => 25, :required => true %></p> |
|
9 | 9 | |
|
10 |
<p><%= f.password_field :password, :size => 25, :required => true %> |
|
|
11 | <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
10 | <p><%= f.password_field :password, :size => 25, :required => true %> | |
|
11 | <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
12 | 12 | |
|
13 | 13 | <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p> |
|
14 | 14 | <% end %> |
@@ -78,7 +78,7 function toggle_custom_field_format() { | |||
|
78 | 78 | <p><%= f.text_field :regexp, :size => 50 %><br />(<%=l(:text_regexp_info)%>)</p> |
|
79 | 79 | <p> |
|
80 | 80 | <%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %> |
|
81 |
< |
|
|
81 | <em class="info"><%= l(:text_custom_field_possible_values_info) %></em> | |
|
82 | 82 | </p> |
|
83 | 83 | <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p> |
|
84 | 84 | <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %> |
@@ -8,8 +8,8 | |||
|
8 | 8 | <%= password_field_tag 'password', nil, :size => 25 %></p> |
|
9 | 9 | |
|
10 | 10 | <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label> |
|
11 |
<%= password_field_tag 'new_password', nil, :size => 25 %> |
|
|
12 | <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
11 | <%= password_field_tag 'new_password', nil, :size => 25 %> | |
|
12 | <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
13 | 13 | |
|
14 | 14 | <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label> |
|
15 | 15 | <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p> |
@@ -11,7 +11,7 | |||
|
11 | 11 | <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p> |
|
12 | 12 | <p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %> |
|
13 | 13 | <% unless @project.identifier_frozen? %> |
|
14 |
|
|
|
14 | <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em> | |
|
15 | 15 | <% end %></p> |
|
16 | 16 | <p><%= f.text_field :homepage, :size => 60 %></p> |
|
17 | 17 | <p><%= f.check_box :is_public %></p> |
@@ -4,8 +4,8 | |||
|
4 | 4 | <%= error_messages_for 'wiki' %> |
|
5 | 5 | |
|
6 | 6 | <div class="box tabular"> |
|
7 |
<p><%= f.text_field :start_page, :size => 60, :required => true %> |
|
|
8 | <em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p> | |
|
7 | <p><%= f.text_field :start_page, :size => 60, :required => true %> | |
|
8 | <em class="info"><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p> | |
|
9 | 9 | </div> |
|
10 | 10 | |
|
11 | 11 | <div class="contextual"> |
@@ -4,8 +4,7 | |||
|
4 | 4 | <p> |
|
5 | 5 | <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> |
|
6 | 6 | <% if @repository && ! @repository.class.scm_available %> |
|
7 | <br /> | |
|
8 | <em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em> | |
|
7 | <em class="info"><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em> | |
|
9 | 8 | <% end %> |
|
10 | 9 | </p> |
|
11 | 10 |
@@ -8,13 +8,13 | |||
|
8 | 8 | |
|
9 | 9 | <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p> |
|
10 | 10 | |
|
11 |
<p><%= setting_text_field :per_page_options, :size => 20 %> |
|
|
12 | <em><%= l(:text_comma_separated) %></em></p> | |
|
11 | <p><%= setting_text_field :per_page_options, :size => 20 %> | |
|
12 | <em class="info"><%= l(:text_comma_separated) %></em></p> | |
|
13 | 13 | |
|
14 | 14 | <p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p> |
|
15 | 15 | |
|
16 |
<p><%= setting_text_field :host_name, :size => 60 %> |
|
|
17 | <em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p> | |
|
16 | <p><%= setting_text_field :host_name, :size => 60 %> | |
|
17 | <em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p> | |
|
18 | 18 | |
|
19 | 19 | <p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p> |
|
20 | 20 | |
@@ -30,8 +30,8 | |||
|
30 | 30 | |
|
31 | 31 | <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p> |
|
32 | 32 | |
|
33 |
<p><%= setting_text_field :repositories_encodings, :size => 60 %> |
|
|
34 | <em><%= l(:text_comma_separated) %></em></p> | |
|
33 | <p><%= setting_text_field :repositories_encodings, :size => 60 %> | |
|
34 | <em class="info"><%= l(:text_comma_separated) %></em></p> | |
|
35 | 35 | |
|
36 | 36 | <%= call_hook(:view_settings_general_form) %> |
|
37 | 37 | </div> |
@@ -3,7 +3,7 | |||
|
3 | 3 | <div class="box tabular settings"> |
|
4 | 4 | <p> |
|
5 | 5 | <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %> |
|
6 |
< |
|
|
6 | <em class="info"><%= l(:text_line_separated) %></em> | |
|
7 | 7 | </p> |
|
8 | 8 | </div> |
|
9 | 9 |
@@ -41,7 +41,7 | |||
|
41 | 41 | </tr> |
|
42 | 42 | <% end %> |
|
43 | 43 | </table> |
|
44 | <p><em><%= l(:text_scm_config) %></em></p> | |
|
44 | <p><em class="info"><%= l(:text_scm_config) %></em></p> | |
|
45 | 45 | </fieldset> |
|
46 | 46 | |
|
47 | 47 | <div class="box tabular settings"> |
@@ -65,8 +65,8 | |||
|
65 | 65 | |
|
66 | 66 | <fieldset class="box tabular settings"> |
|
67 | 67 | <legend><%= l(:text_issues_ref_in_commit_messages) %></legend> |
|
68 |
<p><%= setting_text_field :commit_ref_keywords, :size => 30 %> |
|
|
69 | <em><%= l(:text_comma_separated) %></em></p> | |
|
68 | <p><%= setting_text_field :commit_ref_keywords, :size => 30 %> | |
|
69 | <em class="info"><%= l(:text_comma_separated) %></em></p> | |
|
70 | 70 | |
|
71 | 71 | <p><%= setting_text_field :commit_fix_keywords, :size => 30 %> |
|
72 | 72 | <%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id, |
@@ -79,7 +79,7 | |||
|
79 | 79 | (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, |
|
80 | 80 | :blank => :label_no_change_option, |
|
81 | 81 | :label => false %> |
|
82 |
|
|
|
82 | <em class="info"><%= l(:text_comma_separated) %></em></p> | |
|
83 | 83 | |
|
84 | 84 | <p><%= setting_check_box :commit_cross_project_ref %></p> |
|
85 | 85 |
@@ -28,8 +28,8 | |||
|
28 | 28 | <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p> |
|
29 | 29 | <% end %> |
|
30 | 30 | <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>"> |
|
31 |
<p><%= f.password_field :password, :required => true, :size => 25 %> |
|
|
32 | <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
31 | <p><%= f.password_field :password, :required => true, :size => 25 %> | |
|
32 | <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> | |
|
33 | 33 | <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p> |
|
34 | 34 | </div> |
|
35 | 35 | </fieldset> |
@@ -7,7 +7,7 | |||
|
7 | 7 | <p><% @user.projects.each do |project| %> |
|
8 | 8 | <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br /> |
|
9 | 9 | <% end %></p> |
|
10 | <p><em><%= l(:text_user_mail_option) %></em></p> | |
|
10 | <p><em class="info"><%= l(:text_user_mail_option) %></em></p> | |
|
11 | 11 | <% end %> |
|
12 | 12 | <p><label><%= l(:label_user_mail_no_self_notified) %><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %></label></p> |
|
13 | 13 |
@@ -496,6 +496,8 p.other-formats { text-align: right; font-size:0.9em; color: #666; } | |||
|
496 | 496 | |
|
497 | 497 | a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; } |
|
498 | 498 | |
|
499 | em.info {font-style:normal;font-size:90%;color:#888;display:block;} | |
|
500 | ||
|
499 | 501 | /* Project members tab */ |
|
500 | 502 | div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% } |
|
501 | 503 | div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% } |
General Comments 0
You need to be logged in to leave comments.
Login now