dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings are now stored in the database (config_custom.rb no more used) and editable through the application in: Admin -> Settings

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@167 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2007-01-21 11:50:22 +00:00
parent a1b12335ab
commit 0b4d4db131
44 changed files with 286 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/account/login.rhtml
+1 -1
View File
@@ -12,7 +12,7 @@
<p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
<%= end_form_tag %>
<br><% unless $RDM_SELF_REGISTRATION == false %><%= link_to l(:label_register), :action => 'register' %> |<% end %>
<br><% if Setting.self_registration? %><%= link_to l(:label_register), :action => 'register' %> |<% end %>
<%= link_to l(:label_password_lost), :action => 'lost_password' %></p>
</div>
</center>
app/views/admin/index.rhtml
+4
View File
@@ -36,6 +36,10 @@
<%= link_to l(:label_authentication), :controller => 'auth_sources' %>
</p>
<p class="icon22 icon22-settings">
<%= link_to l(:label_settings), :controller => 'settings' %>
</p>
<p class="icon22 icon22-info">
<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
</p>
app/views/documents/_form.rhtml
+1 -1
View File
@@ -14,7 +14,7 @@
<!--[eoform:document]-->
</div>
<% unless $RDM_TEXTILE_DISABLED %>
<% if Setting.text_formatting == 'textile' %>
<%= javascript_include_tag 'jstoolbar' %>
<script type="text/javascript">
//<![CDATA[
app/views/documents/show.rhtml
+1 -1
View File
@@ -31,7 +31,7 @@
<%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
<%= submit_tag l(:button_add) %>
<%= end_form_tag %>
<% end %>
app/views/feeds/news.rxml
+2 -2
View File
@@ -1,10 +1,10 @@
xml.instruct!
xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
xml.channel do
xml.title "#{$RDM_HEADER_TITLE}: #{l(:label_news_latest)}"
xml.title "#{Setting.header_title}: #{l(:label_news_latest)}"
xml.link url_for(:controller => '', :only_path => false)
xml.pubDate CGI.rfc1123_date(@news.first.created_on)
xml.description "#{$RDM_HEADER_TITLE}: #{l(:label_news_latest)}"
xml.description l(:label_news_latest)
@news.each do |news|
xml.item do
xml.title "#{news.project.name}: #{news.title}"
app/views/issues/edit.rhtml
+1 -1
View File
@@ -34,7 +34,7 @@
<%= submit_tag l(:button_save) %>
<% end %>
<% unless $RDM_TEXTILE_DISABLED %>
<% if Setting.text_formatting == 'textile' %>
<%= javascript_include_tag 'jstoolbar' %>
<script type="text/javascript">
//<![CDATA[
app/views/issues/show.rhtml
+1 -1
View File
@@ -93,7 +93,7 @@ end %>
<%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %>
<p id="attachments_p"><label><%=l(:label_attachment_new)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
<%= submit_tag l(:button_add) %>
<%= end_form_tag %>
<% end %>
app/views/layouts/base.rhtml
+5 -7
View File
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title><%= $RDM_HEADER_TITLE + (@html_title ? ": #{@html_title}" : "") %></title>
<title><%= Setting.header_title + (@html_title ? ": #{@html_title}" : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="redMine" />
<meta name="keywords" content="issue,bug,tracker" />
@@ -23,8 +23,8 @@
<div id="header">
<div style="float: left;">
<h1><%= $RDM_HEADER_TITLE %></h1>
<h2><%= $RDM_HEADER_SUBTITLE %></h2>
<h1><%= Setting.header_title %></h1>
<h2><%= Setting.header_subtitle %></h2>
</div>
<div style="float: right; padding-right: 1em; padding-top: 0.2em;">
<% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
@@ -69,6 +69,7 @@
<a class="menuItem" href="/enumerations"><%=l(:label_enumerations)%></a>
<a class="menuItem" href="/admin/mail_options"><%=l(:field_mail_notification)%></a>
<a class="menuItem" href="/auth_sources"><%=l(:label_authentication)%></a>
<a class="menuItem" href="/settings"><%=l(:label_settings)%></a>
<a class="menuItem" href="/admin/info"><%=l(:label_information_plural)%></a>
</div>
<div id="menuTrackers" class="menu">
@@ -134,10 +135,7 @@
</div>
<div id="footer">
<p>
<%= auto_link $RDM_FOOTER_SIG %> |
<a href="http://redmine.rubyforge.org/"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
</p>
<p><a href="http://redmine.rubyforge.org/"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %></p>
</div>
</div>
app/views/mailer/_issue.rhtml
+1 -1
View File
@@ -4,4 +4,4 @@
<%= issue.description %>
http://<%= $RDM_HOST_NAME %>/issues/show/<%= issue.id %>
http://<%= Setting.host_name %>/issues/show/<%= issue.id %>
app/views/mailer/lost_password_de.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To change your password, use the following link:
http://<%= $RDM_HOST_NAME %>/account/lost_password?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
app/views/mailer/lost_password_en.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To change your password, use the following link:
http://<%= $RDM_HOST_NAME %>/account/lost_password?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
app/views/mailer/lost_password_es.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To change your password, use the following link:
http://<%= $RDM_HOST_NAME %>/account/lost_password?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
app/views/mailer/lost_password_fr.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
Pour changer votre mot de passe, utilisez le lien suivant:
http://<%= $RDM_HOST_NAME %>/account/lost_password?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
app/views/mailer/register_de.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To activate your redMine account, use the following link:
http://<%= $RDM_HOST_NAME %>/account/register?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
app/views/mailer/register_en.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To activate your redMine account, use the following link:
http://<%= $RDM_HOST_NAME %>/account/register?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
app/views/mailer/register_es.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
To activate your redMine account, use the following link:
http://<%= $RDM_HOST_NAME %>/account/register?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
app/views/mailer/register_fr.rhtml
+1 -1
View File
@@ -1,3 +1,3 @@
Pour activer votre compte sur redMine, utilisez le lien suivant:
http://<%= $RDM_HOST_NAME %>/account/register?token=<%= @token.value %>
http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
app/views/news/_form.rhtml
+1 -1
View File
@@ -5,7 +5,7 @@
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15 %></p>
</div>
<% unless $RDM_TEXTILE_DISABLED %>
<% if Setting.text_formatting == 'textile' %>
<%= javascript_include_tag 'jstoolbar' %>
<script type="text/javascript">
//<![CDATA[
app/views/projects/add_document.rhtml
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="box">
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
</div>
<%= submit_tag l(:button_create) %>
app/views/projects/add_file.rhtml
+1 -1
View File
@@ -9,7 +9,7 @@
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
</div>
<%= submit_tag l(:button_add) %>
<%= end_form_tag %>
app/views/projects/add_issue.rhtml
+2 -2
View File
@@ -27,7 +27,7 @@
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
</div>
<!--[eoform:issue]-->
@@ -35,7 +35,7 @@
<%= submit_tag l(:button_create) %>
<% end %>
<% unless $RDM_TEXTILE_DISABLED %>
<% if Setting.text_formatting == 'textile' %>
<%= javascript_include_tag 'jstoolbar' %>
<script type="text/javascript">
//<![CDATA[
app/views/settings/edit.rhtml
+37
View File
@@ -0,0 +1,37 @@
<h2><%= l(:label_settings) %></h2>
<%= start_form_tag({:action => 'edit'}, :class => "tabular") %>
<div class="box">
<p><label>header_title</label>
<%= text_field_tag 'settings[header_title]', Setting.header_title, :size => 30 %></p>
<p><label>header_subtitle</label>
<%= text_field_tag 'settings[header_subtitle]', Setting.header_subtitle, :size => 60 %></p>
<p><label>welcome_text</label>
<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
<p><label>default_language</label>
<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
<p><label>login_required</label>
<%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
<p><label>self_registration</label>
<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
<p><label>attachment_max_size</label>
<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %></p>
<p><label>mail_from</label>
<%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
<p><label>host_name</label>
<%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
<p><label>text_formatting</label>
<%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
</div>
<%= submit_tag l(:button_save) %>
<%= end_form_tag %>
app/views/welcome/index.rhtml
+2 -2
View File
@@ -1,7 +1,7 @@
<h2><%= $RDM_WELCOME_TITLE || l(:label_home) %></h2>
<h2><%= l(:label_home) %></h2>
<div class="splitcontentleft">
<% if $RDM_WELCOME_TEXT %><p><%= $RDM_WELCOME_TEXT %></p><br /><% end %>
<p><%= Setting.welcome_text %></p>
<div class="box">
<h3><%=l(:label_news_latest)%></h3>
<%= render :partial => 'news/news', :collection => @news %>