Merge branch 'release/4.1' of github.com:opf/openproject-documents into release/4.1

pull/6827/head
Florian Kraft 9 years ago
commit ba2a5b49d3
  1. 2
      app/views/documents/edit.html.erb
  2. 2
      app/views/documents/new.html.erb
  3. 3
      app/views/documents/show.html.erb

@ -34,5 +34,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @document, url: project_document_path(@document) do |f| -%>
<%= render partial: "documents/form", locals: { f: f } %>
<%= f.submit l(:button_save), class: "button -highlight" %>
<%= styled_button_tag l(:button_save), class: "-highlight -with-icon icon-yes" %>
<% end %>

@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @document, url: project_documents_path(@project), html: { multipart: true } do |f| -%>
<%= render :partial => 'documents/form', locals: { f: f } %>
<%= render :partial => 'attachments/form' %>
<%= f.submit l(:button_create), class: "button -highlight" %>
<%= styled_button_tag l(:button_create), class: "-highlight -with-icon icon-yes" %>
<% end %>

@ -62,7 +62,8 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="box">
<p><%= render :partial => 'attachments/form' %></p>
</div>
<%= submit_tag l(:button_add) %>
<%= styled_button_tag l(:button_add), class: "-highlight -with-icon icon-yes" %>
<% end %>
<% end %>

Loading…
Cancel
Save