activemq-artemis git commit: ARTEMIS-2114 hawtio dest delete/purge buttons overlap if pane resized

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

activemq-artemis git commit: ARTEMIS-2114 hawtio dest delete/purge buttons overlap if pane resized

nigrofranz
Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 2242d2447 -> 1cbeaf14b


ARTEMIS-2114 hawtio dest delete/purge buttons overlap if pane resized

Changing the view layout from horizontal to vertical avoid the resizing
issue

(cherry picked from commit d603332a8f23b86bf08bf3992c9e584bf9a212b7)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1cbeaf14
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1cbeaf14
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1cbeaf14

Branch: refs/heads/2.6.x
Commit: 1cbeaf14b909da6e7c7f6ba99624cbf444e9b181
Parents: 2242d24
Author: Francesco Nigro <[hidden email]>
Authored: Mon Oct 8 15:54:12 2018 +0200
Committer: Francesco Nigro <[hidden email]>
Committed: Tue Oct 9 13:50:48 2018 +0200

----------------------------------------------------------------------
 .../main/webapp/plugin/html/deleteQueue.html    | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1cbeaf14/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteQueue.html
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteQueue.html b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteQueue.html
index 9caa7c3..3f881c6 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteQueue.html
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteQueue.html
@@ -24,19 +24,22 @@
         <strong>Warning:</strong> these operations cannot be undone. Please be careful!
       </div>
     </div>
+    <h4>Queue '{{name().unescapeHTML()}}'</h4>
   </div>
   <div class="row-fluid">
-    <div class="span4">
-      <div class="control-group">
-        <button type="submit" class="btn btn-warning" ng-click="deleteDialog = true">Delete queue '{{name().unescapeHTML()}}'</button>
-        <label>This will remove the queue completely.</label>
-      </div>
+    <div class="control-group">
+      <hr>
+      <h5>Purge queue</h5>
+      <p>Purge all the current messages on the queue.</p>
+      <button type="submit" class="btn btn-warning" ng-click="purgeDialog = true">Purge queue</button>
     </div>
-    <div class="span4">
-      <div class="control-group">
-        <button type="submit" class="btn btn-warning" ng-click="purgeDialog = true">Purge queue '{{name().unescapeHTML()}}'</button>
-        <label>Purges all the current messages on the queue.</label>
-      </div>
+  </div>
+  <div class="row-fluid">
+    <div class="control-group">
+      <hr>
+      <h5>Delete queue</h5>
+      <p>Remove the queue completely.</p>
+      <button type="submit" class="btn btn-warning" ng-click="deleteDialog = true">Delete queue</button>
     </div>
   </div>