diff options
| -rw-r--r-- | app/views/documents/_form.rhtml | 14 | ||||
| -rw-r--r-- | app/views/documents/show.rhtml | 4 | ||||
| -rw-r--r-- | app/views/issues/edit.rhtml | 14 | ||||
| -rw-r--r-- | app/views/messages/_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/news/_form.rhtml | 14 | ||||
| -rw-r--r-- | app/views/projects/add_file.rhtml | 4 | ||||
| -rw-r--r-- | app/views/projects/add_issue.rhtml | 14 |
7 files changed, 7 insertions, 59 deletions
diff --git a/app/views/documents/_form.rhtml b/app/views/documents/_form.rhtml index bd6e6cc7e..ee7c289f1 100644 --- a/app/views/documents/_form.rhtml +++ b/app/views/documents/_form.rhtml @@ -14,16 +14,4 @@ <!--[eoform:document]--> </div> -<% if Setting.text_formatting == 'textile' %> -<%= javascript_include_tag 'jstoolbar' %> -<script type="text/javascript"> -//<![CDATA[ -if (document.getElementById) { - if (document.getElementById('document_description')) { - var commentTb = new jsToolBar(document.getElementById('document_description')); - commentTb.draw(); - } -} -//]]> -</script> -<% end %>
\ No newline at end of file +<%= wikitoolbar_for 'document_description' %> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 9f530539f..74b8f343d 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -30,9 +30,7 @@ <% if authorize_for('documents', 'add_attachment') %> <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p> <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %> - <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) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> + <%= render :partial => 'attachments/form' %> <%= submit_tag l(:button_add) %> <% end %> <% end %> diff --git a/app/views/issues/edit.rhtml b/app/views/issues/edit.rhtml index 02430127d..8551bfab5 100644 --- a/app/views/issues/edit.rhtml +++ b/app/views/issues/edit.rhtml @@ -33,19 +33,7 @@ <%= submit_tag l(:button_save) %> <% end %> -<% if Setting.text_formatting == 'textile' %> -<%= javascript_include_tag 'jstoolbar' %> -<script type="text/javascript"> -//<![CDATA[ -if (document.getElementById) { - if (document.getElementById('issue_description')) { - var commentTb = new jsToolBar(document.getElementById('issue_description')); - commentTb.draw(); - } -} -//]]> -</script> -<% end %> +<%= wikitoolbar_for 'issue_description' %> <% content_for :header_tags do %> <%= javascript_include_tag 'calendar/calendar' %> diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml index 93e4311b9..0d1ec7390 100644 --- a/app/views/messages/_form.rhtml +++ b/app/views/messages/_form.rhtml @@ -5,7 +5,7 @@ <p><label><%= l(:field_subject) %></label><br /> <%= f.text_field :subject, :required => true, :size => 80 %></p> -<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15 %></p> +<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit' %></p> <%= wikitoolbar_for 'message_content' %> <!--[eoform:message]--> diff --git a/app/views/news/_form.rhtml b/app/views/news/_form.rhtml index d5fec279a..1ea3c6aa7 100644 --- a/app/views/news/_form.rhtml +++ b/app/views/news/_form.rhtml @@ -5,16 +5,4 @@ <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p> </div> -<% if Setting.text_formatting == 'textile' %> -<%= javascript_include_tag 'jstoolbar' %> -<script type="text/javascript"> -//<![CDATA[ -if (document.getElementById) { - if (document.getElementById('news_description')) { - var commentTb = new jsToolBar(document.getElementById('news_description')); - commentTb.draw(); - } -} -//]]> -</script> -<% end %>
\ No newline at end of file +<%= wikitoolbar_for 'news_description' %> diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml index f39018cc8..839275373 100644 --- a/app/views/projects/add_file.rhtml +++ b/app/views/projects/add_file.rhtml @@ -7,9 +7,7 @@ <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label> <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p> -<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) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> +<%= render :partial => 'attachments/form' %> </div> <%= submit_tag l(:button_add) %> <% end %>
\ No newline at end of file diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml index 36c6d5869..3f1815e38 100644 --- a/app/views/projects/add_issue.rhtml +++ b/app/views/projects/add_issue.rhtml @@ -38,19 +38,7 @@ <%= submit_tag l(:button_create) %> <% end %> -<% if Setting.text_formatting == 'textile' %> -<%= javascript_include_tag 'jstoolbar' %> -<script type="text/javascript"> -//<![CDATA[ -if (document.getElementById) { - if (document.getElementById('issue_description')) { - var commentTb = new jsToolBar(document.getElementById('issue_description')); - commentTb.draw(); - } -} -//]]> -</script> -<% end %> +<%= wikitoolbar_for 'issue_description' %> <% content_for :header_tags do %> <%= javascript_include_tag 'calendar/calendar' %> |