diff options
Diffstat (limited to 'app/views/documents')
| -rw-r--r-- | app/views/documents/_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/documents/show.rhtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/documents/_form.rhtml b/app/views/documents/_form.rhtml index 873c96329..b075b4657 100644 --- a/app/views/documents/_form.rhtml +++ b/app/views/documents/_form.rhtml @@ -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[ diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index dab360eda..d756aad62 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -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 %>
|