From 0817dd48769a8d71bbcd3e7f2f44b5a7221c1562 Mon Sep 17 00:00:00 2001
From: Max Kalika <max.kalika+projects@gmail.com>
Date: Thu, 10 Mar 2016 15:35:58 -0500
Subject: [PATCH] Issue #92: Clean up attribute view title, refresh icon, and
 close functionality.

---
 src/main/resources/assets/css/jmxproxy.css | 10 ++++++++++
 src/main/resources/assets/index.html       | 15 +++++----------
 src/main/resources/assets/js/jmxproxy.js   |  3 +++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/assets/css/jmxproxy.css b/src/main/resources/assets/css/jmxproxy.css
index dbbf8f0..e16f2fb 100644
--- a/src/main/resources/assets/css/jmxproxy.css
+++ b/src/main/resources/assets/css/jmxproxy.css
@@ -48,3 +48,13 @@ div.tooltip-inner {
 div.popover-content {
     word-wrap: break-word;
 }
+
+#mbean-title,
+#attrib-name {
+    font-weight: bold;
+    font-family: monospace;
+}
+
+#mbean-reset {
+    cursor: pointer;
+}
diff --git a/src/main/resources/assets/index.html b/src/main/resources/assets/index.html
index 7b507a3..d32d3d3 100644
--- a/src/main/resources/assets/index.html
+++ b/src/main/resources/assets/index.html
@@ -393,11 +393,9 @@ <h3>&#X2190; please select an mbean</h3>
                             <div id="mbeans-data" class="repeater hidden">
                                 <div class="repeater-header">
                                     <div class="repeater-header-left">
-                                        <div class="repeater-title btn-group">
-                                            <button id="mbean-reset" class="btn btn-default" type="button" title="Refresh" data-toggle="tooltip" data-placement="bottom">
-                                                <span class="glyphicon glyphicon-refresh"></span>
-                                            </button>
-                                            <button id="mbean-title" class="btn btn-default disabled" type="button"></button>
+                                        <div class="repeater-title">
+                                            <span id="mbean-title" class="text-primary"></span>
+                                            <span id="mbean-reset" class="glyphicon glyphicon-refresh" title="Refresh" data-toggle="tooltip" data-placement="bottom"></span>
                                         </div>
                                     </div>
                                     <div class="repeater-header-right">
@@ -475,8 +473,8 @@ <h3>&#X2190; please select an mbean</h3>
                     <div class="modal-body">
                         <div id="attrib-data" class="repeater">
                             <div class="repeater-header">
-                                <div class="releater-header-left">
-                                    <h4 id="attrib-name" class="repeater-title">&nbsp;</h4>
+                                <div class="repeater-header-left">
+                                    <span id="attrib-name" class="repeater-title text-primary"></span>
                                 </div>
                                 <div class="repeater-header-right">
                                     <div class="repeater-search">
@@ -489,9 +487,6 @@ <h4 id="attrib-name" class="repeater-title">&nbsp;</h4>
                                             </span>
                                         </div>
                                     </div>
-                                    <a class="btn btn-danger" title="Close" data-dismiss="modal" data-toggle="tooltip" data-placement="bottom">
-                                        <i class="fa fa-times"></i>
-                                    </a>
                                 </div>
                             </div>
                             <div class="repeater-viewport">
diff --git a/src/main/resources/assets/js/jmxproxy.js b/src/main/resources/assets/js/jmxproxy.js
index a6039b0..20d385e 100644
--- a/src/main/resources/assets/js/jmxproxy.js
+++ b/src/main/resources/assets/js/jmxproxy.js
@@ -782,6 +782,7 @@ var endpointHostClass = function(prefix, host) {
             });
         }
     };
+
     var checkHost = function() {
         $('#welcome-banner, #endpoint-select').addClass('hidden');
         $('#endpoint-navbar, #endpoint-loader').removeClass('hidden');
@@ -831,6 +832,8 @@ $(document).ready(function() {
             } else {
                 $('#endpoint-tabs li.active').next().find('a').tab('show');
             }
+        } else if (e.which == 27) { // escape
+            $('#attrib-modal').modal('hide');
         }
     });