Issue #92: Clean up attribute view title, refresh icon, and close fun…

…ctionality.
mk23 · Mar 10, 2016 · 0817dd4 · 0817dd4
1 parent 395c1df
commit 0817dd4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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');
         }
     });