chore(tickets): added description for inline images

polonel · Jan 25, 2019 · 88409c1 · 88409c1
1 parent a7e66c7
commit 88409c1
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 6 deletions.
diff --git a/src/public/js/angularjs/controllers/singleTicket.js b/src/public/js/angularjs/controllers/singleTicket.js
@@ -93,6 +93,19 @@ define([
         }
       ]
 
+      function attachFileDesc (textarea) {
+        var $el = $(textarea)
+        var attachFileDiv = $('<div></div>')
+        attachFileDiv
+          .addClass('attachFileDesc')
+          .html('<p>Attach images by dragging & dropping or pasting from clipboard.</p>')
+        $el.siblings('.CodeMirror').addClass('hasFileDesc')
+        $el
+          .siblings('.editor-statusbar')
+          .addClass('hasFileDesc')
+          .prepend(attachFileDiv)
+      }
+
       var $editIssueText = $('#edit-issue-text')
       var editIssueTextMDE = null
       if ($editIssueText.length > 0) {
@@ -141,6 +154,8 @@ define([
         urlText: '![Image]({filename})'
       })
 
+      // attachFileDesc($editIssueText)
+
       $scope.showEditWindow = function (type, showSubject, commentNoteId) {
         var $editWindow = $('#edit-ticket-window')
         if ($editWindow.length < 1) return false
@@ -282,6 +297,8 @@ define([
           jsonFieldName: 'filename',
           urlText: '![Image]({filename})'
         })
+
+        attachFileDesc($commentReply)
       }
 
       var $ticketNote = $('#ticket-note')
@@ -328,6 +345,8 @@ define([
           jsonFieldName: 'filename',
           urlText: '![Image]({filename})'
         })
+
+        attachFileDesc($ticketNote)
       }
 
       // Setup Assignee Drop based on Status

diff --git a/src/public/js/angularjs/controllers/tickets.js b/src/public/js/angularjs/controllers/tickets.js
@@ -90,6 +90,19 @@ define([
         }
       ]
 
+      function attachFileDesc (textarea) {
+        var $el = $(textarea)
+        var attachFileDiv = $('<div></div>')
+        attachFileDiv
+          .addClass('attachFileDesc')
+          .html('<p>Attach images by dragging & dropping or pasting from clipboard.</p>')
+        $el.siblings('.CodeMirror').addClass('hasFileDesc')
+        $el
+          .siblings('.editor-statusbar')
+          .addClass('hasFileDesc')
+          .prepend(attachFileDiv)
+      }
+
       var $issueTextarea = $('textarea#issue:not(.hasMDE)')
       var issueTextMDE = null
       if ($issueTextarea.length > 0) {
@@ -141,6 +154,8 @@ define([
           jsonFieldName: 'filename',
           urlText: '![Image]({filename})'
         })
+
+        attachFileDesc($issueTextarea)
       }
 
       $scope.openFilterTicketWindow = function () {

diff --git a/src/sass/partials/easymde.sass b/src/sass/partials/easymde.sass
@@ -5,10 +5,12 @@ form#createTicketForm
 .CodeMirror
   //height: 250px
   height: auto
-  border-radius: 0
+  border-radius: 0 !important
   border-color: $page_content_border_color
   background: $page_content_right_bg
   color: automatic-text-color($page_content_right_bg)
+  &.hasFileDesc
+    border-bottom: 1px dashed $page_content_border_color
 .CodeMirror-fullscreen
   z-index: 20 !important
 
@@ -40,6 +42,19 @@ form#createTicketForm
   &:after
     margin-top: 0
 
+.editor-statusbar
+  &.hasFileDesc
+    border: 1px solid $page_content_border_color
+    border-top-width: 0
+    background: darken($page_content_right_bg, 1%)
+  .attachFileDesc
+    display: inline-block
+    float: left
+    p
+      margin: 0
+      font-size: 12px
+      color: automatic-text-color($page_content_right_bg, 'muted')
+
 .mi-bold:after,
 .mi-italic:after,
 .mi-title:after,

diff --git a/src/views/partials/createTicketWindow.hbs b/src/views/partials/createTicketWindow.hbs
@@ -50,9 +50,9 @@
 
             <div class="uk-margin-medium-bottom">
                 <span>Description</span>
-                <div class="error-border-wrap">
+                <div class="error-border-wrap uk-clearfix">
                     <textarea id="issue" name="issue"></textarea>
-                    <div class="editor-statusbar uk-float-left nopadding-left"></div>
+                    <div class="editor-statusbar uk-float-left uk-width-1-1"></div>
                 </div>
                 <span style="display: inline-block; margin-top: 6px; font-size: 11px;" class="uk-text-muted">Please try to be as specific as possible. Please include any details you think may be relevant, such as troubleshooting steps you've taken.</span>
             </div>

diff --git a/src/views/subviews/singleticket.hbs b/src/views/subviews/singleticket.hbs
@@ -517,9 +517,6 @@
                                             <!--<label for="commentReply" class="uk-form-label">Comment</label>-->
                                             <textarea name="commentReply" id="commentReply" cols="2" rows="5" data-clearOnSubmit="true" class="comment-textarea"
                                                       data-keyBindSubmit="#comment-reply-submit-button"
-                                                      data-validation="length"
-                                                      data-validation-length="min5"
-                                                      data-validation-error-msg="Please enter a valid comment. Comments must contain at least 5 characters."
                                                       style="background: inherit; border-width: 0; border-bottom-width: 1px;"></textarea>
                                         </div>
                                         <div class="uk-width-1-1">