diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-21 11:50:22 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-21 11:50:22 +0000 |
| commit | 0b4d4db131304eac84dc90b289a95db3410a2bfe (patch) | |
| tree | b5ad6934b897635e594ca089f06fe953d082ed53 /app/views/projects | |
| parent | a1b12335ab6a01ea6e7dcc1df490db16136c8c2a (diff) | |
| download | redmine-0b4d4db131304eac84dc90b289a95db3410a2bfe.tar.gz redmine-0b4d4db131304eac84dc90b289a95db3410a2bfe.zip | |
settings are now stored in the database (config_custom.rb no more used) and editable through the application in: Admin -> Settings
git-svn-id: http://redmine.rubyforge.org/svn/trunk@167 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/add_document.rhtml | 2 | ||||
| -rw-r--r-- | app/views/projects/add_file.rhtml | 2 | ||||
| -rw-r--r-- | app/views/projects/add_issue.rhtml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml index b570eabbd..57a62756b 100644 --- a/app/views/projects/add_document.rhtml +++ b/app/views/projects/add_document.rhtml @@ -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) %> diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml index baffbe8e8..6efc1d2c5 100644 --- a/app/views/projects/add_file.rhtml +++ b/app/views/projects/add_file.rhtml @@ -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 %>
\ No newline at end of file diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml index 951b53bb9..fd463b5b4 100644 --- a/app/views/projects/add_issue.rhtml +++ b/app/views/projects/add_issue.rhtml @@ -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[ |