Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 c1236b665 -> e2fa63493
IGNITE-843 Clean up. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2fa6349 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2fa6349 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2fa6349 Branch: refs/heads/ignite-843-rc2 Commit: e2fa63493c30ff4d143c9b2675c8df1eb38ebd4e Parents: c1236b6 Author: Andrey <[email protected]> Authored: Mon Dec 21 15:27:05 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Dec 21 15:27:05 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/views/configuration/caches.jade | 20 +++++--------------- .../main/js/views/configuration/clusters.jade | 13 ++++--------- .../src/main/js/views/configuration/igfs.jade | 18 +++++------------- .../main/js/views/configuration/metadata.jade | 18 +++++------------- .../main/js/views/configuration/summary.jade | 4 ++-- 5 files changed, 21 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/caches.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index 113ea89..d10f3b3 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -28,23 +28,13 @@ include ../includes/controls ignite-dialog More info ignite-dialog-title Caches screen ignite-dialog-content - | Caches can be linked with specified - a(href='/configuration/clusters') clusters - | and - a(href='/configuration/metadata') metadata - | , - br - | Generated cluster with caches configuration available on - a(href='/configuration/summary') summary - | screen. + | Caches can be linked with specified #[a(ui-sref='base.configuration.clusters') clusters] and #[a(ui-sref='base.configuration.metadata') metadata].#[br] + | Generated cluster with caches configuration available on #[a(ui-sref='base.configuration.summary') summary] screen. ignite-callout-cel(data-title='Next Steps') - li Continue to - a(ui-sref='base.configuration.metadata') Metadata - li Continue to - a(ui-sref='base.configuration.summary') Summary - li Back to - a(ui-sref='base.configuration.clusters') Clusters + li Continue to #[a(ui-sref='base.configuration.metadata') Metadata] + li Continue to #[a(ui-sref='base.configuration.summary') Summary] + li Back to #[a(ui-sref='base.configuration.clusters') Clusters] div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen...", className: "page-loading-overlay"}') div(ng-show='ui.ready') http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index d18fcca..90b3249 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -27,17 +27,12 @@ include ../includes/controls ignite-dialog More info ignite-dialog-title Clusters screen ignite-dialog-content - | Manage your clusters on current screen. - br - | Generated clusters configuration available on - a(href='/configuration/summary') summary - | screen. + | Manage your clusters on current screen.#[br] + | Generated clusters configuration available on #[a(ui-sref='base.configuration.summary') summary] screen. ignite-callout-cel(data-title='Next Steps') - li Continue to - a(ui-sref='base.configuration.caches') Caches - li Continue to - a(ui-sref='base.configuration.summary') Summary + li Continue to #[a(ui-sref='base.configuration.caches') Caches] + li Continue to #[a(ui-sref='base.configuration.summary') Summary] div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen...", className: "page-loading-overlay"}') div(ng-show='ui.ready') http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/igfs.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade index 7b5a311..0f73988 100644 --- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade +++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade @@ -26,21 +26,13 @@ include ../includes/controls ignite-dialog More info ignite-dialog-title IGFS screen ignite-dialog-content - | Manage your IGFS file systems on current screen. - br - | IGFS can be assigned to specified - a(href='/configuration/clusters') clusters - | . - br - | Generated cluster with IGFS available on - a(href='/configuration/summary') summary - | screen. + | Manage your IGFS file systems on current screen.#[br] + | IGFS can be assigned to specified #[a(ui-sref='base.configuration.clusters') clusters].#[br] + | Generated cluster with IGFS available on #[a(ui-sref='base.configuration.summary') summary] screen. ignite-callout-cel(data-title='Next Steps') - li Continue to - a(ui-sref='base.configuration.summary') Summary - li Back to - a(ui-sref='base.configuration.clusters') Clusters + li Continue to #[a(ui-sref='base.configuration.summary') Summary] + li Back to #[a(ui-sref='base.configuration.clusters') Clusters] div(dw-loading='loadingIgfsScreen' dw-loading-options='{text: "Loading IGFS screen...", className: "page-loading-overlay"}') div(ng-show='ui.ready') http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/metadata.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade index 91fe1dc..b4aa5a0 100644 --- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade +++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade @@ -27,21 +27,13 @@ include ../includes/controls ignite-dialog More info ignite-dialog-title Metadata screen ignite-dialog-content - | Metadata can be assigned to specified - a(href='/configuration/caches') caches - | . - br - | Generated cluster with caches with metadata configuration available on - a(href='/configuration/summary') summary - | screen. + | Metadata can be assigned to specified #[a(ui-sref='base.configuration.caches') caches].#[br] + | Generated cluster with caches and metadata configuration available on #[a(ui-sref='base.configuration.summary') summary] screen. ignite-callout-cel(data-title='Next Steps') - li Continue to - a(ui-sref='base.configuration.summary') Summary - li Back to - a(ui-sref='base.configuration.caches') Caches - li Back to - a(ui-sref='base.configuration.clusters') Clusters + li Continue to #[a(ui-sref='base.configuration.summary') Summary] + li Back to #[a(ui-sref='base.configuration.caches') Caches] + li Back to #[a(ui-sref='base.configuration.clusters') Clusters] div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata screen...", className: "page-loading-overlay"}') div(ng-show='ui.ready') http://git-wip-us.apache.org/repos/asf/ignite/blob/e2fa6349/modules/control-center-web/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index e6fc856..e27572d 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -37,8 +37,8 @@ mixin ignite-form-field-tooltip(message) | Configurations available in XML, Java and Dockerfile format for Server and Client mode.#[br] | Database table POJO classes for cluster's metadata available on "POJO" tab.#[br] | Use "Download" button to receive configurations in ZIP file.#[br] - | Go back to change configuration on #[a(href='/configuration/clusters') clusters] , - | #[a(href='/configuration/caches') caches] or #[a(href='/configuration/metadata') metadata] screen. + | Go back to change configuration on #[a(ui-sref='base.configuration.clusters') clusters], + | #[a(ui-sref='base.configuration.caches') caches] or #[a(ui-sref='base.configuration.metadata') metadata] screen. ignite-callout-cel(data-title='Next Steps') li Deploy Ignite Servers
