From 06fe7f0da77f627b939a0a11b5d503391e8b3a58 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Thu, 28 Sep 2017 08:09:15 -0300
Subject: [PATCH] Improving User Preferences dialog

---
 Packages/ohif-hotkeys/client/components/form.html           | 1 +
 Packages/ohif-hotkeys/client/components/form.js             | 3 ++-
 Packages/ohif-hotkeys/client/components/formTable.html      | 2 +-
 .../client/components/viewer/windowLevelPresets/form.html   | 6 +++---
 .../client/components/viewer/windowLevelPresets/form.js     | 3 ++-
 Packages/ohif-viewerbase/client/lib/hotkeyUtils.js          | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Packages/ohif-hotkeys/client/components/form.html b/Packages/ohif-hotkeys/client/components/form.html
index 60e610d4c..185b8b1f1 100644
--- a/Packages/ohif-hotkeys/client/components/form.html
+++ b/Packages/ohif-hotkeys/client/components/form.html
@@ -15,6 +15,7 @@
         <div class="form-buttons clearfix">
             {{#button class='btn btn-danger pull-left' action='resetDefaults'}}Reset to Defaults{{/button}}
             {{#button class='btn btn-primary pull-right' action='save'}}Save{{/button}}
+            {{#button class='btn btn-default pull-right m-r-1' tagAttributes=(extend '' data-dismiss='modal')}}Cancel{{/button}}
         </div>
     {{/form}}
 </template>
diff --git a/Packages/ohif-hotkeys/client/components/form.js b/Packages/ohif-hotkeys/client/components/form.js
index 21e812e71..1bae95c4a 100644
--- a/Packages/ohif-hotkeys/client/components/form.js
+++ b/Packages/ohif-hotkeys/client/components/form.js
@@ -17,7 +17,8 @@ Template.hotkeysForm.onCreated(() => {
         resetDefaults() {
             const { contextName } = instance.data;
             const dialogOptions = {
-                title: 'Reset Shortcuts to Default',
+                class: 'themed',
+                title: 'Reset Keyboard Shortcuts',
                 message: 'Are you sure you want to reset all the shortcuts to their defaults?'
             };
 
diff --git a/Packages/ohif-hotkeys/client/components/formTable.html b/Packages/ohif-hotkeys/client/components/formTable.html
index 2d4eba5c9..e0039c7d5 100644
--- a/Packages/ohif-hotkeys/client/components/formTable.html
+++ b/Packages/ohif-hotkeys/client/components/formTable.html
@@ -3,7 +3,7 @@
         <thead>
             <tr>
                 <th class="text-right p-r-1">Function</th>
-                <th>Shortcut</th>
+                <th class="text-center">Shortcut</th>
             </tr>
         </thead>
         <tbody>
diff --git a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
index c309df535..d7a126bfe 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
+++ b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
@@ -6,8 +6,8 @@
                     <tr>
                         <th class="p-x-1 text-center">Preset</th>
                         <th class="p-x-1">Description</th>
-                        <th class="p-x-1">Window Level (WL)</th>
-                        <th class="p-x-1">Window Width (WW)</th>
+                        <th class="p-x-1">Window</th>
+                        <th class="p-x-1">Level</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -15,8 +15,8 @@
                         {{#group base='baseTr' key=(concat @index)}}
                             <td class="p-x-1 text-center">{{sum @index 1}}</td>
                             <td class="p-x-1">{{>inputText key='id' value=presetInputInformation.id}}</td>
-                            <td class="p-x-1">{{>inputText key='wc' value=(filterNaN presetInputInformation.wc) dataType='Number'}}</td>
                             <td class="p-x-1">{{>inputText key='ww' value=(filterNaN presetInputInformation.ww) dataType='Number'}}</td>
+                            <td class="p-x-1">{{>inputText key='wc' value=(filterNaN presetInputInformation.wc) dataType='Number'}}</td>
                         {{/group}}
                     {{/each}}
                 </tbody>
diff --git a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js
index 4e74c78c6..4413c7c1f 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js
@@ -15,7 +15,8 @@ Template.windowLevelPresetsForm.onCreated(() => {
 
         resetDefaults() {
             const dialogOptions = {
-                title: 'Reset Window Level Presets to Default',
+                class: 'themed',
+                title: 'Reset Window/Levels Presets',
                 message: 'Are you sure you want to reset all the window level presets to their defaults?'
             };
 
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index f2718bcca..5f9cdcaa9 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -107,7 +107,7 @@ Meteor.startup(function() {
 
     // Register the tool switching commands
     registerToolCommands({
-        wwwc: 'Window W/L',
+        wwwc: 'W/L',
         zoom: 'Zoom',
         angle: 'Angle Measurement',
         dragProbe: 'Pixel Probe',