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-322 Fix graph buttons when console's Entities page is narrow
Date Fri, 06 Jul 2018 17:39:31 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master e2f73cdc2 -> 73a9658f9


DISPATCH-322 Fix graph buttons when console's Entities page is narrow


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

Branch: refs/heads/master
Commit: 73a9658f994a6a333b4e7c21321799ce494ac74a
Parents: e2f73cd
Author: Ernest Allen <eallen@redhat.com>
Authored: Fri Jul 6 13:39:13 2018 -0400
Committer: Ernest Allen <eallen@redhat.com>
Committed: Fri Jul 6 13:39:13 2018 -0400

----------------------------------------------------------------------
 console/stand-alone/plugin/css/dispatch.css | 12 +++++++++---
 console/stand-alone/plugin/js/qdrList.js    | 16 ++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/73a9658f/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 f76d421..5f26e6e 100644
--- a/console/stand-alone/plugin/css/dispatch.css
+++ b/console/stand-alone/plugin/css/dispatch.css
@@ -60,12 +60,18 @@ div.listAttrName button {
 }
 
 div.listAggrValue button {
-    margin: 3px 5px;
+  float: right;
+  margin: 3px 5px;
+}
+@-moz-document url-prefix() { 
+  div.listAggrValue button {
+    padding: 2px 6px !important;
+  }
 }
 
 @-moz-document url-prefix() {
   div.listAttrName button {
-    top: -24px;
+    /* top: -24px; */
     position: relative;
     margin: 3px 0px;
     padding: 0 5px !important;
@@ -1633,7 +1639,7 @@ svg {
       overflow: hidden !important;
   }
   
-  @-moz-document url-prefix() {
+  @-moz-document url-prefix() { 
       .btn {padding: 2px 12px 8px !important;}
       #overview-controller .btn {padding: 4px 12px !important;}
       #overview-controller .btn.filter-close {padding: 0 !important;}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/73a9658f/console/stand-alone/plugin/js/qdrList.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrList.js b/console/stand-alone/plugin/js/qdrList.js
index 6dafe20..5160fc4 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -686,21 +686,23 @@ export class ListController {
           {
             field: 'attributeName',
             displayName: 'Attribute',
-            cellTemplate: '<div title="{{row.entity.title}}" class="listAttrName ui-grid-cell-contents">{{COL_FIELD
CUSTOM_FILTERS | pretty}}<button ng-if="row.entity.graph" title="Click to view/add a graph"
ng-click="grid.appScope.addToGraph(row.entity)" ng-class="{\'btn-success\': row.entity.chartExists}"
class="btn"><i ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></button></div>'
+            cellTemplate: '<div title="{{row.entity.title}}" class="listAttrName ui-grid-cell-contents"><button
ng-if="row.entity.graph" title="Click to view/add a graph" ng-click="grid.appScope.addToGraph(row.entity)"
ng-class="{\'btn-success\': row.entity.chartExists}" class="btn"><i ng-class="{\'icon-bar-chart\':
row.entity.graph == true }"></i></button>{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>',
+            width: aggregateEntities.indexOf($scope.selectedEntity) > -1 ? '40%' : '50%'
           },
           {
             field: 'attributeValue',
             displayName: 'Value',
-            cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\':
row.entity.changed == 1}">{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>'
+            cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\':
row.entity.changed == 1}">{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>',
+            width: aggregateEntities.indexOf($scope.selectedEntity) > -1 ? '25%' : '50%'
           }
         ];
         if (aggregateEntities.indexOf($scope.selectedEntity) > -1) {
           $scope.detailCols.push(
             {
-              width: '10%',
+              width: '35%',
               field: 'aggregateValue',
               displayName: 'Aggregate',
-              cellTemplate: '<div popover-enable="{{grid.appScope.aggregateTipEnabled(row)}}"
uib-popover-html="grid.appScope.aggregateTip" popover-append-to-body="true" ng-mouseover="grid.appScope.genAggregateTip(row)"
popover-trigger="\'mouseenter\'" class="listAggrValue ui-grid-cell-contents" ng-class="{\'changed\':
row.entity.changed == 1}">{{COL_FIELD CUSTOM_FILTERS}} <button title="Click to view/add
a graph" ng-if="row.entity.graph" ng-click="grid.appScope.addAllToGraph(row.entity)" ng-class="{\'btn-success\':
row.entity.aggchartExists}" class="btn"><i ng-class="{\'icon-bar-chart\': row.entity.graph
== true }"></i></button></div>',
+              cellTemplate: '<div popover-enable="{{grid.appScope.aggregateTipEnabled(row)}}"
uib-popover-html="grid.appScope.aggregateTip" popover-append-to-body="true" ng-mouseover="grid.appScope.genAggregateTip(row)"
popover-trigger="\'mouseenter\'" class="listAggrValue ui-grid-cell-contents" ng-class="{\'changed\':
row.entity.changed == 1}"><button title="Click to view/add a graph" ng-if="row.entity.graph"
ng-click="grid.appScope.addAllToGraph(row.entity)" ng-class="{\'btn-success\': row.entity.aggchartExists}"
class="btn"><i ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></button>{{COL_FIELD
CUSTOM_FILTERS}}</div>',
               cellClass: 'aggregate'
             }
           );
@@ -724,12 +726,14 @@ export class ListController {
         {
           field: 'attributeName',
           displayName: 'Attribute',
-          cellTemplate: '<div title="{{row.entity.title}}" class="listAttrName ui-grid-cell-contents">{{COL_FIELD
CUSTOM_FILTERS | pretty}}<button ng-if="row.entity.graph" title="Click to view/add a graph"
ng-click="grid.appScope.addToGraph(row.entity)" ng-class="{\'btn-success\': row.entity.chartExists}"
class="btn"><i ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></button></div>'
+          cellTemplate: '<div title="{{row.entity.title}}" class="listAttrName ui-grid-cell-contents">{{COL_FIELD
CUSTOM_FILTERS | pretty}}<button ng-if="row.entity.graph" title="Click to view/add a graph"
ng-click="grid.appScope.addToGraph(row.entity)" ng-class="{\'btn-success\': row.entity.chartExists}"
class="btn"><i ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></button></div>',
+          width: '50%'
         },
         {
           field: 'attributeValue',
           displayName: 'Value',
-          cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\': row.entity.changed
== 1}">{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>'
+          cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\': row.entity.changed
== 1}">{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>',
+          width: '50%'
         }
       ],
       enableColumnResize: true,


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


Mime
View raw message