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 2017/11/11 16:45:40 UTC
[1/2] qpid-dispatch git commit: DISPATCH-801 Adding Promise support
for IE
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 58461d730 -> 844ef61b8
DISPATCH-801 Adding Promise support for IE
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6fc788c6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6fc788c6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6fc788c6
Branch: refs/heads/master
Commit: 6fc788c6110b569c902de12f85ae5a2d2cee2e25
Parents: 58461d7
Author: Ernest Allen <ea...@redhat.com>
Authored: Sat Nov 11 11:43:44 2017 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Sat Nov 11 11:43:44 2017 -0500
----------------------------------------------------------------------
console/stand-alone/index.html | 9 ++++-----
console/stand-alone/package.json | 1 +
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6fc788c6/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 3cf2526..be7e2a2 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -22,7 +22,7 @@ under the License.
<head>
<meta charset="utf-8"/>
- <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>Qpid Dispatch Console</title>
@@ -87,14 +87,13 @@ under the License.
<div class="container-fluid">
<div class="row">
<div id="main_container" class="col-md-12">
- <div ng-view></div>
+ <div ng-view></div>");
</div>
</div>
</div>
-<!--[if lt IE 9]>
-<script src="node_modules/html5shiv/dist/html5shiv.min.js"></script>
-<![endif]-->
+<!-- Only needed for IE -->
+<script src="node_modules/bluebird/js/browser/bluebird.js"></script>
<!-- jQuery -->
<script src="node_modules/jquery/dist/jquery.js"></script>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6fc788c6/console/stand-alone/package.json
----------------------------------------------------------------------
diff --git a/console/stand-alone/package.json b/console/stand-alone/package.json
index 2e8d78e..c40057d 100644
--- a/console/stand-alone/package.json
+++ b/console/stand-alone/package.json
@@ -30,6 +30,7 @@
"angular-ui-bootstrap": "^2.5.6",
"angular-ui-grid": "^4.0.8",
"angular-ui-slider": "^0.4.0",
+ "bluebird": "^3.5.1",
"d3": "^3.5.14",
"d3-queue": "^3.0.7",
"dispatch-management": "^0.1.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-dispatch git commit: DISPATCH-801 Use buttons to trigger
chart creation because of FireFox
Posted by ea...@apache.org.
DISPATCH-801 Use buttons to trigger chart creation because of FireFox
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/844ef61b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/844ef61b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/844ef61b
Branch: refs/heads/master
Commit: 844ef61b820a9275618bed8cd48752f34d0f71b6
Parents: 6fc788c
Author: Ernest Allen <ea...@redhat.com>
Authored: Sat Nov 11 11:45:13 2017 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Sat Nov 11 11:45:13 2017 -0500
----------------------------------------------------------------------
console/stand-alone/plugin/css/plugin.css | 13 +++++++++++--
console/stand-alone/plugin/js/qdrList.js | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/844ef61b/console/stand-alone/plugin/css/plugin.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/plugin.css b/console/stand-alone/plugin/css/plugin.css
index f4ac42b..38ade72 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -58,13 +58,22 @@ div.listAttrName {
padding-top: 5px;
}
-div.listAttrName i.icon-bar-chart {
+div.listAttrName button {
float: right;
margin: 3px 5px;
}
+@-moz-document url-prefix() {
+ div.listAttrName button {
+ top: -24px;
+ position: relative;
+ margin: 3px 0px;
+ padding: 0 5px !important;
+ }
+}
+
div.listAttrName i.icon-bar-chart.active, div.hastip i.icon-bar-chart.active, li.haschart i {
- background-color: #AAFFAA;
+ /*background-color: #AAFFAA; */
}
div#main div ul.nav li a:not(.btn) {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/844ef61b/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 4ff7b1e..bc96b90 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -687,13 +687,13 @@ var QDR = (function(QDR) {
{
field: 'attributeName',
displayName: 'Attribute',
- cellTemplate: '<div title="{{row.entity.title}}" class="listAttrName ui-grid-cell-contents">{{COL_FIELD CUSTOM_FILTERS | pretty}}<i ng-if="row.entity.graph" ng-click="grid.appScope.addToGraph(row.entity)" ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></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)" class="btn btn-success"><i ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></button></div>'
//'<div title="{{row.entity.title}}" class="listAttrName">{{row.entity[col.field]}}<i ng-if="row.entity.graph" ng-click="addToGraph(row.entity)" ng-class="{\'icon-bar-chart\': row.entity.graph == true }"></i></div>'
},
{
field: 'attributeValue',
displayName: 'Value',
- cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\': row.entity.changed == 1}"><span>{{COL_FIELD CUSTOM_FILTERS | pretty}}</span></div>'
+ cellTemplate: '<div class="ui-grid-cell-contents" ng-class="{\'changed\': row.entity.changed == 1}">{{COL_FIELD CUSTOM_FILTERS | pretty}}</div>'
}
],
enableColumnResize: true,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org