settings_patches.diff

Jan from Planio www.plan.io, 2010-09-29 10:57

Download (4.47 KB)

View differences:

app/views/settings/_authentication.rhtml
17 17
<p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
18 18

  
19 19
<p><%= setting_check_box :rest_api_enabled %></p>
20

  
21
<%= call_hook :view_settings_authentication_form %>
20 22
</div>
21 23

  
22 24
<div style="float:right;">
app/views/settings/_display.rhtml
16 16
<p><%= setting_check_box :gravatar_enabled %></p>
17 17

  
18 18
<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid']], :blank => :label_none %></p>
19

  
20
<%= call_hook :view_settings_display_form, :options => @options %>
19 21
</div>
20 22

  
21 23
<%= submit_tag l(:button_save) %>
app/views/settings/_issues.rhtml
8 8
<p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
9 9

  
10 10
<p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
11

  
12
<%= call_hook :view_settings_issues_form %>
11 13
</div>
12 14

  
13 15
<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
app/views/settings/_mail_handler.rhtml
5 5
    <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
6 6
    <br /><em><%= l(:text_line_separated) %></em>
7 7
  </p>
8

  
9
	<%= call_hook :view_settings_mail_handler_delimiters_form %>
8 10
</div>
9 11

  
10 12
<div class="box tabular settings">
......
16 18
																								 :disabled => !Setting.mail_handler_api_enabled? %>
17 19
  <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %>
18 20
</p>
21

  
22
<%= call_hook :view_settings_mail_handler_api_key_form %>
19 23
</div>
20 24

  
21 25
<%= submit_tag l(:button_save) %>
app/views/settings/_notifications.rhtml
10 10

  
11 11
<p><%= setting_select(:default_notification_option, User::MAIL_NOTIFICATION_OPTIONS.collect {|o| [l(o.last), o.first.to_s]}) %></p>
12 12

  
13
<%= call_hook :view_settings_notifications_form %>
13 14
</div>
14 15

  
15 16
<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
app/views/settings/_projects.rhtml
11 11
<p><%= setting_select :new_project_user_role_id,
12 12
											Role.find_all_givable.collect {|r| [r.name, r.id.to_s]}, 
13 13
											:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
14
											
15
<%= call_hook :view_settings_projects_form %>
14 16
</div>
15 17

  
16 18
<%= submit_tag l(:button_save) %>
app/views/settings/_repositories.rhtml
21 21
<p><%= setting_select :commit_logs_encoding, Setting::ENCODINGS %></p>
22 22

  
23 23
<p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
24

  
25
<%= call_hook :view_settings_repositories_scm_form %>
24 26
</div>
25 27

  
26 28
<fieldset class="box tabular settings"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
......
31 33
&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
32 34
&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
33 35
<br /><em><%= l(:text_comma_separated) %></em></p>
36

  
37
<%= call_hook :view_settings_repositories_commit_ref_form %>
34 38
</fieldset>
35 39

  
36 40
<%= submit_tag l(:button_save) %>