diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-06 20:24:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-06 20:24:26 +0000 |
| commit | a80dbc49b1670877aca09b11101d4a5b40ea58c2 (patch) | |
| tree | ad81a0601a377471558b561c08be9956cd1b008a /app/views/admin | |
| parent | 78d9ae9754578cda4b72d7b28a4f707534c15c49 (diff) | |
| download | redmine-a80dbc49b1670877aca09b11101d4a5b40ea58c2.tar.gz redmine-a80dbc49b1670877aca09b11101d4a5b40ea58c2.zip | |
Admin settings screen split to tabs.
Email notification options moved to this view as a tab and LDAP list is accessible from the 'Authentication' tab.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1046 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/index.rhtml | 8 | ||||
| -rw-r--r-- | app/views/admin/mail_options.rhtml | 33 |
2 files changed, 0 insertions, 41 deletions
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index 2291c5415..18bee34cb 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -30,14 +30,6 @@ <%= link_to l(:label_enumerations), :controller => 'enumerations' %> </p> -<p class="icon22 icon22-notifications"> -<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %> -</p> - -<p class="icon22 icon22-authent"> -<%= link_to l(:label_authentication), :controller => 'auth_sources' %> -</p> - <p class="icon22 icon22-settings"> <%= link_to l(:label_settings), :controller => 'settings' %> </p> diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml deleted file mode 100644 index 698933b9b..000000000 --- a/app/views/admin/mail_options.rhtml +++ /dev/null @@ -1,33 +0,0 @@ -<div class="contextual"> -<%= link_to l(:label_send_test_email), :action => 'test_email' %> -</div> - -<h2><%=l(:field_mail_notification)%></h2> - -<% form_tag({:action => 'mail_options'}, :id => 'mail-options-form') do %> - -<fieldset class="box tabular settings"><legend><%=l(:label_settings)%></legend> -<p><label><%= l(:setting_mail_from) %></label> -<%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p> - -<p><label><%= l(:setting_bcc_recipients) %></label> -<%= check_box_tag 'settings[bcc_recipients]', 1, Setting.bcc_recipients? %> -<%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p> -</fieldset> - -<fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend> -<% @notifiables.each do |notifiable| %> - <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %> - <%= notifiable.humanize %></label><br /> -<% end %> -<p><%= check_all_links('mail-options-form') %></p> -</fieldset> - -<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend> -<%= text_area_tag 'settings[emails_footer]', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %> -</fieldset> - -<%= submit_tag l(:button_save) %> -<% end %> - -<% html_title(l(:field_mail_notification)) -%> |