diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 2cbff32..ac98b98 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -128,6 +128,9 @@ end %>
+ <%= link_to l('button_add_notes'), {}, :id => "add-note", :class => "icon icon-comment", :onclick => "showAddNotesForm(); return false;"%>
+
+
+ <%= labelled_form_for @issue, :html => {:id => 'journal-new-form', :multipart => true} do |f| %>
+
+
+
+
<%= submit_tag l(:button_submit) %>
+ <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue),
+ "journal-new-form",
+ "journal_new_preview" %> |
+ <%= link_to l(:button_cancel), '#', :onclick => "hideAddNotesForm(); return false;" %>
+
+
+<% end %>
+<%= wikitoolbar_for "journal_new_notes" %>
+
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56a06c7..09323fa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1057,6 +1057,7 @@ en:
button_reopen: Reopen
button_import: Import
button_filter: Filter
+ button_add_notes: Add notes
status_active: active
status_registered: registered
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 64d3e8e..7c05867 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -730,6 +730,15 @@ function toggleDisabledInit() {
$('input[data-disables], input[data-enables], input[data-shows]').each(toggleDisabledOnChange);
}
+function showAddNotesForm(){
+ $('#journal-new-form').show().find('#journal_new_notes').focus();
+ $("a#add-note").hide();
+}
+function hideAddNotesForm(){
+ $('#journal-new-form').hide();
+ $('#add-note').show();
+}
+
function toggleNewObjectDropdown() {
var dropdown = $('#new-object + ul.menu-children');
if(dropdown.hasClass('visible')){
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index c5e6b96..a15d4ea 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -1,9 +1,8 @@
/* Redmine - project management software
Copyright (C) 2006-2016 Jean-Philippe Lang */
-
function addFile(inputEl, file, eagerUpload) {
-
- if ($('#attachments_fields').children().length < 10) {
+ var attachmentsField = $(inputEl).parents('form').find('#attachments_fields')
+ if (attachmentsField.children().length < 10) {
var attachmentId = addFile.nextAttachmentId++;
@@ -13,7 +12,7 @@ function addFile(inputEl, file, eagerUpload) {
$('