You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/14 04:50:56 UTC
[1/2] ignite git commit: IGNITE-2125 develop common directive to show
dialog with info - Fixes #320.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 4ad4f76d9 -> ef610b289
IGNITE-2125 develop common directive to show dialog with info - Fixes #320.
Signed-off-by: Andrey <an...@gridgain.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ad03a01
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ad03a01
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ad03a01
Branch: refs/heads/ignite-843-rc2
Commit: 8ad03a012f9c0091114e4dc14014317dcb925da8
Parents: 4ad4f76
Author: Dmitriyff <dm...@gmail.com>
Authored: Mon Dec 14 09:06:21 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Dec 14 09:06:21 2015 +0700
----------------------------------------------------------------------
.../js/app/directives/callout/callout-cel.jade | 2 +-
.../main/js/app/directives/callout/callout.scss | 8 +---
.../control-center-web/src/main/js/app/index.js | 2 +
.../modules/dialog/dialog-content.directive.js | 31 +++++++++++++++
.../modules/dialog/dialog-title.directive.js | 31 +++++++++++++++
.../js/app/modules/dialog/dialog.controller.js | 40 ++++++++++++++++++++
.../js/app/modules/dialog/dialog.directive.js | 39 +++++++++++++++++++
.../src/main/js/app/modules/dialog/dialog.jade | 26 +++++++++++++
.../js/app/modules/dialog/dialog.service.js | 32 ++++++++++++++++
.../src/main/js/app/modules/dialog/index.js | 30 +++++++++++++++
.../clusters/more-info/more-info.directive.js | 0
.../src/main/js/controllers/models/caches.json | 6 ---
.../main/js/controllers/models/clusters.json | 5 ---
.../src/main/js/controllers/models/igfs.json | 8 ----
.../main/js/controllers/models/metadata.json | 6 ---
.../src/main/js/controllers/models/summary.json | 9 -----
.../src/main/js/views/configuration/caches.jade | 13 ++++++-
.../main/js/views/configuration/clusters.jade | 13 +++++--
.../src/main/js/views/configuration/igfs.jade | 13 ++++++-
.../main/js/views/configuration/metadata.jade | 11 +++++-
.../main/js/views/configuration/summary.jade | 17 ++++++++-
21 files changed, 294 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
index 02cda27..3be34ac 100644
--- a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
+++ b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.jade
@@ -16,5 +16,5 @@
td.block-callout(width='50%')
i.fa.fa-check-square
- span {{::title}}:
+ b {{::title}}:
ul(ng-transclude='')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/directives/callout/callout.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/callout/callout.scss b/modules/control-center-web/src/main/js/app/directives/callout/callout.scss
index 2d3682a..89cf032 100644
--- a/modules/control-center-web/src/main/js/app/directives/callout/callout.scss
+++ b/modules/control-center-web/src/main/js/app/directives/callout/callout.scss
@@ -35,10 +35,6 @@ $ignite-block-callout-gradient-to: #ffffff;
padding: 10px 5px 0 10px;
}
- span {
- font-weight: bold;
- }
-
ul {
padding: 5px 0 10px 20px;
margin: 0 0 0 10px;
@@ -50,7 +46,7 @@ $ignite-block-callout-gradient-to: #ffffff;
color: $brand-info;
}
- span {
+ b {
color: $brand-info;
}
@@ -63,7 +59,7 @@ $ignite-block-callout-gradient-to: #ffffff;
color: $brand-success;
}
- span {
+ b {
color: $brand-success;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 867755e..bc9372f 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -64,6 +64,7 @@ import './modules/states/profile/index'
import './modules/states/admin/index'
// ignite:modules
+import './modules/dialog/index'
import './modules/navbar/main'
import './modules/settings/main'
import './modules/configuration/sidebar/main'
@@ -101,6 +102,7 @@ angular
'ignite-console.states.profile',
'ignite-console.states.admin',
// Common modules.
+ 'ignite-console.dialog',
'ignite-console.navbar',
'ignite-console.userbar',
'ignite-console.configuration.sidebar',
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
new file mode 100644
index 0000000..bfb76c3
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
@@ -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.
+ */
+
+export default ['igniteDialogContent', ['$compile', ($compile) => {
+
+ let link = ($scope, $element, $attrs, igniteDialog) => {
+ igniteDialog.content = $element.html();
+ $element.hide();
+ };
+
+ return {
+ scope: {},
+ restrict: 'E',
+ link,
+ require: '^igniteDialog'
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
new file mode 100644
index 0000000..ddaf05a
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
@@ -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.
+ */
+
+export default ['igniteDialogTitle', [() => {
+
+ let link = ($scope, $element, $attrs, igniteDialog) => {
+ igniteDialog.title = $element.text();
+ $element.hide();
+ }
+
+ return {
+ scope: {},
+ restrict: 'E',
+ link,
+ require: '^igniteDialog'
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
new file mode 100644
index 0000000..6369f99
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
@@ -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.
+ */
+
+export default ['$rootScope' ,'$scope', 'IgniteDialog', function($root, $scope, Dialog) {
+ let ctrl = this;
+
+ let dialog = new Dialog({
+ scope: $scope
+ });
+
+ ctrl.show = () => {
+ dialog.$promise.then(dialog.show);
+ };
+
+ $scope.$watch(() => ctrl.title, () => {
+ $scope.title = ctrl.title
+ });
+
+ $scope.$watch(() => ctrl.content, () => {
+ $scope.content = ctrl.content
+ });
+
+ $root.$on('$stateChangeStart', () => {
+ dialog.hide();
+ })
+}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
new file mode 100644
index 0000000..813ab73
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+import controller from './dialog.controller';
+
+const template = "<a ng-click='ctrl.show()'><span ng-transclude=''></span></a>";
+
+export default ['igniteDialog', [() => {
+
+ return {
+ scope: {
+ title: '='
+ },
+ bindToController: {
+ title: '='
+ },
+ restrict: 'E',
+ template,
+ controller,
+ controllerAs: 'ctrl',
+ replace: true,
+ transclude: true,
+ require: '^igniteDialog'
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.jade b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.jade
new file mode 100644
index 0000000..0043709
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.jade
@@ -0,0 +1,26 @@
+//-
+ 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
+ button.close(ng-click='$hide()' aria-hidden='true') ×
+ h4.modal-title {{title}}
+ .modal-body(ng-show='content')
+ p(ng-bind-html='content' style='text-align: left;')
+ .modal-footer
+ button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$hide()') Ok
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
new file mode 100644
index 0000000..61c2076
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+import template from './dialog.jade!'
+
+export default ['IgniteDialog', ['$modal', ($modal) => {
+ let defaults = {
+ template: template(),
+ placement: 'center',
+ show: false
+ }
+
+ return function(options) {
+ options = _.extend({}, defaults, options);
+
+ return $modal(options);
+ }
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/dialog/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/index.js b/modules/control-center-web/src/main/js/app/modules/dialog/index.js
new file mode 100644
index 0000000..67bab36
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/index.js
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+import igniteDialog from './dialog.directive';
+import igniteDialogTitle from './dialog-title.directive';
+import igniteDialogContent from './dialog-content.directive';
+import IgniteDialog from './dialog.service';
+
+angular
+.module('ignite-console.dialog', [
+
+])
+.factory(...IgniteDialog)
+.directive(...igniteDialog)
+.directive(...igniteDialogTitle)
+.directive(...igniteDialogContent)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index f6deb9f..a122de3 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -1,10 +1,4 @@
{
- "moreInfo": {
- "title": "Caches screen",
- "content": ["Manage your cluster's caches on current screen.",
- "Caches can be linked with specified <a href='/configuration/clusters'>clusters</a> and <a href='/configuration/metadata'>metadata</a>",
- "Generated cluster with caches configuration available on <a href='/configuration/summary'>summary</a> screen."]
- },
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 7050755..4e98381 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1,9 +1,4 @@
{
- "moreInfo": {
- "title": "Clusters screen",
- "content": ["Manage your clusters on current screen.",
- "Generated clusters configuration available on <a href='/configuration/summary'>summary</a> screen."]
- },
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/controllers/models/igfs.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/igfs.json b/modules/control-center-web/src/main/js/controllers/models/igfs.json
index 4cf1369..9aa9885 100644
--- a/modules/control-center-web/src/main/js/controllers/models/igfs.json
+++ b/modules/control-center-web/src/main/js/controllers/models/igfs.json
@@ -1,12 +1,4 @@
{
- "moreInfo": {
- "title": "IGFS screen",
- "content": [
- "Manage your IGFS file systems on current screen.",
- "IGFS can be assigned to specified <a href='/configuration/clusters'>clusters</a>.",
- "Generated cluster with IGFS available on <a href='/configuration/summary'>summary</a> screen."
- ]
- },
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index ad943be..1a4fdbc 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -1,10 +1,4 @@
{
- "moreInfo": {
- "title": "Metadata screen",
- "content": ["Manage your type metadata on current screen.",
- "Metadata can be assigned to specified <a href='/configuration/caches'>caches</a>.",
- "Generated cluster with caches with metadata configuration available on <a href='/configuration/summary'>summary</a> screen."]
- },
"metadata": [
{
"label": "Metadata common",
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/modules/control-center-web/src/main/js/controllers/models/summary.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json
index 5951b39..83a699f 100644
--- a/modules/control-center-web/src/main/js/controllers/models/summary.json
+++ b/modules/control-center-web/src/main/js/controllers/models/summary.json
@@ -1,13 +1,4 @@
{
- "moreInfo": {
- "title": "Summary screen",
- "content": ["Generated cluster's configuration showed on this screen.",
- "Configurations available in XML, Java and Dockerfile format for Server and Client mode.",
- "Database table POJO classes for cluster's metadata available on \"POJO\" tab.",
- "Use \"Download\" button to receive configurations in ZIP file.",
- "Go back to change configuration on <a href='/configuration/clusters'>clusters</a>, <a href='/configuration/caches'>caches</a> or <a href='/configuration/metadata'>metadata</a> screen."
- ]
- },
"clientFields": [
{
"label": "Near cache start size",
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/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 dd32caf..d652b51 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
@@ -25,7 +25,18 @@ include ../includes/controls
li Link Metadata to Caches
li Link Caches to Clusters
li
- a(bs-modal='moreInfo' data-placement='center' data-template-url='/templates/message.html') More info
+ 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.
ignite-callout-cel(data-title='Next Steps')
li Continue to
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/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 f7e62d9..09c7aaa 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
@@ -23,9 +23,16 @@ include ../includes/controls
ignite-callout-cel(data-title='On This Screen')
li Configure Clusters
li Link Clusters to Caches
- li
- a(bs-modal='moreInfo' data-placement='center' data-template-url='/templates/message.html') More info
-
+ li
+ 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.
+
ignite-callout-cel(data-title='Next Steps')
li Continue to
a(ui-sref='base.configuration.caches') Caches
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/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 199bf0d..873262f 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
@@ -23,7 +23,18 @@ include ../includes/controls
ignite-callout-cel(data-title='On This Screen')
li Configure IGFS file systems
li
- a(bs-modal='moreInfo' data-placement='center' data-template-url='/templates/message.html') More info
+ 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.
ignite-callout-cel(data-title='Next Steps')
li Continue to
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/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 b1bd498..451f9c2 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
@@ -24,7 +24,16 @@ include ../includes/controls
li Manually enter Metadata
li Load Metadata from Database
li
- a(bs-modal='moreInfo' data-placement='center' data-template-url='/templates/message.html') More info
+ 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.
ignite-callout-cel(data-title='Next Steps')
li Continue to
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ad03a01/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 024666f..ff1f161 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
@@ -28,7 +28,22 @@ mixin hard-link(ref, txt)
li Download Java Code
li Download Docker File
li
- a(bs-modal='moreInfo' data-placement='center' data-template-url='/templates/message.html') More info
+ ignite-dialog More info
+ ignite-dialog-title Summary screen
+ ignite-dialog-content
+ | 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.
ignite-callout-cel(data-title='Next Steps')
li Deploy Ignite Servers
[2/2] ignite git commit: IGNITE-2125 Review.
Posted by an...@apache.org.
IGNITE-2125 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef610b28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef610b28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef610b28
Branch: refs/heads/ignite-843-rc2
Commit: ef610b28946c01e82af249df9ac93a09c9132bcd
Parents: 8ad03a0
Author: Andrey <an...@gridgain.com>
Authored: Mon Dec 14 10:50:42 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Dec 14 10:50:42 2015 +0700
----------------------------------------------------------------------
.../modules/dialog/dialog-content.directive.js | 2 +-
.../modules/dialog/dialog-title.directive.js | 4 +--
.../js/app/modules/dialog/dialog.controller.js | 4 +--
.../js/app/modules/dialog/dialog.directive.js | 1 -
.../js/app/modules/dialog/dialog.factory.js | 32 ++++++++++++++++++++
.../js/app/modules/dialog/dialog.service.js | 32 --------------------
.../src/main/js/app/modules/dialog/index.js | 4 +--
.../clusters/more-info/more-info.directive.js | 0
.../control-center-web/src/main/js/config.js | 11 ++++---
.../src/main/js/public/stylesheets/style.scss | 10 ++++++
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/metadata.jade | 2 +-
.../main/js/views/configuration/summary.jade | 6 ++--
13 files changed, 61 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
index bfb76c3..51c6c76 100644
--- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js
@@ -16,9 +16,9 @@
*/
export default ['igniteDialogContent', ['$compile', ($compile) => {
-
let link = ($scope, $element, $attrs, igniteDialog) => {
igniteDialog.content = $element.html();
+
$element.hide();
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
index ddaf05a..eddfc74 100644
--- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js
@@ -16,11 +16,11 @@
*/
export default ['igniteDialogTitle', [() => {
-
let link = ($scope, $element, $attrs, igniteDialog) => {
igniteDialog.title = $element.text();
+
$element.hide();
- }
+ };
return {
scope: {},
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
index 6369f99..ed56936 100644
--- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-export default ['$rootScope' ,'$scope', 'IgniteDialog', function($root, $scope, Dialog) {
+export default ['$rootScope' ,'$scope', 'IgniteDialog', function($root, $scope, IgniteDialog) {
let ctrl = this;
- let dialog = new Dialog({
+ let dialog = new IgniteDialog({
scope: $scope
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
index 813ab73..47d0435 100644
--- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js
@@ -20,7 +20,6 @@ import controller from './dialog.controller';
const template = "<a ng-click='ctrl.show()'><span ng-transclude=''></span></a>";
export default ['igniteDialog', [() => {
-
return {
scope: {
title: '='
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js
new file mode 100644
index 0000000..59ce5bd
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+import template from './dialog.jade!'
+
+export default ['IgniteDialog', ['$modal', ($modal) => {
+ let defaults = {
+ template: template(),
+ placement: 'center',
+ show: false
+ };
+
+ return function(options) {
+ options = _.extend({}, defaults, options);
+
+ return $modal(options);
+ }
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
deleted file mode 100644
index 61c2076..0000000
--- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js
+++ /dev/null
@@ -1,32 +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.
- */
-
-import template from './dialog.jade!'
-
-export default ['IgniteDialog', ['$modal', ($modal) => {
- let defaults = {
- template: template(),
- placement: 'center',
- show: false
- }
-
- return function(options) {
- options = _.extend({}, defaults, options);
-
- return $modal(options);
- }
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/index.js b/modules/control-center-web/src/main/js/app/modules/dialog/index.js
index 67bab36..a28997f 100644
--- a/modules/control-center-web/src/main/js/app/modules/dialog/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/dialog/index.js
@@ -18,7 +18,7 @@
import igniteDialog from './dialog.directive';
import igniteDialogTitle from './dialog-title.directive';
import igniteDialogContent from './dialog-content.directive';
-import IgniteDialog from './dialog.service';
+import IgniteDialog from './dialog.factory';
angular
.module('ignite-console.dialog', [
@@ -27,4 +27,4 @@ angular
.factory(...IgniteDialog)
.directive(...igniteDialog)
.directive(...igniteDialogTitle)
-.directive(...igniteDialogContent)
\ No newline at end of file
+.directive(...igniteDialogContent);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index ce9ca1b..d83041a 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -87,7 +87,7 @@ System.config({
"assert": "npm:assert@1.3.0"
},
"github:jspm/nodelibs-buffer@0.1.0": {
- "buffer": "npm:buffer@3.5.4"
+ "buffer": "npm:buffer@3.5.5"
},
"github:jspm/nodelibs-events@0.1.1": {
"events": "npm:events@1.0.2"
@@ -183,17 +183,17 @@ System.config({
"npm:babel-runtime@5.8.34": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
- "npm:buffer@3.5.4": {
+ "npm:buffer@3.5.5": {
"base64-js": "npm:base64-js@0.0.8",
"child_process": "github:jspm/nodelibs-child_process@0.1.0",
"fs": "github:jspm/nodelibs-fs@0.1.2",
"ieee754": "npm:ieee754@1.1.6",
- "isarray": "npm:isarray@0.0.1",
+ "isarray": "npm:isarray@1.0.0",
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:center-align@0.1.2": {
"align-text": "npm:align-text@0.1.3",
- "lazy-cache": "npm:lazy-cache@0.2.4"
+ "lazy-cache": "npm:lazy-cache@0.2.7"
},
"npm:clean-css@3.4.8": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
@@ -287,6 +287,9 @@ System.config({
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"is-buffer": "npm:is-buffer@1.1.0"
},
+ "npm:lazy-cache@0.2.7": {
+ "process": "github:jspm/nodelibs-process@0.1.2"
+ },
"npm:lodash@3.10.1": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 81ce0f1..862fb5b 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1619,6 +1619,16 @@ a {
left: -50%;
}
+.dw-loading.dw-loading-overlay {
+ z-index: 1030;
+}
+
+.modal {
+ .dw-loading.dw-loading-overlay {
+ z-index: 9999;
+ }
+}
+
.panel-tip-container {
display: inline-block;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 d652b51..9dc996e 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
@@ -32,7 +32,7 @@ include ../includes/controls
a(href='/configuration/clusters') clusters
| and
a(href='/configuration/metadata') metadata
- | ,
+ | ,
br
| Generated cluster with caches configuration available on
a(href='/configuration/summary') summary
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 451f9c2..91fe1dc 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
@@ -29,7 +29,7 @@ include ../includes/controls
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
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 ff1f161..7fa27c8 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
@@ -31,11 +31,11 @@ mixin hard-link(ref, txt)
ignite-dialog More info
ignite-dialog-title Summary screen
ignite-dialog-content
- | Configurations available in XML, Java and Dockerfile format for Server and Client mode.
+ | 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.
+ | Database table POJO classes for cluster's metadata available on "POJO" tab.
br
- | Use "Download" button to receive configurations in ZIP file.
+ | Use "Download" button to receive configurations in ZIP file.
br
| Go back to change configuration on
a(href='/configuration/clusters') clusters