From 63793adc9c1aa1c3b69b9d1f6160840dcee71768 Mon Sep 17 00:00:00 2001
From: Marius BALTEANU <marius.balteanu@zitec.com>
Date: Tue, 26 Feb 2019 07:33:10 +0000
Subject: Adds "Add notes" link to issue page to add only notes

Signed-off-by: Jose Esteves <jose@ceibo.co>
---
 app/views/issues/_action_menu.html.erb      |  5 ++++-
 app/views/issues/_action_menu_edit.html.erb |  2 +-
 app/views/issues/_edit.html.erb             |  8 ++++----
 config/locales/en.yml                       |  1 +
 public/javascripts/application.js           | 14 ++++++++++++++
 public/stylesheets/application.css          |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index b535faec9..de255bc33 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -1,5 +1,8 @@
 <div class="contextual">
-<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
+<% if @issue.editable? %>
+  <%= link_to l(:button_add_notes), edit_issue_path(@issue), :onclick => 'showAndScrollToAddNotes(); return false;', :class => 'icon icon-add' %>
+  <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollToEditIssue(); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
+<% end %>
 <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
 <%= watcher_link(@issue, User.current) %>
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
diff --git a/app/views/issues/_action_menu_edit.html.erb b/app/views/issues/_action_menu_edit.html.erb
index a189d7c45..322726c37 100644
--- a/app/views/issues/_action_menu_edit.html.erb
+++ b/app/views/issues/_action_menu_edit.html.erb
@@ -3,7 +3,7 @@
 
 <div style="clear: both;"></div>
 <% if @issue.editable? %>
-  <div id="update" style="display:none;">
+  <div id="update" class="hidden">
     <h3><%= l(:button_edit) %></h3>
     <%= render :partial => 'edit' %>
   </div>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 00dcac5fb..0e2761723 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -3,14 +3,14 @@
     <%= render :partial => 'conflict' if @conflict %>
     <div class="box">
     <% if @issue.attributes_editable? %>
-        <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
+        <fieldset id="attributes" class="tabular"><legend><%= l(:label_change_properties) %></legend>
         <div id="all_attributes">
         <%= render :partial => 'form', :locals => {:f => f} %>
         </div>
         </fieldset>
     <% end %>
     <% if User.current.allowed_to?(:log_time, @project) %>
-        <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
+        <fieldset id="log_time" class="tabular"><legend><%= l(:button_log_time) %></legend>
         <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
         <div class="splitcontent">
         <div class="splitcontentleft">
@@ -28,7 +28,7 @@
     </fieldset>
     <% end %>
     <% if @issue.notes_addable? %>
-      <fieldset><legend><%= l(:field_notes) %></legend>
+      <fieldset id="add_notes"><legend><%= l(:field_notes) %></legend>
       <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
             :data => {
                 :auto_complete => true,
@@ -44,7 +44,7 @@
       <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
       </fieldset>
 
-      <fieldset><legend><%= l(:label_attachment_plural) %></legend>
+      <fieldset id="add_attachments"><legend><%= l(:label_attachment_plural) %></legend>
         <% if @issue.attachments.any? && @issue.safe_attribute?('deleted_attachment_ids') %>
         <div class="contextual"><%= link_to l(:label_edit_attachments), '#', :onclick => "$('#existing-attachments').toggle(); return false;" %></div>
         <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fcc2262a..5bee65dc2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1087,6 +1087,7 @@ en:
   button_edit: Edit
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
   button_add: Add
+  button_add_notes: Add notes
   button_change: Change
   button_apply: Apply
   button_clear: Clear
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e125e68b4..a851ed8e1 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -28,6 +28,20 @@ function showAndScrollTo(id, focus) {
   $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
 }
 
+function showAndScrollToEditIssue() {
+  $('#update h3').show();
+  $('#attributes').show();
+  $('#log_time').show();
+  showAndScrollTo('update', 'issue_notes');
+}
+
+function showAndScrollToAddNotes() {
+  $('#update h3').hide();
+  $('#attributes').hide();
+  $('#log_time').hide();
+  showAndScrollTo('update', 'issue_notes');
+}
+
 function toggleRowGroup(el) {
   var tr = $(el).parents('tr').first();
   var n = tr.next();
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 40bdeb1d2..8bedc5861 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -128,7 +128,7 @@ div.modal p.buttons {text-align:right; margin-bottom:0;}
 div.modal .box p {margin: 0.3em 0;}
 
 .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-
+.hidden {display: none;}
 .mobile-show {display: none;}
 
 /***** Links *****/
-- 
2.20.1