You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/10/09 00:45:28 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2114 hawtio dest
delete/purge buttons overlap if pane resized
Repository: activemq-artemis
Updated Branches:
refs/heads/master 65feda8e9 -> 545a17920
ARTEMIS-2114 hawtio dest delete/purge buttons overlap if pane resized
Changing the view layout from horizontal to vertical avoid the resizing
issue
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d603332a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d603332a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d603332a
Branch: refs/heads/master
Commit: d603332a8f23b86bf08bf3992c9e584bf9a212b7
Parents: 65feda8
Author: Francesco Nigro <ni...@gmail.com>
Authored: Mon Oct 8 15:54:12 2018 +0200
Committer: Francesco Nigro <ni...@gmail.com>
Committed: Mon Oct 8 16:28:41 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/d603332a/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>
[2/2] activemq-artemis git commit: This closes #2349
Posted by cl...@apache.org.
This closes #2349
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/545a1792
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/545a1792
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/545a1792
Branch: refs/heads/master
Commit: 545a17920f8ede2d8f65a719cf5fd40457d898ac
Parents: 65feda8 d603332
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 8 20:45:23 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 8 20:45:23 2018 -0400
----------------------------------------------------------------------
.../main/webapp/plugin/html/deleteQueue.html | 23 +++++++++++---------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------