You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/13 08:45:46 UTC
[25/50] [abbrv] ignite git commit: IGNITE-4659 Migration to Webpack
2. Upgrade template engine from jade to pug.
IGNITE-4659 Migration to Webpack 2. Upgrade template engine from jade to pug.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1080e686
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1080e686
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1080e686
Branch: refs/heads/ignite-2.0
Commit: 1080e6861288b229630e24c9b8f282c09bede030
Parents: f71e4b4
Author: Dmitriy Shabalin <ds...@gridgain.com>
Authored: Thu Mar 2 16:05:15 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Mar 2 16:05:16 2017 +0700
----------------------------------------------------------------------
modules/web-console/frontend/.eslintrc | 1 +
modules/web-console/frontend/.gitignore | 1 +
modules/web-console/frontend/app/app.config.js | 12 +-
modules/web-console/frontend/app/app.js | 7 +-
.../activities-user-dialog.jade | 36 --
.../activities-user-dialog.tpl.pug | 36 ++
.../components/activities-user-dialog/index.js | 2 +-
.../form-field-datepicker.jade | 55 --
.../form-field-datepicker.pug | 55 ++
.../list-of-registered-users/index.js | 2 +-
.../list-of-registered-users.controller.js | 11 +-
.../list-of-registered-users.jade | 58 --
.../list-of-registered-users.tpl.pug | 58 ++
.../ui-grid-header/ui-grid-header.jade | 27 -
.../ui-grid-header/ui-grid-header.scss | 1 +
.../ui-grid-header/ui-grid-header.tpl.pug | 27 +
.../ui-grid-settings/ui-grid-settings.jade | 33 -
.../ui-grid-settings/ui-grid-settings.pug | 33 +
.../app/directives/centered/centered.css | 37 --
.../directives/centered/centered.directive.js | 2 +-
.../app/directives/centered/centered.scss | 37 ++
.../information/information.directive.js | 4 +-
.../app/directives/information/information.jade | 20 -
.../app/directives/information/information.pug | 20 +
.../ui-ace-docker/ui-ace-docker.directive.js | 4 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 31 -
.../directives/ui-ace-docker/ui-ace-docker.pug | 31 +
.../ui-ace-java/ui-ace-java.directive.js | 4 +-
.../app/directives/ui-ace-java/ui-ace-java.jade | 22 -
.../app/directives/ui-ace-java/ui-ace-java.pug | 22 +
.../ui-ace-pojos/ui-ace-pojos.directive.js | 4 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 40 --
.../directives/ui-ace-pojos/ui-ace-pojos.pug | 40 ++
.../ui-ace-pom/ui-ace-pom.directive.js | 4 +-
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 -
.../app/directives/ui-ace-pom/ui-ace-pom.pug | 17 +
.../ui-ace-sharp/ui-ace-sharp.directive.js | 4 +-
.../directives/ui-ace-sharp/ui-ace-sharp.jade | 22 -
.../directives/ui-ace-sharp/ui-ace-sharp.pug | 22 +
.../ui-ace-spring/ui-ace-spring.directive.js | 4 +-
.../directives/ui-ace-spring/ui-ace-spring.jade | 17 -
.../directives/ui-ace-spring/ui-ace-spring.pug | 17 +
.../frontend/app/helpers/jade/form.jade | 28 -
.../frontend/app/helpers/jade/form.pug | 28 +
.../helpers/jade/form/form-field-checkbox.jade | 38 --
.../helpers/jade/form/form-field-checkbox.pug | 38 ++
.../helpers/jade/form/form-field-datalist.jade | 51 --
.../helpers/jade/form/form-field-datalist.pug | 51 ++
.../app/helpers/jade/form/form-field-down.jade | 18 -
.../app/helpers/jade/form/form-field-down.pug | 18 +
.../helpers/jade/form/form-field-dropdown.jade | 51 --
.../helpers/jade/form/form-field-dropdown.pug | 51 ++
.../helpers/jade/form/form-field-feedback.jade | 32 -
.../helpers/jade/form/form-field-feedback.pug | 32 +
.../app/helpers/jade/form/form-field-label.jade | 23 -
.../app/helpers/jade/form/form-field-label.pug | 23 +
.../helpers/jade/form/form-field-number.jade | 53 --
.../app/helpers/jade/form/form-field-number.pug | 53 ++
.../helpers/jade/form/form-field-password.jade | 47 --
.../helpers/jade/form/form-field-password.pug | 47 ++
.../app/helpers/jade/form/form-field-text.jade | 64 --
.../app/helpers/jade/form/form-field-text.pug | 64 ++
.../app/helpers/jade/form/form-field-up.jade | 18 -
.../app/helpers/jade/form/form-field-up.pug | 18 +
.../app/helpers/jade/form/form-group.jade | 23 -
.../app/helpers/jade/form/form-group.pug | 23 +
.../frontend/app/helpers/jade/mixins.jade | 609 -------------------
.../frontend/app/helpers/jade/mixins.pug | 609 +++++++++++++++++++
.../frontend/app/modules/agent/agent.module.js | 4 +-
.../modules/branding/header-logo.directive.js | 4 +-
.../app/modules/branding/header-logo.jade | 18 -
.../app/modules/branding/header-logo.pug | 18 +
.../branding/powered-by-apache.directive.js | 4 +-
.../app/modules/branding/powered-by-apache.jade | 18 -
.../app/modules/branding/powered-by-apache.pug | 18 +
.../frontend/app/modules/demo/Demo.module.js | 3 +-
.../app/modules/dialog/dialog.factory.js | 2 +-
.../frontend/app/modules/dialog/dialog.jade | 26 -
.../frontend/app/modules/dialog/dialog.tpl.pug | 26 +
.../getting-started/GettingStarted.provider.js | 3 +-
.../frontend/app/modules/loading/loading.css | 73 ---
.../app/modules/loading/loading.directive.js | 8 +-
.../frontend/app/modules/loading/loading.jade | 23 -
.../frontend/app/modules/loading/loading.pug | 23 +
.../frontend/app/modules/loading/loading.scss | 73 +++
.../frontend/app/modules/nodes/Nodes.service.js | 4 +-
.../app/modules/nodes/nodes-dialog.jade | 35 --
.../app/modules/nodes/nodes-dialog.tpl.pug | 35 ++
.../app/modules/sql/notebook.controller.js | 4 +-
.../frontend/app/modules/sql/sql.controller.js | 15 +-
.../frontend/app/modules/sql/sql.module.js | 15 +-
.../frontend/app/modules/states/admin.state.js | 4 +-
.../app/modules/states/configuration.state.js | 23 +-
.../states/configuration/caches/affinity.jade | 82 ---
.../states/configuration/caches/affinity.pug | 82 +++
.../configuration/caches/client-near-cache.jade | 50 --
.../configuration/caches/client-near-cache.pug | 50 ++
.../configuration/caches/concurrency.jade | 65 --
.../states/configuration/caches/concurrency.pug | 65 ++
.../states/configuration/caches/general.jade | 69 ---
.../states/configuration/caches/general.pug | 69 +++
.../states/configuration/caches/memory.jade | 109 ----
.../states/configuration/caches/memory.pug | 108 ++++
.../configuration/caches/near-cache-client.jade | 51 --
.../configuration/caches/near-cache-client.pug | 51 ++
.../configuration/caches/near-cache-server.jade | 52 --
.../configuration/caches/near-cache-server.pug | 52 ++
.../configuration/caches/node-filter.jade | 59 --
.../states/configuration/caches/node-filter.pug | 59 ++
.../states/configuration/caches/query.jade | 114 ----
.../states/configuration/caches/query.pug | 114 ++++
.../states/configuration/caches/rebalance.jade | 66 --
.../states/configuration/caches/rebalance.pug | 66 ++
.../states/configuration/caches/statistics.jade | 39 --
.../states/configuration/caches/statistics.pug | 39 ++
.../states/configuration/caches/store.jade | 250 --------
.../states/configuration/caches/store.pug | 250 ++++++++
.../states/configuration/clusters/atomic.jade | 54 --
.../states/configuration/clusters/atomic.pug | 54 ++
.../configuration/clusters/attributes.jade | 57 --
.../configuration/clusters/attributes.pug | 57 ++
.../states/configuration/clusters/binary.jade | 77 ---
.../states/configuration/clusters/binary.pug | 77 +++
.../configuration/clusters/cache-key-cfg.jade | 50 --
.../configuration/clusters/cache-key-cfg.pug | 50 ++
.../configuration/clusters/checkpoint.jade | 86 ---
.../configuration/clusters/checkpoint.pug | 86 +++
.../configuration/clusters/checkpoint/fs.jade | 66 --
.../configuration/clusters/checkpoint/fs.pug | 66 ++
.../configuration/clusters/checkpoint/jdbc.jade | 48 --
.../configuration/clusters/checkpoint/jdbc.pug | 48 ++
.../configuration/clusters/checkpoint/s3.jade | 178 ------
.../configuration/clusters/checkpoint/s3.pug | 178 ++++++
.../configuration/clusters/collision.jade | 63 --
.../states/configuration/clusters/collision.pug | 63 ++
.../clusters/collision/custom.jade | 24 -
.../configuration/clusters/collision/custom.pug | 24 +
.../clusters/collision/fifo-queue.jade | 27 -
.../clusters/collision/fifo-queue.pug | 27 +
.../clusters/collision/job-stealing.jade | 63 --
.../clusters/collision/job-stealing.pug | 63 ++
.../clusters/collision/priority-queue.jade | 42 --
.../clusters/collision/priority-queue.pug | 42 ++
.../configuration/clusters/communication.jade | 100 ---
.../configuration/clusters/communication.pug | 100 +++
.../configuration/clusters/connector.jade | 104 ----
.../states/configuration/clusters/connector.pug | 104 ++++
.../configuration/clusters/deployment.jade | 237 --------
.../configuration/clusters/deployment.pug | 237 ++++++++
.../configuration/clusters/discovery.jade | 88 ---
.../states/configuration/clusters/discovery.pug | 88 +++
.../states/configuration/clusters/events.jade | 68 ---
.../states/configuration/clusters/events.pug | 68 +++
.../states/configuration/clusters/failover.jade | 73 ---
.../states/configuration/clusters/failover.pug | 73 +++
.../states/configuration/clusters/general.jade | 76 ---
.../states/configuration/clusters/general.pug | 76 +++
.../clusters/general/discovery/cloud.jade | 134 ----
.../clusters/general/discovery/cloud.pug | 134 ++++
.../clusters/general/discovery/google.jade | 38 --
.../clusters/general/discovery/google.pug | 38 ++
.../clusters/general/discovery/jdbc.jade | 31 -
.../clusters/general/discovery/jdbc.pug | 31 +
.../clusters/general/discovery/multicast.jade | 99 ---
.../clusters/general/discovery/multicast.pug | 99 +++
.../clusters/general/discovery/s3.jade | 27 -
.../clusters/general/discovery/s3.pug | 27 +
.../clusters/general/discovery/shared.jade | 23 -
.../clusters/general/discovery/shared.pug | 23 +
.../clusters/general/discovery/vm.jade | 79 ---
.../clusters/general/discovery/vm.pug | 79 +++
.../clusters/general/discovery/zookeeper.jade | 85 ---
.../clusters/general/discovery/zookeeper.pug | 85 +++
.../bounded-exponential-backoff.jade | 27 -
.../retrypolicy/bounded-exponential-backoff.pug | 27 +
.../discovery/zookeeper/retrypolicy/custom.jade | 24 -
.../discovery/zookeeper/retrypolicy/custom.pug | 24 +
.../retrypolicy/exponential-backoff.jade | 27 -
.../retrypolicy/exponential-backoff.pug | 27 +
.../zookeeper/retrypolicy/forever.jade | 22 -
.../discovery/zookeeper/retrypolicy/forever.pug | 22 +
.../zookeeper/retrypolicy/n-times.jade | 25 -
.../discovery/zookeeper/retrypolicy/n-times.pug | 25 +
.../zookeeper/retrypolicy/one-time.jade | 23 -
.../zookeeper/retrypolicy/one-time.pug | 23 +
.../zookeeper/retrypolicy/until-elapsed.jade | 25 -
.../zookeeper/retrypolicy/until-elapsed.pug | 25 +
.../states/configuration/clusters/igfs.jade | 38 --
.../states/configuration/clusters/igfs.pug | 38 ++
.../configuration/clusters/load-balancing.jade | 107 ----
.../configuration/clusters/load-balancing.pug | 107 ++++
.../states/configuration/clusters/logger.jade | 66 --
.../states/configuration/clusters/logger.pug | 66 ++
.../configuration/clusters/logger/custom.jade | 25 -
.../configuration/clusters/logger/custom.pug | 25 +
.../configuration/clusters/logger/log4j.jade | 50 --
.../configuration/clusters/logger/log4j.pug | 50 ++
.../configuration/clusters/logger/log4j2.jade | 39 --
.../configuration/clusters/logger/log4j2.pug | 39 ++
.../configuration/clusters/marshaller.jade | 76 ---
.../configuration/clusters/marshaller.pug | 76 +++
.../states/configuration/clusters/metrics.jade | 51 --
.../states/configuration/clusters/metrics.pug | 51 ++
.../states/configuration/clusters/odbc.jade | 48 --
.../states/configuration/clusters/odbc.pug | 48 ++
.../states/configuration/clusters/ssl.jade | 110 ----
.../states/configuration/clusters/ssl.pug | 110 ++++
.../states/configuration/clusters/swap.jade | 72 ---
.../states/configuration/clusters/swap.pug | 72 +++
.../states/configuration/clusters/thread.jade | 48 --
.../states/configuration/clusters/thread.pug | 48 ++
.../states/configuration/clusters/time.jade | 47 --
.../states/configuration/clusters/time.pug | 47 ++
.../configuration/clusters/transactions.jade | 69 ---
.../configuration/clusters/transactions.pug | 69 +++
.../states/configuration/domains/general.jade | 52 --
.../states/configuration/domains/general.pug | 52 ++
.../states/configuration/domains/query.jade | 172 ------
.../states/configuration/domains/query.pug | 172 ++++++
.../states/configuration/domains/store.jade | 127 ----
.../states/configuration/domains/store.pug | 127 ++++
.../modules/states/configuration/igfs/dual.jade | 42 --
.../modules/states/configuration/igfs/dual.pug | 42 ++
.../states/configuration/igfs/fragmentizer.jade | 43 --
.../states/configuration/igfs/fragmentizer.pug | 43 ++
.../states/configuration/igfs/general.jade | 57 --
.../states/configuration/igfs/general.pug | 57 ++
.../modules/states/configuration/igfs/ipc.jade | 60 --
.../modules/states/configuration/igfs/ipc.pug | 60 ++
.../modules/states/configuration/igfs/misc.jade | 108 ----
.../modules/states/configuration/igfs/misc.pug | 108 ++++
.../states/configuration/igfs/secondary.jade | 45 --
.../states/configuration/igfs/secondary.pug | 45 ++
.../configuration/summary/summary.controller.js | 5 +
.../frontend/app/modules/states/errors.state.js | 4 +-
.../app/modules/states/password.state.js | 6 +-
.../app/modules/states/profile.state.js | 4 +-
.../frontend/app/modules/states/signin.state.js | 2 +-
.../frontend/app/services/Clone.service.js | 4 +-
.../frontend/app/services/Confirm.service.js | 4 +-
.../app/services/ConfirmBatch.service.js | 4 +-
.../frontend/controllers/caches-controller.js | 4 +-
.../frontend/controllers/domains-controller.js | 4 +-
.../frontend/gulpfile.babel.js/paths.js | 28 +-
.../frontend/gulpfile.babel.js/tasks/build.js | 2 +-
.../frontend/gulpfile.babel.js/tasks/bundle.js | 8 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 49 --
.../frontend/gulpfile.babel.js/tasks/watch.js | 5 +-
.../gulpfile.babel.js/webpack/common.js | 292 ++++-----
.../webpack/environments/development.js | 90 ++-
.../webpack/environments/production.js | 41 +-
.../webpack/environments/test.js | 52 +-
.../frontend/gulpfile.babel.js/webpack/index.js | 4 +-
modules/web-console/frontend/package.json | 60 +-
.../frontend/test/e2e/exampe.test.js | 4 +-
.../frontend/test/karma.conf.babel.js | 7 +-
.../frontend/test/protractor.conf.js | 16 +-
.../frontend/test/unit/JavaTransformer.test.js | 2 +-
.../frontend/test/unit/JavaTypes.test.js | 137 ++---
.../frontend/test/unit/SharpTransformer.test.js | 2 +-
.../test/unit/SpringTransformer.test.js | 2 +-
.../frontend/test/unit/SqlTypes.test.js | 7 +-
.../frontend/test/unit/UserAuth.test.js | 4 +-
.../frontend/test/unit/Version.test.js | 1 +
.../test/unit/defaultName.filter.test.js | 27 +-
modules/web-console/frontend/views/403.jade | 22 -
modules/web-console/frontend/views/403.pug | 22 +
modules/web-console/frontend/views/404.jade | 22 -
modules/web-console/frontend/views/404.pug | 22 +
modules/web-console/frontend/views/base.jade | 22 -
modules/web-console/frontend/views/base.pug | 22 +
.../frontend/views/configuration/caches.jade | 55 --
.../frontend/views/configuration/caches.tpl.pug | 55 ++
.../frontend/views/configuration/clusters.jade | 68 ---
.../views/configuration/clusters.tpl.pug | 68 +++
.../views/configuration/domains-import.jade | 170 ------
.../views/configuration/domains-import.tpl.pug | 170 ++++++
.../frontend/views/configuration/domains.jade | 66 --
.../views/configuration/domains.tpl.pug | 66 ++
.../frontend/views/configuration/igfs.jade | 51 --
.../frontend/views/configuration/igfs.tpl.pug | 51 ++
.../frontend/views/configuration/sidebar.jade | 29 -
.../views/configuration/sidebar.tpl.pug | 29 +
.../summary-project-structure.jade | 27 -
.../summary-project-structure.tpl.pug | 28 +
.../views/configuration/summary-tabs.jade | 25 -
.../views/configuration/summary-tabs.pug | 25 +
.../frontend/views/configuration/summary.jade | 90 ---
.../views/configuration/summary.tpl.pug | 90 +++
.../frontend/views/includes/footer.jade | 23 -
.../frontend/views/includes/footer.pug | 23 +
.../frontend/views/includes/header.jade | 52 --
.../frontend/views/includes/header.pug | 52 ++
modules/web-console/frontend/views/index.jade | 47 --
modules/web-console/frontend/views/index.pug | 47 ++
modules/web-console/frontend/views/reset.jade | 48 --
.../web-console/frontend/views/reset.tpl.pug | 48 ++
.../frontend/views/settings/admin.jade | 25 -
.../frontend/views/settings/admin.tpl.pug | 25 +
.../frontend/views/settings/profile.jade | 76 ---
.../frontend/views/settings/profile.tpl.pug | 76 +++
modules/web-console/frontend/views/signin.jade | 163 -----
.../web-console/frontend/views/signin.tpl.pug | 163 +++++
.../frontend/views/sql/cache-metadata.jade | 40 --
.../frontend/views/sql/cache-metadata.tpl.pug | 40 ++
.../frontend/views/sql/chart-settings.jade | 40 --
.../frontend/views/sql/chart-settings.tpl.pug | 40 ++
.../frontend/views/sql/notebook-new.jade | 33 -
.../frontend/views/sql/notebook-new.tpl.pug | 33 +
.../frontend/views/sql/paragraph-rate.jade | 31 -
.../frontend/views/sql/paragraph-rate.tpl.pug | 31 +
modules/web-console/frontend/views/sql/sql.jade | 278 ---------
.../web-console/frontend/views/sql/sql.tpl.pug | 278 +++++++++
.../views/templates/agent-download.jade | 50 --
.../views/templates/agent-download.tpl.pug | 50 ++
.../frontend/views/templates/alert.jade | 21 -
.../frontend/views/templates/alert.tpl.pug | 21 +
.../frontend/views/templates/batch-confirm.jade | 34 --
.../views/templates/batch-confirm.tpl.pug | 34 ++
.../frontend/views/templates/clone.jade | 39 --
.../frontend/views/templates/clone.tpl.pug | 39 ++
.../frontend/views/templates/confirm.jade | 33 -
.../frontend/views/templates/confirm.tpl.pug | 33 +
.../frontend/views/templates/demo-info.jade | 47 --
.../frontend/views/templates/demo-info.tpl.pug | 47 ++
.../frontend/views/templates/dropdown.jade | 24 -
.../frontend/views/templates/dropdown.tpl.pug | 24 +
.../views/templates/getting-started.jade | 34 --
.../views/templates/getting-started.tpl.pug | 34 ++
.../frontend/views/templates/message.jade | 28 -
.../frontend/views/templates/message.tpl.pug | 28 +
.../frontend/views/templates/pagination.jade | 32 -
.../frontend/views/templates/select.jade | 26 -
.../frontend/views/templates/select.tpl.pug | 26 +
.../views/templates/validation-error.jade | 25 -
.../views/templates/validation-error.tpl.pug | 25 +
336 files changed, 8866 insertions(+), 8917 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/.eslintrc
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/.eslintrc b/modules/web-console/frontend/.eslintrc
index 988cfa0..958c6d1 100644
--- a/modules/web-console/frontend/.eslintrc
+++ b/modules/web-console/frontend/.eslintrc
@@ -32,6 +32,7 @@ globals:
$generatorOptional: true
saveAs: true
process: true
+ require: true
rules:
arrow-parens: [1, "always"]
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/.gitignore
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/.gitignore b/modules/web-console/frontend/.gitignore
index 46bca13..27138f6 100644
--- a/modules/web-console/frontend/.gitignore
+++ b/modules/web-console/frontend/.gitignore
@@ -1,5 +1,6 @@
*.idea
*.log
+*.log.*
.npmrc
build/*
node_modules
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/app.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.config.js b/modules/web-console/frontend/app/app.config.js
index 39d761f..3ca5c3b 100644
--- a/modules/web-console/frontend/app/app.config.js
+++ b/modules/web-console/frontend/app/app.config.js
@@ -16,6 +16,7 @@
*/
import _ from 'lodash';
+import angular from 'angular';
const nonNil = _.negate(_.isNil);
const nonEmpty = _.negate(_.isEmpty);
@@ -25,7 +26,10 @@ _.mixin({
nonEmpty
});
-import alertTemplateUrl from '../views/templates/alert.jade';
+import alertTemplateUrl from 'views/templates/alert.tpl.pug';
+import selectTemplateUrl from 'views/templates/select.tpl.pug';
+import dropdownTemplateUrl from 'views/templates/dropdown.tpl.pug';
+import validationTemplateUrl from 'views/templates/validation-error.tpl.pug';
const igniteConsoleCfg = angular.module('ignite-console.config', ['ngAnimate', 'mgcrea.ngStrap']);
@@ -48,7 +52,7 @@ igniteConsoleCfg.config(['$popoverProvider', ($popoverProvider) => {
trigger: 'manual',
placement: 'right',
container: 'body',
- templateUrl: '/templates/validation-error.html'
+ templateUrl: validationTemplateUrl
});
}]);
@@ -70,7 +74,7 @@ igniteConsoleCfg.config(['$selectProvider', ($selectProvider) => {
maxLength: '5',
allText: 'Select All',
noneText: 'Clear All',
- templateUrl: '/templates/select.html',
+ templateUrl: selectTemplateUrl,
iconCheckmark: 'fa fa-check',
caretHtml: ''
});
@@ -91,7 +95,7 @@ igniteConsoleCfg.config(['$alertProvider', ($alertProvider) => {
// AngularStrap dropdowns () configuration.
igniteConsoleCfg.config(['$dropdownProvider', ($dropdownProvider) => {
angular.extend($dropdownProvider.defaults, {
- templateUrl: 'templates/dropdown.html'
+ templateUrl: dropdownTemplateUrl
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index 9958cb5..5e3bb07 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -19,7 +19,6 @@ import '../public/stylesheets/style.scss';
import '../app/components/ui-grid-header/ui-grid-header.scss';
import '../app/components/ui-grid-settings/ui-grid-settings.scss';
import '../app/components/form-field-datepicker/form-field-datepicker.scss';
-import './helpers/jade/mixins.jade';
import './app.config';
@@ -122,7 +121,7 @@ import IgniteActivitiesUserDialog from './components/activities-user-dialog';
// Inject external modules.
import 'ignite_modules_temp/index';
-import baseTemplate from '../views/base.jade';
+import baseTemplate from 'views/base.pug';
angular
.module('ignite-console', [
@@ -242,12 +241,12 @@ angular
.state('base', {
url: '',
abstract: true,
- templateUrl: baseTemplate
+ template: baseTemplate
})
.state('settings', {
url: '/settings',
abstract: true,
- templateUrl: baseTemplate
+ template: baseTemplate
});
$urlRouterProvider.otherwise('/404');
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
deleted file mode 100644
index 074851c..0000000
--- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
+++ /dev/null
@@ -1,36 +0,0 @@
-//-
- 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.
-
-.modal(tabindex='-1' role='dialog')
- .modal-dialog
- .modal-content
- .modal-header
- h4.modal-title
- i.fa.fa-info-circle
- | Activities: {{ ctrl.user.userName }}
- .modal-body.modal-body-with-scroll(id='activities-user-dialog')
- table.table.table-striped.table-bordered.table-hover(scrollable-container='#activities-user-dialog' st-table='displayedRows' st-safe-src='ctrl.data')
- thead
- th.text-center(st-sort='action | translate') Description
- th.text-center(st-sort='action') Action
- th.text-center(st-sort='amount') Visited
- tbody
- tr(ng-repeat='row in displayedRows')
- td.text-left {{ row.action | translate }}
- td.text-left {{ row.action }}
- td.text-left {{ row.amount }}
- .modal-footer
- button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$hide()') Close
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
new file mode 100644
index 0000000..074851c
--- /dev/null
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
@@ -0,0 +1,36 @@
+//-
+ 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.
+
+.modal(tabindex='-1' role='dialog')
+ .modal-dialog
+ .modal-content
+ .modal-header
+ h4.modal-title
+ i.fa.fa-info-circle
+ | Activities: {{ ctrl.user.userName }}
+ .modal-body.modal-body-with-scroll(id='activities-user-dialog')
+ table.table.table-striped.table-bordered.table-hover(scrollable-container='#activities-user-dialog' st-table='displayedRows' st-safe-src='ctrl.data')
+ thead
+ th.text-center(st-sort='action | translate') Description
+ th.text-center(st-sort='action') Action
+ th.text-center(st-sort='amount') Visited
+ tbody
+ tr(ng-repeat='row in displayedRows')
+ td.text-left {{ row.action | translate }}
+ td.text-left {{ row.action }}
+ td.text-left {{ row.amount }}
+ .modal-footer
+ button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$hide()') Close
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/activities-user-dialog/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/index.js b/modules/web-console/frontend/app/components/activities-user-dialog/index.js
index dca6ba9..2f8fdef 100644
--- a/modules/web-console/frontend/app/components/activities-user-dialog/index.js
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/index.js
@@ -16,7 +16,7 @@
*/
import controller from './activities-user-dialog.controller';
- import templateUrl from './activities-user-dialog.jade';
+ import templateUrl from './activities-user-dialog.tpl.pug';
export default ['$modal', ($modal) => ({ show = true, user }) => {
const ActivitiesUserDialog = $modal({
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
deleted file mode 100644
index 2578cf4..0000000
--- a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
+++ /dev/null
@@ -1,55 +0,0 @@
-//-
- 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.
-
-mixin ignite-form-field-datepicker(label, model, name, disabled, required, placeholder, tip)
- mixin form-field-input()
- input.form-control(
- id='{{ #{name} }}Input'
- name='{{ #{name} }}'
-
- placeholder=placeholder
-
- data-ng-model=model
-
- data-ng-required=required && '#{required}'
- data-ng-disabled=disabled && '#{disabled}'
-
- bs-datepicker
- data-date-format='MMM yyyy'
- data-start-view='1'
- data-min-view='1'
- data-max-date='today'
-
- data-container='body > .wrapper'
-
- tabindex='0'
-
- onkeydown="return false"
-
- data-ignite-form-panel-field=''
- )&attributes(attributes.attributes)
-
- .ignite-form-field
- +ignite-form-field__label(label, name, required)
- .ignite-form-field__control
- if tip
- i.tipField.icon-help(bs-tooltip='' data-title=tip)
-
- if block
- block
-
- .input-tip
- +form-field-input(attributes=attributes)
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.pug b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.pug
new file mode 100644
index 0000000..c9d382c
--- /dev/null
+++ b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.pug
@@ -0,0 +1,55 @@
+//-
+ 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.
+
+mixin ignite-form-field-datepicker(label, model, name, disabled, required, placeholder, tip)
+ mixin form-field-input()
+ input.form-control(
+ id=`{{ ${name} }}Input`
+ name=`{{ ${name} }}`
+
+ placeholder=placeholder
+
+ data-ng-model=model
+
+ data-ng-required=required && `${required}`
+ data-ng-disabled=disabled && `${disabled}`
+
+ bs-datepicker
+ data-date-format='MMM yyyy'
+ data-start-view='1'
+ data-min-view='1'
+ data-max-date='today'
+
+ data-container='body > .wrapper'
+
+ tabindex='0'
+
+ onkeydown="return false"
+
+ data-ignite-form-panel-field=''
+ )&attributes(attributes.attributes)
+
+ .ignite-form-field
+ +ignite-form-field__label(label, name, required)
+ .ignite-form-field__control
+ if tip
+ i.tipField.icon-help(bs-tooltip='' data-title=tip)
+
+ if block
+ block
+
+ .input-tip
+ +form-field-input(attributes=attributes)
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/list-of-registered-users/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/index.js b/modules/web-console/frontend/app/components/list-of-registered-users/index.js
index 32a34f4..22a89da 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/index.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/index.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './list-of-registered-users.jade';
+import templateUrl from './list-of-registered-users.tpl.pug';
import controller from './list-of-registered-users.controller';
export default [() => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index f65958b..54971b1 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import headerTemplate from 'app/components/ui-grid-header/ui-grid-header.jade';
+import headerTemplate from 'app/components/ui-grid-header/ui-grid-header.tpl.pug';
import columnDefs from './list-of-registered-users.column-defs';
import categories from './list-of-registered-users.categories';
@@ -30,9 +30,9 @@ const rowTemplate = `<div
ui-grid-cell/>`;
export default class IgniteListOfRegisteredUsersCtrl {
- static $inject = ['$scope', '$state', '$filter', '$templateCache', 'User', 'uiGridConstants', 'IgniteAdminData', 'IgniteNotebookData', 'IgniteConfirm', 'IgniteActivitiesUserDialog'];
+ static $inject = ['$scope', '$state', '$filter', 'User', 'uiGridConstants', 'IgniteAdminData', 'IgniteNotebookData', 'IgniteConfirm', 'IgniteActivitiesUserDialog'];
- constructor($scope, $state, $filter, $templateCache, User, uiGridConstants, AdminData, NotebookData, Confirm, ActivitiesUserDialog) {
+ constructor($scope, $state, $filter, User, uiGridConstants, AdminData, NotebookData, Confirm, ActivitiesUserDialog) {
const $ctrl = this;
const companySelectOptions = [];
@@ -110,7 +110,7 @@ export default class IgniteListOfRegisteredUsersCtrl {
columnVirtualizationThreshold: 30,
columnDefs,
categories,
- headerTemplate: $templateCache.get(headerTemplate),
+ headerTemplate,
rowTemplate,
enableFiltering: true,
enableRowSelection: true,
@@ -154,6 +154,9 @@ export default class IgniteListOfRegisteredUsersCtrl {
AdminData.loadUsers(params)
.then((data) => $ctrl.gridOptions.data = data)
.then((data) => {
+ companySelectOptions.length = 0;
+ countrySelectOptions.length = 0;
+
companySelectOptions.push(...usersToFilterOptions('company'));
countrySelectOptions.push(...usersToFilterOptions('countryCode'));
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
deleted file mode 100644
index 1195910..0000000
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
+++ /dev/null
@@ -1,58 +0,0 @@
-//-
- 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.
-
-include /app/helpers/jade/mixins.jade
-include /app/components/form-field-datepicker/form-field-datepicker.jade
-
-mixin grid-settings()
- i.fa.fa-bars(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click')
- ul.select.dropdown-menu(role='menu')
- li(ng-repeat='item in $ctrl.gridOptions.categories|filter:{selectable:true}')
- a(ng-click='$ctrl.toggleColumns(item, !item.visible)')
- i.fa.fa-check-square-o.pull-left(ng-if='item.visible')
- i.fa.fa-square-o.pull-left(ng-if='!item.visible')
- span {{::item.name}}
- li.divider
- li
- a(ng-click='$ctrl.selectAllColumns()') Select all
- li
- a(ng-click='$ctrl.clearAllColumns()') Clear all
- li.divider
- li
- a(ng-click='$hide()') Close
-
-.panel.panel-default
- .panel-heading.ui-grid-settings
- +grid-settings
- label Total users:
- strong {{ $ctrl.gridOptions.data.length }}
- label Showing users:
- strong {{ $ctrl.gridApi.grid.getVisibleRows().length }}
- sub(ng-show='users.length === $ctrl.gridApi.grid.getVisibleRows().length') all
-
- form.pull-right(ng-form=form novalidate)
- -var form = 'admin'
-
- button.btn.btn-primary(ng-click='$ctrl.exportCsv()' bs-tooltip data-title='Export table to csv') Export
-
- .ui-grid-settings-dateperiod
- +ignite-form-field-datepicker('Period:', '$ctrl.params.startDate', '"period"')
-
- .ui-grid-settings-filter
- +ignite-form-field-text('Exclude:', '$ctrl.params.companiesExclude', '"exclude"', false, false, 'Exclude by company name...')
-
- .panel-collapse
- .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-exporter ui-grid-pinning)
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
new file mode 100644
index 0000000..52975b9
--- /dev/null
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
@@ -0,0 +1,58 @@
+//-
+ 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.
+
+include /app/helpers/jade/mixins
+include /app/components/form-field-datepicker/form-field-datepicker.pug
+
+mixin grid-settings()
+ i.fa.fa-bars(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click')
+ ul.select.dropdown-menu(role='menu')
+ li(ng-repeat='item in $ctrl.gridOptions.categories|filter:{selectable:true}')
+ a(ng-click='$ctrl.toggleColumns(item, !item.visible)')
+ i.fa.fa-check-square-o.pull-left(ng-if='item.visible')
+ i.fa.fa-square-o.pull-left(ng-if='!item.visible')
+ span {{::item.name}}
+ li.divider
+ li
+ a(ng-click='$ctrl.selectAllColumns()') Select all
+ li
+ a(ng-click='$ctrl.clearAllColumns()') Clear all
+ li.divider
+ li
+ a(ng-click='$hide()') Close
+
+.panel.panel-default
+ .panel-heading.ui-grid-settings
+ +grid-settings
+ label Total users:
+ strong {{ $ctrl.gridOptions.data.length }}
+ label Showing users:
+ strong {{ $ctrl.gridApi.grid.getVisibleRows().length }}
+ sub(ng-show='users.length === $ctrl.gridApi.grid.getVisibleRows().length') all
+
+ form.pull-right(ng-form=form novalidate)
+ -var form = 'admin'
+
+ button.btn.btn-primary(ng-click='$ctrl.exportCsv()' bs-tooltip data-title='Export table to csv') Export
+
+ .ui-grid-settings-dateperiod
+ +ignite-form-field-datepicker('Period:', '$ctrl.params.startDate', '"period"')
+
+ .ui-grid-settings-filter
+ +ignite-form-field-text('Exclude:', '$ctrl.params.companiesExclude', '"exclude"', false, false, 'Exclude by company name...')
+
+ .panel-collapse
+ .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-exporter ui-grid-pinning)
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade
deleted file mode 100644
index 7e44d94..0000000
--- a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade
+++ /dev/null
@@ -1,27 +0,0 @@
-//-
- 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.
-
-.ui-grid-header.ui-grid-header--subcategories(role='rowgroup')
- .ui-grid-top-panel
- .ui-grid-header-viewport
- .ui-grid-header-canvas
- .ui-grid-header-cell-wrapper(ng-style='colContainer.headerCellWrapperStyle()')
- .ui-grid-header-cell-row(role='row')
- .ui-grid-header-span.ui-grid-header-cell.ui-grid-clearfix(ng-repeat='cat in grid.options.categories')
- div(ng-show='(colContainer.renderedColumns|uiGridSubcategories:cat.name).length > 1')
- .ui-grid-cell-contents {{ cat.name }}
- .ui-grid-header-cell-row
- .ui-grid-header-cell.ui-grid-clearfix(ng-repeat='col in (colContainer.renderedColumns|uiGridSubcategories:cat.name) track by col.uid' ui-grid-header-cell='' col='col' render-index='$index')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.scss b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.scss
index c390504..c6e7bdf 100644
--- a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.scss
+++ b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.scss
@@ -50,6 +50,7 @@
.ui-grid-header-span {
position: relative;
border-right: 0;
+ background: #f5f5f5;
.ng-hide + .ui-grid-header-cell-row .ui-grid-header-cell {
height: 58px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.tpl.pug b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.tpl.pug
new file mode 100644
index 0000000..7e44d94
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.tpl.pug
@@ -0,0 +1,27 @@
+//-
+ 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.
+
+.ui-grid-header.ui-grid-header--subcategories(role='rowgroup')
+ .ui-grid-top-panel
+ .ui-grid-header-viewport
+ .ui-grid-header-canvas
+ .ui-grid-header-cell-wrapper(ng-style='colContainer.headerCellWrapperStyle()')
+ .ui-grid-header-cell-row(role='row')
+ .ui-grid-header-span.ui-grid-header-cell.ui-grid-clearfix(ng-repeat='cat in grid.options.categories')
+ div(ng-show='(colContainer.renderedColumns|uiGridSubcategories:cat.name).length > 1')
+ .ui-grid-cell-contents {{ cat.name }}
+ .ui-grid-header-cell-row
+ .ui-grid-header-cell.ui-grid-clearfix(ng-repeat='col in (colContainer.renderedColumns|uiGridSubcategories:cat.name) track by col.uid' ui-grid-header-cell='' col='col' render-index='$index')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.jade b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.jade
deleted file mode 100644
index 8f1487e..0000000
--- a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.jade
+++ /dev/null
@@ -1,33 +0,0 @@
-//-
- 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.
-
-mixin ui-grid-settings()
- .ui-grid-settings
- i.fa.fa-bars(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click')
- ul.select.dropdown-menu(role='menu')
- li(ng-repeat='item in paragraph.gridOptions.categories|filter:{selectable:true}')
- a(ng-click='paragraph.toggleColumns(item, !item.visible)')
- i.fa.fa-check-square-o.pull-left(ng-if='item.visible')
- i.fa.fa-square-o.pull-left(ng-if='!item.visible')
- span {{::item.name}}
- li.divider
- li
- a(ng-click='paragraph.selectAllColumns()') Select all
- li
- a(ng-click='paragraph.clearAllColumns()') Clear all
- li.divider
- li
- a(ng-click='$hide()') Close
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.pug b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.pug
new file mode 100644
index 0000000..8f1487e
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.pug
@@ -0,0 +1,33 @@
+//-
+ 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.
+
+mixin ui-grid-settings()
+ .ui-grid-settings
+ i.fa.fa-bars(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click')
+ ul.select.dropdown-menu(role='menu')
+ li(ng-repeat='item in paragraph.gridOptions.categories|filter:{selectable:true}')
+ a(ng-click='paragraph.toggleColumns(item, !item.visible)')
+ i.fa.fa-check-square-o.pull-left(ng-if='item.visible')
+ i.fa.fa-square-o.pull-left(ng-if='!item.visible')
+ span {{::item.name}}
+ li.divider
+ li
+ a(ng-click='paragraph.selectAllColumns()') Select all
+ li
+ a(ng-click='paragraph.clearAllColumns()') Clear all
+ li.divider
+ li
+ a(ng-click='$hide()') Close
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/centered/centered.css
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/centered/centered.css b/modules/web-console/frontend/app/directives/centered/centered.css
deleted file mode 100644
index 694c1d2..0000000
--- a/modules/web-console/frontend/app/directives/centered/centered.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-.center-container {
- position: fixed;
- top: 0;
- left: 0;
- height: 100%;
- width: 100%;
- display: table;
- pointer-events: none;
- z-index: 9999;
-}
-
-.centered {
- display: table-cell;
- vertical-align: middle;
- text-align: center;
-}
-
-.centered > * {
- pointer-events: auto;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/centered/centered.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/centered/centered.directive.js b/modules/web-console/frontend/app/directives/centered/centered.directive.js
index 4abd086..77bbb94 100644
--- a/modules/web-console/frontend/app/directives/centered/centered.directive.js
+++ b/modules/web-console/frontend/app/directives/centered/centered.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import './centered.css';
+import './centered.scss';
export default ['centered', [() => {
return {
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/centered/centered.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/centered/centered.scss b/modules/web-console/frontend/app/directives/centered/centered.scss
new file mode 100644
index 0000000..694c1d2
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/centered/centered.scss
@@ -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.
+ */
+
+.center-container {
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ display: table;
+ pointer-events: none;
+ z-index: 9999;
+}
+
+.centered {
+ display: table-cell;
+ vertical-align: middle;
+ text-align: center;
+}
+
+.centered > * {
+ pointer-events: auto;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/information/information.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/information/information.directive.js b/modules/web-console/frontend/app/directives/information/information.directive.js
index a9a2f8c..6f304ef 100644
--- a/modules/web-console/frontend/app/directives/information/information.directive.js
+++ b/modules/web-console/frontend/app/directives/information/information.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './information.jade';
+import template from './information.pug';
export default ['igniteInformation', [() => {
return {
@@ -23,7 +23,7 @@ export default ['igniteInformation', [() => {
title: '@'
},
restrict: 'E',
- templateUrl,
+ template,
replace: true,
transclude: true
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/information/information.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/information/information.jade b/modules/web-console/frontend/app/directives/information/information.jade
deleted file mode 100644
index b805d4a..0000000
--- a/modules/web-console/frontend/app/directives/information/information.jade
+++ /dev/null
@@ -1,20 +0,0 @@
-//-
- 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.
-
-.block-information
- span.icon.fa.fa-info-circle(ng-if='title')
- h3(ng-if='title') {{::title}}
- div(ng-transclude='')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/information/information.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/information/information.pug b/modules/web-console/frontend/app/directives/information/information.pug
new file mode 100644
index 0000000..b805d4a
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/information/information.pug
@@ -0,0 +1,20 @@
+//-
+ 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.
+
+.block-information
+ span.icon.fa.fa-info-circle(ng-if='title')
+ h3(ng-if='title') {{::title}}
+ div(ng-transclude='')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.directive.js b/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.directive.js
index 08e4f76..9042acb 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './ui-ace-docker.jade';
+import template from './ui-ace-docker.pug';
import controller from './ui-ace-docker.controller';
export default ['igniteUiAceDocker', [() => {
@@ -38,7 +38,7 @@ export default ['igniteUiAceDocker', [() => {
data: '=ngModel'
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['?^igniteUiAceTabs']
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.jade b/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.jade
deleted file mode 100644
index 3a24cfb..0000000
--- a/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.jade
+++ /dev/null
@@ -1,31 +0,0 @@
-//-
- 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.
-
-mixin hard-link(ref, txt)
- a(style='color:#ec1c24' href=ref target='_blank') #{txt}
-
-.panel-details-noborder
- .details-row
- p
- +hard-link('https://docs.docker.com/engine/reference/builder/', 'Docker')
- | file is a text file with instructions to create Docker image.<br/>
- | To build image you have to store following Docker file with your Ignite XML configuration to the same directory.<br>
- | Also you could use predefined
- +hard-link('https://ignite.apache.org/download.html#docker', 'Apache Ignite docker image')
- | . For more information about using Ignite with Docker please read
- +hard-link('http://apacheignite.readme.io/docs/docker-deployment', 'documentation')
- |.
- .details-row(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.pug b/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.pug
new file mode 100644
index 0000000..3a24cfb
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/ui-ace-docker/ui-ace-docker.pug
@@ -0,0 +1,31 @@
+//-
+ 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.
+
+mixin hard-link(ref, txt)
+ a(style='color:#ec1c24' href=ref target='_blank') #{txt}
+
+.panel-details-noborder
+ .details-row
+ p
+ +hard-link('https://docs.docker.com/engine/reference/builder/', 'Docker')
+ | file is a text file with instructions to create Docker image.<br/>
+ | To build image you have to store following Docker file with your Ignite XML configuration to the same directory.<br>
+ | Also you could use predefined
+ +hard-link('https://ignite.apache.org/download.html#docker', 'Apache Ignite docker image')
+ | . For more information about using Ignite with Docker please read
+ +hard-link('http://apacheignite.readme.io/docs/docker-deployment', 'documentation')
+ |.
+ .details-row(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.directive.js b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.directive.js
index c21bff7..5f43b23 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './ui-ace-java.jade';
+import template from './ui-ace-java.pug';
import controller from './ui-ace-java.controller';
export default ['igniteUiAceJava', [() => {
@@ -55,7 +55,7 @@ export default ['igniteUiAceJava', [() => {
client: '@'
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['igniteUiAceJava', '?^igniteUiAceTabs', '?^form', '?ngModel']
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.jade b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.jade
deleted file mode 100644
index 5acffb8..0000000
--- a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.jade
+++ /dev/null
@@ -1,22 +0,0 @@
-//-
- 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.
-
-div(ng-if='ctrl.data'
- ignite-ace='{onLoad: onLoad, \
- onChange: onChange, \
- renderOptions: renderOptions, \
- mode: "java"}'
- ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.pug b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.pug
new file mode 100644
index 0000000..5acffb8
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.pug
@@ -0,0 +1,22 @@
+//-
+ 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.
+
+div(ng-if='ctrl.data'
+ ignite-ace='{onLoad: onLoad, \
+ onChange: onChange, \
+ renderOptions: renderOptions, \
+ mode: "java"}'
+ ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
index 7c224b7..8a8d047 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './ui-ace-pojos.jade';
+import template from './ui-ace-pojos.pug';
import controller from './ui-ace-pojos.controller';
export default ['igniteUiAcePojos', [() => {
@@ -38,7 +38,7 @@ export default ['igniteUiAcePojos', [() => {
pojos: '=ngModel'
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['?^igniteUiAceTabs']
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.jade
deleted file mode 100644
index 581b8c1..0000000
--- a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.jade
+++ /dev/null
@@ -1,40 +0,0 @@
-//-
- 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.
-
-mixin check-tooltip(message)
- i.tipLabel.icon-help(bs-tooltip='"#{message}"')
-
-.panel-details-noborder
- .details-row
- .col-xs-2.col-sm-2.col-md-2
- label POJO class:
- .col-xs-10.col-sm-10.col-md-10.summary-pojo-list
- button.select-toggle.form-control(ng-model='ctrl.class' bs-select bs-options='item for item in ctrl.classes' data-container='')
- .details-row.checkbox
- .col-xs-2.col-sm-2.col-md-2
- .col-xs-10.col-sm-10.col-md-10
- label
- input(type='checkbox' ng-model='ctrl.useConstructor')
- | Generate constructors
- +check-tooltip("Generate empty and full constructors in POJO classes")
- .details-row.checkbox
- .col-xs-2.col-sm-2.col-md-2
- .col-xs-10.col-sm-10.col-md-10
- label
- input(type='checkbox' ng-model='ctrl.includeKeyFields')
- | Include key fields
- +check-tooltip("Generate key fields in POJO value class")
- .details-row(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
new file mode 100644
index 0000000..4bee5e5
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
@@ -0,0 +1,40 @@
+//-
+ 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.
+
+mixin check-tooltip(message)
+ i.tipLabel.icon-help(bs-tooltip=`"${message}"`)
+
+.panel-details-noborder
+ .details-row
+ .col-xs-2.col-sm-2.col-md-2
+ label POJO class:
+ .col-xs-10.col-sm-10.col-md-10.summary-pojo-list
+ button.select-toggle.form-control(ng-model='ctrl.class' bs-select bs-options='item for item in ctrl.classes' data-container='')
+ .details-row.checkbox
+ .col-xs-2.col-sm-2.col-md-2
+ .col-xs-10.col-sm-10.col-md-10
+ label
+ input(type='checkbox' ng-model='ctrl.useConstructor')
+ | Generate constructors
+ +check-tooltip("Generate empty and full constructors in POJO classes")
+ .details-row.checkbox
+ .col-xs-2.col-sm-2.col-md-2
+ .col-xs-10.col-sm-10.col-md-10
+ label
+ input(type='checkbox' ng-model='ctrl.includeKeyFields')
+ | Include key fields
+ +check-tooltip("Generate key fields in POJO value class")
+ .details-row(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.directive.js b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.directive.js
index 2a7a878..664d3a0 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './ui-ace-pom.jade';
+import template from './ui-ace-pom.pug';
import controller from './ui-ace-pom.controller';
export default ['igniteUiAcePom', [() => {
@@ -33,7 +33,7 @@ export default ['igniteUiAcePom', [() => {
cluster: '='
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['?^igniteUiAceTabs']
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.jade b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.jade
deleted file mode 100644
index b973a74..0000000
--- a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-//-
- 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.
-
-div(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.pug b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.pug
new file mode 100644
index 0000000..b973a74
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.pug
@@ -0,0 +1,17 @@
+//-
+ 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.
+
+div(ng-if='ctrl.data' ignite-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.directive.js b/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.directive.js
index 5d9ad79..5a37b80 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import templateUrl from './ui-ace-sharp.jade';
+import template from './ui-ace-sharp.pug';
import controller from './ui-ace-sharp.controller';
export default ['igniteUiAceSharp', ['IgniteSharpTransformer', (generator) => {
@@ -125,7 +125,7 @@ export default ['igniteUiAceSharp', ['IgniteSharpTransformer', (generator) => {
data: '=?ngModel'
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['igniteUiAceSharp', '?^igniteUiAceTabs', '?^form', '?ngModel']
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.jade b/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.jade
deleted file mode 100644
index d3f9e44..0000000
--- a/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.jade
+++ /dev/null
@@ -1,22 +0,0 @@
-//-
- 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.
-
-div(ng-if='ctrl.data'
- ignite-ace='{onLoad: onLoad, \
- onChange: onChange, \
- renderOptions: renderOptions, \
- mode: "csharp"}'
- ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.pug b/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.pug
new file mode 100644
index 0000000..d3f9e44
--- /dev/null
+++ b/modules/web-console/frontend/app/directives/ui-ace-sharp/ui-ace-sharp.pug
@@ -0,0 +1,22 @@
+//-
+ 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.
+
+div(ng-if='ctrl.data'
+ ignite-ace='{onLoad: onLoad, \
+ onChange: onChange, \
+ renderOptions: renderOptions, \
+ mode: "csharp"}'
+ ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/1080e686/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.directive.js b/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.directive.js
index 42d25b6..de3f434 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.directive.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.directive.js
@@ -17,7 +17,7 @@
import _ from 'lodash';
-import templateUrl from './ui-ace-spring.jade';
+import template from './ui-ace-spring.pug';
import controller from './ui-ace-spring.controller';
export default ['igniteUiAceSpring', [() => {
@@ -58,7 +58,7 @@ export default ['igniteUiAceSpring', [() => {
client: '@'
},
link,
- templateUrl,
+ template,
controller,
controllerAs: 'ctrl',
require: ['igniteUiAceSpring', '?^igniteUiAceTabs', '?^form', '?ngModel']