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/09/29 19:35:53 UTC
qpid-dispatch git commit: DISPATCH-801 Reverting to retrieving 3rd
party javascript libraries from CDNs
Repository: qpid-dispatch
Updated Branches:
refs/heads/master e95c8e071 -> 24a7085f2
DISPATCH-801 Reverting to retrieving 3rd party javascript libraries from CDNs
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/24a7085f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/24a7085f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/24a7085f
Branch: refs/heads/master
Commit: 24a7085f20b6ea2ed1916967e7a81855ebd9a036
Parents: e95c8e0
Author: Ernest Allen <ea...@redhat.com>
Authored: Fri Sep 29 15:34:49 2017 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Fri Sep 29 15:34:49 2017 -0400
----------------------------------------------------------------------
console/stand-alone/README.txt | 12 +-
console/stand-alone/bower.json | 42 ------
console/stand-alone/index.html | 127 +++++++++++--------
console/stand-alone/plugin/js/dispatchPlugin.js | 2 +-
4 files changed, 76 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/24a7085f/console/stand-alone/README.txt
----------------------------------------------------------------------
diff --git a/console/stand-alone/README.txt b/console/stand-alone/README.txt
index 2c8db15..45b36a0 100644
--- a/console/stand-alone/README.txt
+++ b/console/stand-alone/README.txt
@@ -3,14 +3,6 @@ The stand-alone qpid dispatch console is an html web site that monitors and cont
To install the console:
- The console files are normally installed under /usr/share/qpid-dispatch/console/stand-alone
-- Install the javascript libraries / css files
- - cd <install directory>
- - bower install
-
-For more info on bower see https://bower.io/
-To install bower:
-- sudo dnf install npm
-- sudo npm install -g bower
To run the web console:
- Ensure one of the routers in your network is configured with a normal listener with http: true
@@ -27,3 +19,7 @@ listener {
The router will serve the console's html/js/css from the install directory.
The cosole will automatically connect to the router at localhost:5673
+Note: An internet connection is required on the machine that is running the console in order to retrieve the 3rd party javascript / css files.
+
+
+
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/24a7085f/console/stand-alone/bower.json
----------------------------------------------------------------------
diff --git a/console/stand-alone/bower.json b/console/stand-alone/bower.json
deleted file mode 100644
index 1eb2508..0000000
--- a/console/stand-alone/bower.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "Apache Qpid Dispatch Console",
- "authors": [],
- "description": "Console for Apache Qpid Dispatch Router",
- "main": "index.html",
- "keywords": [
- "Apache",
- "Qpid",
- "Dispatch",
- "Console"
- ],
- "license": "Apache 2.0",
- "homepage": "",
- "private": true,
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "tests"
- ],
- "dependencies": {
- "jquery": "#2.1.4",
- "angular-patternfly": "^4.11.0",
- "jquery.tipsy": "*",
- "jquery.dynatree": "dynatree#^1.2.8",
- "json-formatter": "^0.6.0",
- "html5shiv": "^3.7.3",
- "angular-route": "^1.6.6",
- "angular-resource": "^1.6.6",
- "d3-queue": "^3.0.7",
- "topojson": "^3.0.2",
- "tooltipsy": "*",
- "angular-ui-slider": "^0.4.0",
- "notifyjs": "^0.4.2",
- "ng-grid": "2.0.11"
- },
- "resolutions": {
- "angular": "1.6.6",
- "jquery": "2.1.4"
- }
-}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/24a7085f/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 706022d..e99c54b 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -26,22 +26,28 @@ under the License.
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>Qpid Dispatch Console</title>
+ <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+ <link href='https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' type="text/css">
+ <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
+
+ <!-- PatternFly Styles -->
<link rel="shortcut icon" type="image/png" href="favicon-32x32.png" sizes="32x32" />
- <link rel="stylesheet" href='bower_components/font-awesome/css/font-awesome.min.css' type="text/css">
- <link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css" type="text/css">
- <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" type="text/css">
- <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap-theme.min.css" type="text/css">
- <link rel="stylesheet" href="bower_components/patternfly/dist/css/patternfly.min.css" type="text/css">
- <link rel="stylesheet" href="bower_components/patternfly/dist/css/patternfly-additions.min.css" type="text/css">
- <link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.min.css" />
- <link rel="stylesheet" href="bower_components/jquery.tipsy/css/jquery.tipsy.css" type="text/css"/>
- <link rel="stylesheet" href="bower_components/ng-grid/ng-grid.min.css" type="text/css"/>
- <link rel="stylesheet" href="bower_components/jquery.dynatree/dist/skin/ui.dynatree.css" type="text/css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+ <!-- Optional theme -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/css/patternfly.min.css" >
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/css/patternfly-additions.min.css" >
+
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tipsy/1.0.2/jquery.tipsy.css" type="text/css"/>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.css" type="text/css"/>
+ <link rel="stylesheet" href="https://cdn.rawgit.com/mar10/dynatree/master/dist/skin/ui.dynatree.css" type="text/css">
+
<link rel="stylesheet" href="plugin/css/plugin.css" type="text/css"/>
<link rel="stylesheet" href="plugin/css/dispatch.css" type="text/css"/>
<link rel="stylesheet" href="plugin/css/dispatchpf.css" type="text/css"/>
- <link rel="stylesheet" href="bower_components/json-formatter/dist/json-formatter.min.css" type="text/css"/>
+ <link rel="stylesheet" href="https://cdn.rawgit.com/mohsen1/json-formatter/master/dist/json-formatter.min.css" type="text/css"/>
</head>
<body ng-app="QDR" ng-controller="QDR.Core">
@@ -81,59 +87,68 @@ under the License.
</div>
</nav>
- <div class="container-fluid">
- <div class="row">
- <div class="col-md-12">
- <div ng-view></div>
- </div>
+<div class="container-fluid">
+ <div class="row">
+ <div class="col-md-12">
+ <div ng-view></div>
</div>
</div>
+</div>
<!--[if lt IE 9]>
- <script src="bower_components/html5shiv/dist/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
- <script src="bower_components/jquery/dist/jquery.min.js"></script>
- <script src="bower_components/jquery-ui/jquery-ui.min.js"></script>
- <script src="bower_components/jquery.dynatree/dist/jquery.dynatree.min.js"></script>
- <script src="bower_components/patternfly/dist/js/patternfly.min.js"></script>
- <script src="bower_components/angular/angular.min.js"></script>
- <script src="bower_components/angular-route/angular-route.min.js"></script>
- <script src="bower_components/angular-resource/angular-resource.min.js"></script>
- <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
- <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
- <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
- <script src="bower_components/angular-patternfly/dist/angular-patternfly.min.js"></script>
- <script src='bower_components/d3/d3.min.js'></script>
- <script src='bower_components/d3-queue/d3-queue.js'></script>
- <script src="bower_components/topojson/topojson.min.js"></script>
- <script src="bower_components/jquery.tipsy/js/jquery.tipsy.min.js"></script>
- <script src="bower_components/tooltipsy/tooltipsy.min.js"></script>
- <script src="bower_components/angular-ui-slider/src/slider.js"></script>
- <script src="bower_components/ng-grid/ng-grid-2.0.11.min.js"></script>
- <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
- <script src="bower_components/notifyjs/dist/notify.js"></script>
-
- <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/navbar.js"></script>
- <script type="text/javascript" src="plugin/js/qdrList.js"></script>
- <script type="text/javascript" src="plugin/js/qdrListChart.js"></script>
- <script type="text/javascript" src="plugin/js/qdrCharts.js"></script>
- <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/qdrTopology.js"></script>
- <script type="text/javascript" src="plugin/js/qdrSettings.js"></script>
-
- <script type="text/javascript" src="plugin/lib/rhea-min.js"></script>
-
-
- <script type="text/javascript">
+<!-- jQuery -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
+<script src="https://cdn.rawgit.com/mar10/dynatree/master/dist/jquery.dynatree.js"></script>
+
+<!-- PatternFly Custom Componets - Sidebar, Popovers and Datatables Customizations -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/js/patternfly.min.js"></script>
+
+<!-- Angular -->
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular-route.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.2/angular-resource.min.js"></script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.min.js"></script>
+
+<!-- Angular-Sanitize -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.5.11/angular-sanitize.min.js"></script>
+
+<script src='https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js'></script>
+<script src='https://cdnjs.cloudflare.com/ajax/libs/d3-queue/3.0.3/d3-queue.min.js'></script>
+
+<script src="https://d3js.org/topojson.v0.min.js"></script>
+
+<script src="https://cdn.rawgit.com/jaz303/tipsy/master/src/javascripts/jquery.tipsy.js"></script>
+<script src="https://cdn.rawgit.com/briancray/tooltipsy/master/tooltipsy.min.js"></script>
+<script src="https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/notify/0.4.2/notify.min.js"></script>
+
+<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/navbar.js"></script>
+<script type="text/javascript" src="plugin/js/qdrList.js"></script>
+<script type="text/javascript" src="plugin/js/qdrListChart.js"></script>
+<script type="text/javascript" src="plugin/js/qdrCharts.js"></script>
+<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/qdrTopology.js"></script>
+<script type="text/javascript" src="plugin/js/qdrSettings.js"></script>
+
+<script type="text/javascript" src="plugin/lib/rhea-min.js"></script>
+
+
+<script type="text/javascript">
//angular.element(document.getElementsByTagName('head')).append(angular.element('<base href="' + window.location.pathname + '" />'));
</script>
</body>
</html>
-
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/24a7085f/console/stand-alone/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/dispatchPlugin.js b/console/stand-alone/plugin/js/dispatchPlugin.js
index 9bb3aa4..19b65b7 100644
--- a/console/stand-alone/plugin/js/dispatchPlugin.js
+++ b/console/stand-alone/plugin/js/dispatchPlugin.js
@@ -66,7 +66,7 @@ var QDR = (function(QDR) {
*
* This plugin's angularjs module instance
*/
- QDR.module = angular.module(QDR.pluginName, ['ngRoute', 'ngSanitize', 'ngResource', 'ui.bootstrap', 'ngGrid', 'ui.slider', 'patternfly.card']);
+ QDR.module = angular.module(QDR.pluginName, ['ngRoute', 'ngSanitize', 'ngResource', 'ui.bootstrap', 'ngGrid', 'ui.slider']);
// QDR.module = angular.module(QDR.pluginName, ['ngResource', 'ngGrid', 'ui.bootstrap', 'ui.slider'/*, 'minicolors' */]);
Core = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org