qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eal...@apache.org
Subject qpid-dispatch git commit: DISPATCH-487 Add Quiesce column header
Date Tue, 30 Aug 2016 00:07:16 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 80c0eed51 -> 9683f5a7b


DISPATCH-487 Add Quiesce column header


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9683f5a7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9683f5a7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9683f5a7

Branch: refs/heads/master
Commit: 9683f5a7b99beb012aa8bfde8d7f71031f7c092d
Parents: 80c0eed
Author: Ernest Allen <eallen@redhat.com>
Authored: Mon Aug 29 20:06:57 2016 -0400
Committer: Ernest Allen <eallen@redhat.com>
Committed: Mon Aug 29 20:06:57 2016 -0400

----------------------------------------------------------------------
 console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js | 4 +++-
 console/stand-alone/plugin/html/qdrConnect.html            | 6 +++---
 console/stand-alone/plugin/js/qdrOverview.js               | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9683f5a7/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 44ff2c6..ea3f1a9 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -188,7 +188,9 @@ var QDR = (function(QDR) {
 			if (curPath === QDR.pluginRoot && (!org || org.length===0 || org !== 'connect'))
{
 				org = lastLocation
 			}
-			if (org && org.length > 0) {
+			if (org === 'connect')
+				$location.search('org', null);
+			else if (org && org.length > 0) {
 				$location.search('org', org)
 			}
 		}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9683f5a7/console/stand-alone/plugin/html/qdrConnect.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrConnect.html b/console/stand-alone/plugin/html/qdrConnect.html
index 2ea3afa..270a4be 100644
--- a/console/stand-alone/plugin/html/qdrConnect.html
+++ b/console/stand-alone/plugin/html/qdrConnect.html
@@ -38,19 +38,19 @@ under the License.
               <div class="connect-column connect-form">
                   <form class="hawtio-form form-horizontal no-bottom-margin" novalidate
ng-submit="connect()" name="settings">
                       <fieldset>
-                          <div class="control-group" ng-show="true">
+                          <div class="control-group">
                               <label class="strong control-label">Address: </label>
                               <div class="controls">
                                   <input tabindex="1" type="text" ng-model="formEntity.address"
placeholder="localhost" name="address" autofocus="autofocus" class="ng-pristine ng-valid ng-valid-required"></div>
                           </div>
-                          <div class="control-group" ng-show="true">
+                          <div class="control-group">
                               <label tabindex="-1" class="control-label" title="Ports
to connect to, by default 5673">Port: </label>
                               <div class="controls">
                                   <input tabindex="2" posint type="number" placeholder="5673"
tooltip="Ports to connect to, by default 5673" ng-model="formEntity.port" name="port" title="Ports
to connect to, by default 5673">
                                   <span ng-show="settings.port.$error.range">Must be
1 through 65535</span>
                               </div>
                           </div>
-                          <div class="control-group" ng-show="true">
+                          <div class="control-group">
                               <label tabindex="-1" class="control-label" title="Whether
or not the connection should be started as soon as you log into hawtio">Autostart: </label>
                               <div class="controls">
                                   <input tabindex="3" type="checkbox" tooltip="Whether
or not the connection should be started as soon as you log into hawtio" ng-model="formEntity.autostart"
name="autostart" title="Whether or not the connection should be started as soon as you log
into hawtio"

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9683f5a7/console/stand-alone/plugin/js/qdrOverview.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrOverview.js b/console/stand-alone/plugin/js/qdrOverview.js
index 3312d9f..9c4afad 100644
--- a/console/stand-alone/plugin/js/qdrOverview.js
+++ b/console/stand-alone/plugin/js/qdrOverview.js
@@ -461,6 +461,7 @@ var QDR = (function (QDR) {
 					width: '15%'
 				},
 				{
+					displayName: 'Quiesce',
                     cellClass: 'gridCellButton',
                     cellTemplate: '<button title="{{quiesceLinkText(row)}} this link"
type="button" ng-class="quiesceLinkClass(row)" class="btn" ng-click="quiesceLink(row, $event)"
ng-disabled="quiesceLinkDisabled(row)">{{quiesceLinkText(row)}}</button>',
 					width: '10%'


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message