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/07/16 10:48:38 UTC
[3/3] qpid-dispatch git commit: DISPATCH-1070 Use patternfly trend
cards on console's overview page.
DISPATCH-1070 Use patternfly trend cards on console's overview page.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a3b271e7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a3b271e7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a3b271e7
Branch: refs/heads/master
Commit: a3b271e7948829129ff07d570e81d73fbcacaaea
Parents: edf1d8f
Author: Ernest Allen <ea...@redhat.com>
Authored: Mon Jul 16 06:48:21 2018 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Mon Jul 16 06:48:21 2018 -0400
----------------------------------------------------------------------
console/CMakeLists.txt | 20 +-
console/stand-alone/index.html | 1 -
console/stand-alone/main.js | 9 +-
console/stand-alone/package-lock.json | 3613 ++----------------
console/stand-alone/package.json | 1 +
.../stand-alone/plugin/html/qdrOverview.html | 37 +-
.../stand-alone/plugin/js/qdrChartService.js | 93 +-
.../plugin/js/qdrOverviewChartsController.js | 51 +-
console/stand-alone/vendor-css.txt | 3 +-
console/stand-alone/vendor-js.txt | 4 +
10 files changed, 445 insertions(+), 3387 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a3b271e7/console/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 6f5880e..0e7b248 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -36,12 +36,20 @@ if(CONSOLE_INSTALL)
set(CONSOLE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/console/stand-alone")
set(CONSOLE_BUILD_DIR "${CMAKE_BINARY_DIR}/console")
+ ## copy the build config files
+ configure_file( ${CONSOLE_SOURCE_DIR}/package.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
+ configure_file( ${CONSOLE_SOURCE_DIR}/package-lock.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
+ configure_file( ${CONSOLE_SOURCE_DIR}/tslint.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
+ configure_file( ${CONSOLE_SOURCE_DIR}/gulpfile.js ${CONSOLE_BUILD_DIR}/ COPYONLY)
+ configure_file( ${CONSOLE_SOURCE_DIR}/vendor-js.txt ${CONSOLE_BUILD_DIR}/ COPYONLY)
+ configure_file( ${CONSOLE_SOURCE_DIR}/vendor-css.txt ${CONSOLE_BUILD_DIR}/ COPYONLY)
+
## Files needed to create the ${CONSOLE_ARTIFACTS}
file (GLOB_RECURSE CONSOLE_JS_SOURCES ${CONSOLE_SOURCE_DIR}/plugin/js/*.js)
file (GLOB_RECURSE CONSOLE_TS_SOURCES ${CONSOLE_SOURCE_DIR}/plugin/js/*.ts)
+ file (GLOB CONSOLE_TXT_SOURCES ${CONSOLE_BUILD_DIR}/vendor-*.txt)
set(CONSOLE_CSS_SOURCE ${CONSOLE_SOURCE_DIR}/plugin/css/dispatch.css)
- set(CONSOLE_MAIN ${CONSOLE_SOURCE_DIR}/main.js)
- set(ALL_CONSOLE_SOURCES ${CONSOLE_CSS_SOURCE})
+ set(ALL_CONSOLE_SOURCES ${CONSOLE_CSS_SOURCE} ${CONSOLE_TXT_SOURCES})
## Files created during the console build
set(CONSOLE_ARTIFACTS
@@ -50,14 +58,6 @@ if(CONSOLE_INSTALL)
${CONSOLE_BUILD_DIR}/dist/css/vendor.min.css
)
- ## copy the build config files
- configure_file( ${CONSOLE_SOURCE_DIR}/package.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
- configure_file( ${CONSOLE_SOURCE_DIR}/package-lock.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
- configure_file( ${CONSOLE_SOURCE_DIR}/tslint.json ${CONSOLE_BUILD_DIR}/ COPYONLY)
- configure_file( ${CONSOLE_SOURCE_DIR}/gulpfile.js ${CONSOLE_BUILD_DIR}/ COPYONLY)
- configure_file( ${CONSOLE_SOURCE_DIR}/vendor-js.txt ${CONSOLE_BUILD_DIR}/ COPYONLY)
- configure_file( ${CONSOLE_SOURCE_DIR}/vendor-css.txt ${CONSOLE_BUILD_DIR}/ COPYONLY)
-
## Tell cmake how and when to build ${CONSOLE_ARTIFACTS}
add_custom_command (
OUTPUT ${CONSOLE_ARTIFACTS}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a3b271e7/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index acb2d69..ade7c68 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -77,7 +77,6 @@ under the License.
<script type="module" src="main.js"></script>
<script type="text/javascript" src="js/vendor.min.js"></script>
-<!-- <script type="text/javascript" src="js/main.min.js"></script> -->
<script defer nomodule>
var installError = document.getElementById('installError');
if (installError) {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a3b271e7/console/stand-alone/main.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/main.js b/console/stand-alone/main.js
index ca69709..78ddf2b 100644
--- a/console/stand-alone/main.js
+++ b/console/stand-alone/main.js
@@ -51,7 +51,7 @@ import { posint } from './plugin/js/posintDirective.js';
*/
QDR.module = angular.module('QDR', ['ngRoute', 'ngSanitize', 'ngResource', 'ui.bootstrap',
'ui.grid', 'ui.grid.selection', 'ui.grid.autoResize', 'ui.grid.resizeColumns', 'ui.grid.saveState',
- 'ui.slider', 'ui.checkbox']);
+ 'ui.slider', 'ui.checkbox', 'patternfly.charts', 'patternfly.card']);
// set up the routing for this plugin
QDR.module.config(function($routeProvider) {
@@ -132,6 +132,13 @@ import { posint } from './plugin/js/posintDirective.js';
};
});
+ QDR.module.filter('truncate', function () {
+ return function (str) {
+ if (!isNaN(parseFloat(str)) && isFinite(str))
+ return Math.round(str);
+ return str;
+ };
+ });
// one-time initialization happens in the run function
// of our module
QDR.module.run( ['$rootScope', '$route', '$timeout', '$location', '$log', 'QDRService', 'QDRChartService', function ($rootScope, $route, $timeout, $location, $log, QDRService, QDRChartService) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org