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-416 Cleanup disconnected error message. Also some unrelated css cleanup
Date Thu, 07 Jul 2016 16:46:36 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 62d389956 -> c3c557a91


DISPATCH-416 Cleanup disconnected error message. Also some unrelated css cleanup


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

Branch: refs/heads/master
Commit: c3c557a913e3fc9060ec07fe6e835a4796eb9cd7
Parents: 62d3899
Author: Ernest Allen <eallen@redhat.com>
Authored: Thu Jul 7 12:45:38 2016 -0400
Committer: Ernest Allen <eallen@redhat.com>
Committed: Thu Jul 7 12:46:16 2016 -0400

----------------------------------------------------------------------
 .../src/main/webapp/plugin/css/dispatch.css     | 35 +++++++++++++++++---
 .../src/main/webapp/plugin/css/plugin.css       |  7 +++-
 .../src/main/webapp/plugin/html/qdrConnect.html |  3 +-
 .../src/main/webapp/plugin/js/qdrService.js     |  5 ++-
 .../src/main/webapp/plugin/js/qdrSettings.js    | 14 +++++---
 5 files changed, 49 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c3c557a9/console/hawtio/src/main/webapp/plugin/css/dispatch.css
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/css/dispatch.css b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
index d0d6ba2..cb050e6 100644
--- a/console/hawtio/src/main/webapp/plugin/css/dispatch.css
+++ b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
@@ -171,24 +171,34 @@ text.label {
   /*height: 100%; */
 }
 
-/*, div.qdrTopology div#multiple_details .ngViewport*/
 div#topologyForm .ngViewport, div#topologyForm .gridStyle {
     height: inherit !important;
 	min-height: initial !important;
 	overflow: initial;
 }
 
-div#multiple_details {
+div#multiple_details, div#link_details {
 	height: 300px;
-	width: 500px;
+	width: 600px;
 	display: none;
-	padding: 1em;
+	padding: 0.5em;
     border: 1px solid;
 	position: absolute;
 	background-color: white;
 	max-height: 330px !important;
     overflow: hidden;
 }
+div#multiple_details div.ngRow.selected {
+	background-color: #c9dde1 !important;
+}
+
+div.grid-values {
+	text-align: right;
+}
+
+div.grid-values.ngCellText span {
+	padding-right: 4px;
+}
 
 .panel-adjacent {
   margin-left: 430px;
@@ -554,6 +564,13 @@ circle.subcircle {
     height: auto !important;
 }
 
+#multiple_details .gridCellButton button, #link_details .gridCellButton button {
+    margin: .25em .4em;
+    font-size: 12px;
+    height: 2em;
+	padding-top: .1em;
+}
+
 #linkFilter {
 	display: none;
 	padding: 0.5em;
@@ -596,3 +613,13 @@ a.dynatree-title:hover button.btn-filter {
 div.hdash-button a {
 	color: white;
 }
+
+.linkDirIn {
+	color: red;
+	background-color: #f3f3f3;
+}
+
+.linkDirOut {
+	color: blue;
+	background-color: white;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c3c557a9/console/hawtio/src/main/webapp/plugin/css/plugin.css
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/css/plugin.css b/console/hawtio/src/main/webapp/plugin/css/plugin.css
index d6c9aa2..316039b 100644
--- a/console/hawtio/src/main/webapp/plugin/css/plugin.css
+++ b/console/hawtio/src/main/webapp/plugin/css/plugin.css
@@ -620,7 +620,7 @@ div.login.container {
 }
 
 .connect-column.connect-form {
-	width: 30em;
+	width: 20em;
 }
 
 .chartLabels button a {
@@ -673,6 +673,11 @@ span:not(.dynatree-has-children).connection.external .dynatree-icon:before,
 span:not(.dynatree-has-children).connection.normal .dynatree-icon:before {
     content: "\f08e";
 }
+span:not(.dynatree-has-children).connection.external.quiesced .dynatree-icon:before {
+	content: "\f14c";
+	color: red;
+}
+
 span:not(.dynatree-has-children).connection.inter-router .dynatree-icon:before {
      content: "\f152";
 }

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c3c557a9/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html b/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
index 845528f..cce04a5 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
@@ -47,7 +47,7 @@ under the License.
                           <div class="control-group" ng-show="true">
                               <label tabindex="-1" class="control-label" title="Ports
to connect to, by default 5673">Port: </label>
                               <div class="controls">
-                                  <input tabindex="2" posint required 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">
+                                  <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.posint">Positive
integers only</span>
                               </div>
                           </div>
@@ -65,7 +65,6 @@ under the License.
                           </div>
                       </fieldset>
                   </form>
-
               </div>
           </div>
       </div>

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c3c557a9/console/hawtio/src/main/webapp/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
index 164e6cb..e67875b 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
@@ -794,10 +794,9 @@ var QDR = (function(QDR) {
 				okay.sender = false;
 			})
 			connection.on('disconnected', function (context) {
-				onDisconnect();
-				self.errorText = "Error: Connection failed"
-				self.executeDisconnectActions();
+				self.errorText = "Connection failed"
 				self.connectionError = true;
+				onDisconnect();
 			})
 			connection.on('connection_close', function (context) {
 				onDisconnect();

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c3c557a9/console/hawtio/src/main/webapp/plugin/js/qdrSettings.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrSettings.js b/console/hawtio/src/main/webapp/plugin/js/qdrSettings.js
index 518229d..28167c5 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrSettings.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrSettings.js
@@ -55,13 +55,18 @@ var QDR = (function (QDR) {
     $scope.connect = function() {
 		if (QDRService.connected) {
 			QDRService.disconnect();
-			return;
+		return;
 		}
 
-      if ($scope.settings.$valid) {
-        $scope.connectionError = false;
-        $scope.connecting = true;
+		if ($scope.settings.$valid) {
+			$scope.connectionError = false;
+			$scope.connecting = true;
 
+			setTimeout(doConnect, 100)
+		}
+	}
+
+	var doConnect = function () {
         if (!$scope.formEntity.address)
             $scope.formEntity.address = "localhost"
 
@@ -91,7 +96,6 @@ var QDR = (function (QDR) {
 
         QDRService.connect($scope.formEntity);
       }
-    };
 
   }]);
 


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


Mime
View raw message