From baab7454626b154b43144c1a07e1962ab083bde2 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Tue, 26 Dec 2017 19:54:43 -0500
Subject: [PATCH] some visual tweaks

---
 public/javascripts/dialogs/edit_tree_prefix.js |  2 +-
 public/javascripts/dialogs/note_history.js     |  5 ++++-
 public/javascripts/tree_changes.js             |  4 +++-
 public/stylesheets/style.css                   |  7 +++++--
 views/index.ejs                                | 16 ++++++++--------
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/public/javascripts/dialogs/edit_tree_prefix.js b/public/javascripts/dialogs/edit_tree_prefix.js
index eb0c36b3d..20d6dab0f 100644
--- a/public/javascripts/dialogs/edit_tree_prefix.js
+++ b/public/javascripts/dialogs/edit_tree_prefix.js
@@ -13,7 +13,7 @@ const editTreePrefix = (function() {
 
         await dialogEl.dialog({
             modal: true,
-            width: 800
+            width: 500
         });
 
         const currentNode = noteTree.getCurrentNode();
diff --git a/public/javascripts/dialogs/note_history.js b/public/javascripts/dialogs/note_history.js
index 8175afcc8..79ae26f89 100644
--- a/public/javascripts/dialogs/note_history.js
+++ b/public/javascripts/dialogs/note_history.js
@@ -29,7 +29,7 @@ const noteHistory = (function() {
         for (const item of historyItems) {
             const dateModified = parseDate(item.date_modified_from);
 
-            $("#note-history-list").append($('<option>', {
+            listEl.append($('<option>', {
                 value: item.note_history_id,
                 text: formatDateTime(dateModified)
             }));
@@ -42,6 +42,9 @@ const noteHistory = (function() {
 
             listEl.val(noteHistoryId).trigger('change');
         }
+        else {
+            titleEl.text("No history for this note yet...");
+        }
     }
 
     $(document).bind('keydown', 'alt+h', e => {
diff --git a/public/javascripts/tree_changes.js b/public/javascripts/tree_changes.js
index d6c11b93e..9c648dbcf 100644
--- a/public/javascripts/tree_changes.js
+++ b/public/javascripts/tree_changes.js
@@ -52,7 +52,7 @@ const treeChanges = (function() {
     }
 
     async function deleteNode(node) {
-        if (!confirm('Are you sure you want to delete note "' + node.title + '"?')) {
+        if (!confirm('Are you sure you want to delete note "' + node.title + '" and all its sub-notes?')) {
             return;
         }
 
@@ -83,6 +83,8 @@ const treeChanges = (function() {
         }
 
         noteTree.reload();
+
+        showMessage("Note has been deleted.");
     }
 
     async function moveNodeUpInHierarchy(node) {
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 11fc24ae7..ceecea70a 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -168,8 +168,7 @@ div.ui-tooltip {
 }
 
 /* Allow to use <kbd> elements inside the title to define shortcut hints. */
-.ui-menu kbd {
-    margin-left: 30px;
+.ui-menu kbd, button kbd {
     float: right;
     color: black;
     border: none;
@@ -177,6 +176,10 @@ div.ui-tooltip {
     box-shadow: none;
 }
 
+.ui-menu kbd {
+    margin-left: 30px;
+}
+
 #note-id-display {
     color: lightgrey;
     margin-left: 10px;
diff --git a/views/index.ejs b/views/index.ejs
index d5b3fffe5..35dd1d627 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -97,7 +97,7 @@
 
           <span id="note-id-display" title="Note ID"></span>
 
-          <button class="btn btn-xs" style="margin: 10px;" onclick="noteHistory.showCurrentNoteHistory();">Note history</button>
+          <button class="btn btn-xs" title="ALT+H" style="margin: 10px;" onclick="noteHistory.showCurrentNoteHistory();">Note history</button>
         </div>
       </div>
 
@@ -113,13 +113,13 @@
       <br/><br/>
 
       <p>
-        <button class="btn btn-sm" id="recent-notes-jump-to">Jump to (enter)</button>
+        <button class="btn btn-sm" id="recent-notes-jump-to">Jump to <kbd>enter</kbd></button>
         &nbsp;
-        <button class="btn btn-sm" id="recent-notes-add-link">Add link (l)</button>
+        <button class="btn btn-sm" id="recent-notes-add-link">Add link <kbd>l</kbd></button>
 
-        <button class="btn btn-sm" id="recent-notes-add-current-as-child">Add current as child (c)</button>
+        <button class="btn btn-sm" id="recent-notes-add-current-as-child">Add current as child <kbd>c</kbd></button>
 
-        <button class="btn btn-sm" id="recent-notes-add-recent-as-child">Add recent as child (r)</button>
+        <button class="btn btn-sm" id="recent-notes-add-recent-as-child">Add recent as child <kbd>r</kbd></button>
       </p>
     </div>
 
@@ -165,7 +165,7 @@
           <input id="jump-to-note-autocomplete" style="width: 100%;">
         </div>
 
-        <button name="action" value="jump" class="btn btn-sm">Jump (enter)</button>
+        <button name="action" value="jump" class="btn btn-sm">Jump <kbd>enter</kbd></button>
       </form>
     </div>
 
@@ -176,7 +176,7 @@
           <input id="protected-session-password" class="form-control" type="password">
         </div>
 
-        <button class="btn btn-sm">Enter protected session</button>
+        <button class="btn btn-sm">Enter protected session <kbd>enter</kbd></button>
       </form>
     </div>
 
@@ -318,7 +318,7 @@
 
     <div id="sql-console-dialog" title="SQL console" style="display: none; padding: 20px;">
       <textarea style="width: 100%; height: 100px" id="sql-console-query"></textarea>
-      <button class="btn btn-danger" id="sql-console-execute">Execute</button>
+      <button class="btn btn-danger" id="sql-console-execute">Execute <kbd>CTRL+ENTER</kbd></button>
 
       <table id="sql-console-results" class="table table-striped" style="overflow: scroll; width: 100%;">
         <thead></thead>