Redmine 3.4.4

app/views/journals/_notes_form.html.erb

@@ -0,0 +1,24 @@
+<%= form_tag(journal_path(@journal),
+             :remote => true,
+             :method => 'put',
+             :id => "journal-#{@journal.id}-form") do %>
+    <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted", :for => "journal_#{@journal.id}_notes" %>
+    <%= text_area_tag 'journal[notes]', @journal.notes,
+          :id => "journal_#{@journal.id}_notes",
+          :class => 'wiki-edit',
+          :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <% if @journal.safe_attribute? 'private_notes' %>
+      <%= hidden_field_tag 'journal[private_notes]', '0' %>
+      <%= check_box_tag 'journal[private_notes]', '1', @journal.private_notes, :id => "journal_#{@journal.id}_private_notes" %>
+      <label for="journal_<%= @journal.id %>_private_notes"><%= l(:field_private_notes) %></label>
+    <% end %>
+    <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
+    <p><%= submit_tag l(:button_save) %>
+    <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @journal.issue), 
+                     "journal-#{@journal.id}-form",
+                     "journal_#{@journal.id}_preview" %> |
+    <%= link_to l(:button_cancel), '#', :onclick => "$('#journal-#{@journal.id}-form').remove(); $('#journal-#{@journal.id}-notes').show(); return false;" %></p>
+
+    <div id="journal_<%= @journal.id %>_preview" class="wiki"></div>
+<% end %>
+<%= wikitoolbar_for "journal_#{@journal.id}_notes" %>

app/views/journals/diff.html.erb

@@ -0,0 +1,13 @@
+<h2><%= @issue.tracker %> #<%= @issue.id %></h2>
+<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
+
+<div class="text-diff">
+<%= simple_format_without_paragraph @diff.to_html %>
+</div>
+
+<p>
+  <%= link_to(l(:button_back), issue_path(@issue),
+              :onclick => 'if (document.referrer != "") {history.back(); return false;}') %>
+</p>
+
+<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>

app/views/journals/edit.js.erb

@@ -0,0 +1,8 @@
+$("#journal-<%= @journal.id %>-notes").hide();
+
+if ($("form#journal-<%= @journal.id %>-form").length > 0) {
+  // journal edit form already loaded
+  $("#journal-<%= @journal.id %>-form").show();
+} else {
+  $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
+}

app/views/journals/index.builder

@@ -0,0 +1,31 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title   @title
+  xml.link    "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
+  xml.link    "rel" => "alternate", "href" => home_url
+  xml.id      home_url
+  xml.icon    favicon_url
+  xml.updated((@journals.first ? @journals.first.event_datetime : Time.now).xmlschema)
+  xml.author  { xml.name "#{Setting.app_title}" }
+  @journals.each do |change|
+    issue = change.issue
+    xml.entry do
+      xml.title   "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
+      xml.link    "rel" => "alternate", "href" => issue_url(issue)
+      xml.id      issue_url(issue, :journal_id => change)
+      xml.updated change.created_on.xmlschema
+      xml.author do
+        xml.name change.user.name
+        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
+      end
+      xml.content "type" => "html" do
+        xml.text! '<ul>'
+        details_to_strings(change.visible_details, false).each do |string|
+          xml.text! '<li>' + string + '</li>'
+        end
+        xml.text! '</ul>'
+        xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
+      end
+    end
+  end
+end

app/views/journals/new.js.erb

@@ -0,0 +1,13 @@
+showAndScrollTo("update");
+
+var notes = $('#issue_notes').val();
+if (notes > "") { notes = notes + "\n\n"}
+
+$('#issue_notes').blur().focus().val(notes + "<%= raw escape_javascript(@content) %>");
+<%
+  # when quoting a private journal, check the private checkbox
+  if @journal && @journal.private_notes? 
+%>
+$('#issue_private_notes').prop('checked', true);
+<% end %>
+

app/views/journals/update.js.erb

@@ -0,0 +1,11 @@
+<% if @journal.frozen? %>
+  $("#change-<%= @journal.id %>").remove();
+<% else %>
+  $("#change-<%= @journal.id %>").attr('class', '<%= @journal.css_classes %>');
+  $("#journal-<%= @journal.id %>-notes").replaceWith('<%= escape_javascript(render_notes(@journal.issue, @journal, :reply_links => authorize_for('issues', 'edit'))) %>');
+  $("#journal-<%= @journal.id %>-private_notes").replaceWith('<%= escape_javascript(render_private_notes_indicator(@journal)) %>');
+  $("#journal-<%= @journal.id %>-notes").show();
+  $("#journal-<%= @journal.id %>-form").remove();
+<% end %>
+
+<%= call_hook(:view_journals_update_js_bottom, { :journal => @journal }) %>