qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eal...@apache.org
Subject [2/2] qpid-dispatch git commit: DISPATCH-481 Update UI for connection grid and link grid
Date Wed, 24 Aug 2016 20:44:39 GMT
DISPATCH-481 Update UI for connection grid and link grid


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

Branch: refs/heads/master
Commit: 62703d5436f6c181b4fdf0ec14c2aaff97959c2f
Parents: c07648c
Author: Ernest Allen <eallen@redhat.com>
Authored: Wed Aug 24 16:44:05 2016 -0400
Committer: Ernest Allen <eallen@redhat.com>
Committed: Wed Aug 24 16:44:05 2016 -0400

----------------------------------------------------------------------
 console/stand-alone/plugin/css/dispatch.css      | 17 +++++++++++++++++
 console/stand-alone/plugin/html/qdrTopology.html |  2 ++
 console/stand-alone/plugin/js/qdrOverview.js     | 13 +++----------
 console/stand-alone/plugin/js/qdrService.js      | 13 +++++++++++++
 console/stand-alone/plugin/js/qdrTopology.js     | 17 +++--------------
 5 files changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/62703d54/console/stand-alone/plugin/css/dispatch.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/dispatch.css b/console/stand-alone/plugin/css/dispatch.css
index 68847f8..6b253a1 100644
--- a/console/stand-alone/plugin/css/dispatch.css
+++ b/console/stand-alone/plugin/css/dispatch.css
@@ -643,4 +643,21 @@ div.topoGrid .ui-grid-viewport {
 
 .ui-fancytree.fancytree-container {
 	font-size: 14px;
+}
+
+.grid-title {
+    background-color: #FAFAFA;
+    background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+    background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+    background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+    background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#F2F2F2',
GradientType=0);
+    border-bottom: 1px solid #d4d4d4;
+    text-shadow: 0 1px 0 #FFFFFF;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+	margin: 0 0 10px 0;
+    padding-bottom: 4px;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/62703d54/console/stand-alone/plugin/html/qdrTopology.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrTopology.html b/console/stand-alone/plugin/html/qdrTopology.html
index 2c75262..b3046ce 100644
--- a/console/stand-alone/plugin/html/qdrTopology.html
+++ b/console/stand-alone/plugin/html/qdrTopology.html
@@ -73,9 +73,11 @@ under the License.
         </div>
         <div id="svg_legend"></div>
         <div id="multiple_details">
+            <h4 class="grid-title">Connections</h4>
             <div class="gridStyle" ng-grid="multiDetails"></div>
          </div>
         <div id="link_details">
+            <h4 class="grid-title">Links</h4>
             <div class="gridStyle" ng-grid="linkDetails"></div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/62703d54/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 2c75544..0ccc6e8 100644
--- a/console/stand-alone/plugin/js/qdrOverview.js
+++ b/console/stand-alone/plugin/js/qdrOverview.js
@@ -834,19 +834,12 @@ var QDR = (function (QDR) {
 			}
 			return stateClassMap[row.entity.adminStatus]
 		}
+
 		$scope.quiesceLink = function (row, $event) {
-			function gotMethodResponse (nodeName, entity, response, context) {
-				var statusCode = context.message.application_properties.statusCode;
-				if (statusCode < 200 || statusCode >= 300) {
-					Core.notification('error', context.message.application_properties.statusDescription);
-				}
-			}
-			var nodeId = row.entity.nodeId;
-			var entity = row.entity.type;
-			var attributes = {adminStatus: 'disabled', name: row.entity.name, identity: row.entity.identity};
-			QDRService.sendMethod(nodeId, entity, attributes, "UPDATE", gotMethodResponse)
+			QDRService.quiesceLink(row.entity.nodeId, row.entity.name);
 			$event.stopPropagation()
 		}
+
 		$scope.quiesceLinkDisabled = function (row) {
 			return (row.entity.operStatus !== 'up' && row.entity.operStatus !== 'down')
 		}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/62703d54/console/stand-alone/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js
index 69d5b1a..b219967 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -341,6 +341,19 @@ var QDR = (function(QDR) {
 
 			return self.isConsole(conn)
 		},
+
+		quiesceLink: function (nodeId, name) {
+			function gotMethodResponse (nodeName, entity, response, context) {
+				var statusCode = context.message.application_properties.statusCode;
+				if (statusCode < 200 || statusCode >= 300) {
+					Core.notification('error', context.message.application_properties.statusDescription);
+				}
+			}
+			var attributes = {adminStatus: 'disabled', name: name};
+			self.sendMethod(nodeId, "router.link", attributes, "UPDATE", gotMethodResponse)
+		},
+
+
       /*
        * send the management messages that build up the topology
        *

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/62703d54/console/stand-alone/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrTopology.js b/console/stand-alone/plugin/js/qdrTopology.js
index afe2744..8c69376 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -131,7 +131,7 @@ var QDR = (function (QDR) {
 	                    opacity: 1,
 	                    left: (left + 20) + "px",
 	                    top:  (mouseY + 20 + $(document).scrollTop()) + "px",
-	                    height: (visibleLen + 1) * 30 + "px", // +1 for the header row
+	                    height: ((visibleLen + 1) * 30) + 40 + "px", // +1 for the header row
 	                    'overflow-y': obj.entity.linkData > 10 ? 'scroll' : 'hidden'})
 			},
 			updateState: function (entity) {
@@ -205,18 +205,7 @@ var QDR = (function (QDR) {
 			return stateClassMap[row.entity.adminStatus]
 		}
 		$scope.quiesceLink = function (row) {
-			function gotMethodResponse (nodeName, entity, response, context) {
-				var statusCode = context.message.application_properties.statusCode;
-				if (statusCode < 200 || statusCode >= 300) {
-					Core.notification('error', context.message.application_properties.statusDescription);
-				} else {
-
-				}
-			}
-			var nodeId = row.entity.nodeId;
-			var entity = row.entity.type;
-			var attributes = {adminStatus: 'disabled', name: row.entity.name, identity: row.entity.identity};
-			QDRService.sendMethod(nodeId, entity, attributes, "UPDATE", gotMethodResponse)
+			QDRService.quiesceLink(row.entity.nodeId, row.entity.name);
 		}
 		$scope.quiesceLinkDisabled = function (row) {
 			return (row.entity.operStatus !== 'up' && row.entity.operStatus !== 'down')
@@ -1585,7 +1574,7 @@ var QDR = (function (QDR) {
 
 	            d3.select('#multiple_details')
 	                .style({
-	                    height: (normals.length + 1) * 30 + "px",
+	                    height: ((normals.length + 1) * 30) + 40 + "px",
 	                    'overflow-y': normals.length > 10 ? 'scroll' : 'hidden'
 					})
 			}


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


Mime
View raw message