You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2018/01/12 19:47:22 UTC
[2/2] qpid-dispatch git commit: DISPATCH-909 Work around no host on
some connections
DISPATCH-909 Work around no host on some connections
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c36f3af0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c36f3af0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c36f3af0
Branch: refs/heads/master
Commit: c36f3af0d1ad38d90dd5b738bc3e40577f07ae1d
Parents: 8468525
Author: Ernest Allen <ea...@redhat.com>
Authored: Fri Jan 12 14:47:01 2018 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Fri Jan 12 14:47:01 2018 -0500
----------------------------------------------------------------------
console/stand-alone/index.html | 2 +-
console/stand-alone/plugin/css/dispatchpf.css | 8 +++++
.../stand-alone/plugin/html/qdrOverview.html | 8 +++++
console/stand-alone/plugin/js/navbar.js | 2 +-
.../plugin/js/qdrOverviewChartsController.js | 37 ++++++++++++++++++++
5 files changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c36f3af0/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 92782c2..e696484 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -133,6 +133,7 @@ under the License.
<script type="text/javascript" src="plugin/js/dispatchPlugin.js"></script>
<script type="text/javascript" src="plugin/js/qdrOverview.js"></script>
<script type="text/javascript" src="plugin/js/qdrOverviewLogsController.js"></script>
+<script type="text/javascript" src="plugin/js/qdrOverviewChartsController.js"></script>
<script type="text/javascript" src="plugin/js/navbar.js"></script>
<script type="text/javascript" src="plugin/js/qdrList.js"></script>
<script type="text/javascript" src="plugin/js/qdrListChart.js"></script>
@@ -140,7 +141,6 @@ under the License.
<script type="text/javascript" src="plugin/js/qdrSchema.js"></script>
<script type="text/javascript" src="plugin/js/qdrService.js"></script>
<script type="text/javascript" src="plugin/js/qdrChartService.js"></script>
-<script type="text/javascript" src="plugin/js/c3Charts.js"></script>
<script type="text/javascript" src="plugin/js/qdrTopology.js"></script>
<script type="text/javascript" src="plugin/js/qdrSettings.js"></script>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c36f3af0/console/stand-alone/plugin/css/dispatchpf.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/dispatchpf.css b/console/stand-alone/plugin/css/dispatchpf.css
index c7e981f..04ca1c2 100644
--- a/console/stand-alone/plugin/css/dispatchpf.css
+++ b/console/stand-alone/plugin/css/dispatchpf.css
@@ -70,14 +70,22 @@ span.fancytree-icon {
font-family: FontAwesome;
}
+/* closed folder */
.fancytree-ico-cf span.fancytree-icon:before {
font-family: FontAwesome;
content: "\f07b";
}
+/* expanded folder */
.fancytree-ico-ef span.fancytree-icon:before {
font-family: FontAwesome;
content: "\f07c";
}
+/* chart */
+.fancytree-ico-cf.charts span.fancytree-icon:before, .fancytree-ico-ef.charts span.fancytree-icon:before {
+ font-family: FontAwesome;
+ content: "\f080";
+}
+
ul.fancytree-container a {
color: #363636;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c36f3af0/console/stand-alone/plugin/html/qdrOverview.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrOverview.html b/console/stand-alone/plugin/html/qdrOverview.html
index 3173fff..b086f93 100644
--- a/console/stand-alone/plugin/html/qdrOverview.html
+++ b/console/stand-alone/plugin/html/qdrOverview.html
@@ -21,6 +21,14 @@ under the License.
<div class="gridDetails" ng-include="template.url"></div>
</script>
+<script type="text/ng-template" id="overviewCharts.html">
+ <div ng-repeat="chart in overviewCharts" class="chartContainer" ng-controller="QDR.OverviewChartsController">
+ <p class="chartLabels">
+ </p><div style="clear:both"></div>
+ <div id="{{chart.chart.id()}}" class="line-chart-pf aChart d3Chart"></div>
+ </div>
+</script>
+
<!-- the following scripts are content that gets loaded into the above div that has the temple.url -->
<script type="text/ng-template" id="routers.html">
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c36f3af0/console/stand-alone/plugin/js/navbar.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/navbar.js b/console/stand-alone/plugin/js/navbar.js
index 9aa376d..7cb129a 100644
--- a/console/stand-alone/plugin/js/navbar.js
+++ b/console/stand-alone/plugin/js/navbar.js
@@ -277,7 +277,7 @@ var QDR = (function (QDR) {
setTimeout(showChart, 100);
return;
}
- dialogSvgChart = new QDRChartService.pfAggChart($scope.dialogChart, $scope.svgDivId)
+ dialogSvgChart = new QDRChartService.pfAreaChart($scope.dialogChart, $scope.svgDivId)
/*
$('input[name=areaColor]').val($scope.dialogChart.areaColor);
$('input[name=areaColor]').on('input', function (e) {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c36f3af0/console/stand-alone/plugin/js/qdrOverviewChartsController.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrOverviewChartsController.js b/console/stand-alone/plugin/js/qdrOverviewChartsController.js
new file mode 100644
index 0000000..73a42fa
--- /dev/null
+++ b/console/stand-alone/plugin/js/qdrOverviewChartsController.js
@@ -0,0 +1,37 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+/**
+ * @module QDR
+ */
+var QDR = (function(QDR) {
+
+ QDR.module.controller('QDR.OverviewChartsController', function ($scope, QDRService, $timeout) {
+
+ $scope.overviewCharts = []
+
+ var charts = [
+ {}
+ ]
+ // create svg charts
+ //var svgChart = new QDRChartService.pfAreaChart(chart, chart.id(), true)
+
+ });
+ return QDR;
+
+} (QDR || {}));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org