You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/03/03 11:33:04 UTC
[01/11] ignite git commit: IGNITE-843 Refactored branding module.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 3581dd4bc -> c6a73c45d
IGNITE-843 Refactored branding module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c23c8e8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c23c8e8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c23c8e8
Branch: refs/heads/ignite-2612
Commit: 4c23c8e8303d61a4995530365cbdad5fb2b9b574
Parents: 06af6d2
Author: Andrey <an...@gridgain.com>
Authored: Wed Mar 2 17:42:11 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Mar 2 17:42:11 2016 +0700
----------------------------------------------------------------------
.../js/app/modules/branding/Logo.provider.js | 42 ---------
.../js/app/modules/branding/Terms.provider.js | 41 --------
.../js/app/modules/branding/branding.module.js | 22 +++--
.../app/modules/branding/branding.provider.js | 99 ++++++++++++++++++++
.../app/modules/branding/features.directive.js | 35 +++++++
.../js/app/modules/branding/footer.directive.js | 34 +++++++
.../modules/branding/header-logo.directive.js | 34 +++++++
.../js/app/modules/branding/header-logo.jade | 18 ++++
.../modules/branding/header-title.directive.js | 35 +++++++
.../js/app/modules/branding/logo.directive.js | 34 -------
.../src/main/js/app/modules/branding/logo.jade | 18 ----
.../branding/powered-by-apache.directive.js | 4 +-
.../js/app/modules/branding/terms.directive.js | 5 +-
.../js/app/modules/branding/title.directive.js | 35 -------
.../main/js/app/modules/states/signin.state.js | 4 +-
.../src/main/js/public/stylesheets/style.scss | 4 +
.../src/main/js/views/includes/footer.jade | 3 +-
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/reset.jade | 4 +-
.../src/main/js/views/signin.jade | 12 +--
20 files changed, 285 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/Logo.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/Logo.provider.js b/modules/control-center-web/src/main/js/app/modules/branding/Logo.provider.js
deleted file mode 100644
index fcefc7c..0000000
--- a/modules/control-center-web/src/main/js/app/modules/branding/Logo.provider.js
+++ /dev/null
@@ -1,42 +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.
- */
-
-export default ['IgniteLogo', [function() {
- let poweredBy = false;
-
- let url = '/images/ignite-logo.png';
-
- let title = 'Management console for Apache Ignite';
-
- this.url = (_url) => {
- url = _url;
-
- poweredBy = true;
- };
-
- this.title = (_title) => {
- title = _title;
- };
-
- this.$get = [() => {
- return {
- url,
- poweredBy,
- title
- };
- }];
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/Terms.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/Terms.provider.js b/modules/control-center-web/src/main/js/app/modules/branding/Terms.provider.js
deleted file mode 100644
index c9c6009..0000000
--- a/modules/control-center-web/src/main/js/app/modules/branding/Terms.provider.js
+++ /dev/null
@@ -1,41 +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.
- */
-
-export default ['IgniteTerms', [function() {
- let _rows = [
- 'Apache Ignite Web Console',
- '© 2016 The Apache Software Foundation.',
- 'Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.'
- ];
-
- let _state;
-
- this.footerRows = function(rows) {
- _rows = rows;
- };
-
- this.termsState = function(state) {
- _state = state;
- };
-
- this.$get = [function() {
- return {
- footerRows: _rows,
- termsState: _state
- };
- }];
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/branding.module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/branding.module.js b/modules/control-center-web/src/main/js/app/modules/branding/branding.module.js
index dc65efc..5a3e843 100644
--- a/modules/control-center-web/src/main/js/app/modules/branding/branding.module.js
+++ b/modules/control-center-web/src/main/js/app/modules/branding/branding.module.js
@@ -17,22 +17,24 @@
import angular from 'angular';
-import IgniteLogo from './Logo.provider';
-import IgniteTerms from './Terms.provider';
+import IgniteBranding from './branding.provider';
-import ignitePoweredByApache from './powered-by-apache.directive';
-import igniteLogo from './logo.directive';
-import igniteTitle from './title.directive';
+import igniteHeaderLogo from './header-logo.directive';
+import igniteHeaderTitle from './header-title.directive';
import igniteTerms from './terms.directive';
+import igniteFeatures from './features.directive';
+import igniteFooter from './footer.directive';
+import ignitePoweredByApache from './powered-by-apache.directive';
angular
.module('ignite-console.branding', [
])
-.provider(...IgniteLogo)
-.provider(...IgniteTerms)
+.provider(...IgniteBranding)
.directive(...ignitePoweredByApache)
-.directive(...igniteLogo)
-.directive(...igniteTitle)
-.directive(...igniteTerms);
+.directive(...igniteHeaderLogo)
+.directive(...igniteHeaderTitle)
+.directive(...igniteTerms)
+.directive(...igniteFeatures)
+.directive(...igniteFooter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
new file mode 100644
index 0000000..d4c12a4
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
@@ -0,0 +1,99 @@
+/*
+ * 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 ['IgniteBranding', [function() {
+ let headerLogo = '/images/ignite-logo.png';
+
+ let headerText = 'Management console for Apache Ignite';
+
+ let showIgniteLogo = false;
+
+ let footerHtml = [
+ '<p>Apache Ignite Web Console</p>',
+ '<p>© 2016 The Apache Software Foundation.</p>',
+ '<p>Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.</p>'
+ ];
+
+ let termsState;
+
+ let featuresHtml = [
+ '<p>Web Console is an interactive management tool which allows to:</p>',
+ '<ul>',
+ ' <li>Create and download cluster configurations</li>',
+ ' <li>Automatically import domain model from any RDBMS</li>',
+ ' <li>Connect to cluster and run SQL analytics on it</li>',
+ '</ul>'
+ ];
+
+ /**
+ * Change logo in header.
+ *
+ * @param {String} url Logo path.
+ */
+ this.headerLogo = (url) => {
+ headerLogo = url;
+
+ showIgniteLogo = true;
+ };
+
+ /**
+ * Change text in header.
+ *
+ * @param {String} text Header text.
+ */
+ this.headerText = (text) => {
+ headerText = text;
+ };
+
+ /**
+ * Change text in features.
+ *
+ * @param {Array.<String>} rows Features text.
+ */
+ this.featuresHtml = (rows) => {
+ featuresHtml = rows;
+ };
+
+ /**
+ * Change text in footer.
+ *
+ * @param {Array.<String>} rows Footer text.
+ */
+ this.footerHtml = (rows) => {
+ footerHtml = rows;
+ };
+
+ /**
+ * Set terms and conditions stage.
+ *
+ * @param {String} state
+ */
+ this.termsState = (state) => {
+ termsState = state;
+ };
+
+ this.$get = [() => {
+ return {
+ headerLogo,
+ headerText,
+ featuresHtml: featuresHtml.join('\n'),
+ footerHtml: footerHtml.join('\n'),
+ showIgniteLogo,
+ termsState
+ };
+ }];
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/features.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/features.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/features.directive.js
new file mode 100644
index 0000000..0477be6
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/features.directive.js
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+const template = `<div class='features' ng-bind-html='features.html'></div>`;
+
+export default ['igniteFeatures', ['IgniteBranding', (branding) => {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.html = branding.featuresHtml;
+ }
+
+ return {
+ restrict: 'E',
+ template,
+ controller,
+ controllerAs: 'features',
+ replace: true
+ };
+}]];
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/footer.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/footer.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/footer.directive.js
new file mode 100644
index 0000000..1312f98
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/footer.directive.js
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+const template = `<div class='footer' ng-bind-html='footer.html'></div>`;
+
+export default ['igniteFooter', ['IgniteBranding', (branding) => {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.html = branding.footerHtml;
+ }
+
+ return {
+ restrict: 'E',
+ template,
+ controller,
+ controllerAs: 'footer',
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/header-logo.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/header-logo.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/header-logo.directive.js
new file mode 100644
index 0000000..1bfbc45
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/header-logo.directive.js
@@ -0,0 +1,34 @@
+/*
+ * 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 './header-logo.jade!';
+
+export default ['igniteHeaderLogo', ['IgniteBranding', (branding) => {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.url = branding.headerLogo;
+ }
+
+ return {
+ restrict: 'E',
+ template,
+ controller,
+ controllerAs: 'logo',
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/header-logo.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/header-logo.jade b/modules/control-center-web/src/main/js/app/modules/branding/header-logo.jade
new file mode 100644
index 0000000..b807921
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/header-logo.jade
@@ -0,0 +1,18 @@
+//-
+ 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.
+
+a(href='/')
+ img.navbar-brand(ng-src='{{logo.url}}' height='40')
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/header-title.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/header-title.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/header-title.directive.js
new file mode 100644
index 0000000..60b9f2f
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/branding/header-title.directive.js
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+const template = `<label class='title'>{{::title.text}}</label>`;
+
+export default ['igniteHeaderTitle', ['IgniteBranding', (branding) => {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.text = branding.headerText;
+ }
+
+ return {
+ restrict: 'E',
+ template,
+ controller,
+ controllerAs: 'title',
+ replace: true
+ };
+}]];
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/logo.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/logo.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/logo.directive.js
deleted file mode 100644
index ff46945..0000000
--- a/modules/control-center-web/src/main/js/app/modules/branding/logo.directive.js
+++ /dev/null
@@ -1,34 +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 templateLogo from './logo.jade!';
-
-export default ['igniteLogo', ['IgniteLogo', (IgniteLogo) => {
- function controller() {
- const ctrl = this;
-
- ctrl.url = IgniteLogo.url;
- }
-
- return {
- restrict: 'E',
- template: templateLogo,
- controller,
- controllerAs: 'logo',
- replace: true
- };
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/logo.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/logo.jade b/modules/control-center-web/src/main/js/app/modules/branding/logo.jade
deleted file mode 100644
index b807921..0000000
--- a/modules/control-center-web/src/main/js/app/modules/branding/logo.jade
+++ /dev/null
@@ -1,18 +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.
-
-a(href='/')
- img.navbar-brand(ng-src='{{logo.url}}' height='40')
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/powered-by-apache.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/powered-by-apache.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/powered-by-apache.directive.js
index fd2ab98..37f1dec 100644
--- a/modules/control-center-web/src/main/js/app/modules/branding/powered-by-apache.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/branding/powered-by-apache.directive.js
@@ -17,11 +17,11 @@
import templatePoweredByApache from './powered-by-apache.jade!';
-export default ['ignitePoweredByApache', ['IgniteLogo', (IgniteLogo) => {
+export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
function controller() {
const ctrl = this;
- ctrl.show = IgniteLogo.poweredBy;
+ ctrl.show = branding.showIgniteLogo;
}
return {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/terms.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/terms.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/terms.directive.js
index 22f2977..0207745 100644
--- a/modules/control-center-web/src/main/js/app/modules/branding/terms.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/branding/terms.directive.js
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-export default ['igniteTerms', ['IgniteTerms', (IgniteTerms) => {
+export default ['igniteTerms', ['IgniteBranding', (branding) => {
function controller() {
const ctrl = this;
- ctrl.footerRows = IgniteTerms.footerRows;
- ctrl.termsState = IgniteTerms.termsState;
+ ctrl.termsState = branding.termsState;
}
return {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/branding/title.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/title.directive.js b/modules/control-center-web/src/main/js/app/modules/branding/title.directive.js
deleted file mode 100644
index 83b8a7b..0000000
--- a/modules/control-center-web/src/main/js/app/modules/branding/title.directive.js
+++ /dev/null
@@ -1,35 +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.
- */
-
-const templateTitle = `<label class= 'title'>{{::title.text}}</label>`;
-
-export default ['igniteTitle', ['IgniteLogo', (IgniteLogo) => {
- function controller() {
- const ctrl = this;
-
- ctrl.text = IgniteLogo.title;
- }
-
- return {
- restrict: 'E',
- template: templateTitle,
- controller,
- controllerAs: 'title',
- replace: true
- };
-}]];
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index feaf76a..bf5baa9 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -36,9 +36,9 @@ angular
}
});
}])
-.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms) {
+.run(['$rootScope', '$state', 'Auth', 'IgniteBranding', function($root, $state, Auth, branding) {
$root.$on('$stateChangeStart', function(event, toState) {
- if (toState.name === IgniteTerms.termsState)
+ if (toState.name === branding.termsState)
return;
if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name, 'password.'))) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/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 4f2cf28..500d60c 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
@@ -95,6 +95,10 @@ hr {
font-size: 22px;
}
+.theme-line .footer {
+ text-align: center;
+}
+
ul.navbar-nav, .sidebar-nav {
li.active > a {
color: $link-color;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/views/includes/footer.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/footer.jade b/modules/control-center-web/src/main/js/views/includes/footer.jade
index d057835..4ef3bf6 100644
--- a/modules/control-center-web/src/main/js/views/includes/footer.jade
+++ b/modules/control-center-web/src/main/js/views/includes/footer.jade
@@ -17,8 +17,7 @@
.container.container-footer
footer
.col-md-offset-1.col-md-10
- center(ignite-terms)
- p(ng-repeat='item in terms.footerRows' ng-bind-html='item')
+ ignite-footer
.col-md-1
.pull-right
ignite-powered-by-apache
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index 3ed39b3..b4e095a 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -20,7 +20,7 @@ header#header.header
table.container
tr
td.col-xs-3.col-sm-3.col-md-2
- ignite-logo
+ ignite-header-logo
td(ng-if='$root.user' style='padding-top: 20px')
ul.nav.navbar-nav(ignite-sidebar ignite-navbar)
li(ng-class='{active: $state.includes("base.configuration")}')
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/views/reset.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/reset.jade b/modules/control-center-web/src/main/js/views/reset.jade
index 468a493..e5b8f12 100644
--- a/modules/control-center-web/src/main/js/views/reset.jade
+++ b/modules/control-center-web/src/main/js/views/reset.jade
@@ -18,9 +18,9 @@ header#header.header
table.container
tr
td.col-xs-3.col-sm-3.col-md-2
- ignite-logo
+ ignite-header-logo
td
- ignite-title
+ ignite-header-title
.container.body-container
.main-content(ng-controller='resetPassword')
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c23c8e8/modules/control-center-web/src/main/js/views/signin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/signin.jade b/modules/control-center-web/src/main/js/views/signin.jade
index 663b77b..9ec8dfd 100644
--- a/modules/control-center-web/src/main/js/views/signin.jade
+++ b/modules/control-center-web/src/main/js/views/signin.jade
@@ -24,9 +24,9 @@ header#header.header
table.container
tr
td.col-xs-3.col-sm-3.col-md-2
- ignite-logo
+ ignite-header-logo
td
- ignite-title
+ ignite-header-title
.container.body-container
.main-content(ng-controller='auth')
@@ -34,7 +34,7 @@ header#header.header
.signin-greedy
.col-xs-12.col-md-6
form(name='form' novalidate)
- .modal-body.row(style='padding-bottom: 10px; margin: 0')
+ .modal-body.row(style='padding: 0 0 10px 0; margin: 0')
.settings-row(ng-if='action == "signup"')
h3.login-header Sign Up
.settings-row(ng-if='action == "signin"')
@@ -89,11 +89,7 @@ header#header.header
button#login.btn.btn-primary(ng-click='auth(action, user_info)' ng-disabled='form.$invalid') Sign In
.col-xs-12.col-md-11.home-panel
- p Web Console is an interactive management tool which allows to:
- ul
- li Create and download cluster configurations
- li Automatically import domain model from any RDBMS
- li Connect to cluster and run SQL analytics on it
+ ignite-features
.col-xs-12.col-md-6
#carousel.carousel.slide
// Indicators
[04/11] ignite git commit: IGNITE-843 Minor fix.
Posted by ak...@apache.org.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38ff57b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38ff57b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38ff57b6
Branch: refs/heads/ignite-2612
Commit: 38ff57b6256a24b353452700d068894f1f7dcddc
Parents: 91698c2
Author: Andrey <an...@gridgain.com>
Authored: Thu Mar 3 13:36:26 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Mar 3 13:36:26 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/views/index.jade | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38ff57b6/modules/control-center-web/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade
index eebfd89..2d1c339 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -19,7 +19,9 @@ html(ng-app='ignite-web-console' id='app')
head
base(href='/')
link(rel='shortcut icon' href='favicon.ico')
+
meta(http-equiv='content-type' content='text/html; charset=UTF8')
+ meta(http-equiv='content-language' content='en')
title(ng-bind='$meta.title')
[07/11] ignite git commit: IGNTIE-2723 fixed java class input - Fixes
#532.
Posted by ak...@apache.org.
IGNTIE-2723 fixed java class input - Fixes #532.
Signed-off-by: Alexey Kuznetsov <ak...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/877f4a44
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/877f4a44
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/877f4a44
Branch: refs/heads/ignite-2612
Commit: 877f4a446abef7e0118f65095767d8855188afc4
Parents: 53804c7
Author: Dmitriyff <dm...@gmail.com>
Authored: Thu Mar 3 16:36:55 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 16:36:55 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class.directive.js | 46 ++++++++++++++++----
.../form-field-java-class.jade | 38 ++++++++--------
2 files changed, 58 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/877f4a44/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
index d0f7254..659030e 100644
--- a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.directive.js
@@ -18,19 +18,48 @@
import template from './form-field-java-class.jade!';
export default ['igniteFormFieldJavaClass', ['IgniteFormGUID', (guid) => {
- const link = (scope, el, attrs, [form, label]) => {
+ const link = (scope, el, attrs, [ngModel, form, label]) => {
const {id, name} = scope;
- const field = form[name];
-
- scope.form = form;
- scope.field = field;
- scope.label = label;
label.for = scope.id = id || guid();
+ scope.form = form;
+ scope.label = label;
+ scope.ngModel = ngModel;
scope.$watch('required', (required) => {
label.required = required || false;
});
+
+ form.$defaults = form.$defaults || {};
+ form.$defaults[name] = _.cloneDeep(scope.value);
+
+ const setAsDefault = () => {
+ if (!form.$pristine) return;
+
+ form.$defaults = form.$defaults || {};
+ form.$defaults[name] = _.cloneDeep(scope.value);
+ };
+
+ scope.$watch(() => form.$pristine, setAsDefault);
+ scope.$watch('value', setAsDefault);
+
+ scope.ngChange = function() {
+ ngModel.$setViewValue(scope.value);
+
+ if (JSON.stringify(scope.value) !== JSON.stringify(form.$defaults[name]))
+ ngModel.$setDirty();
+ else
+ ngModel.$setPristine();
+
+ if (ngModel.$valid)
+ el.find('input').addClass('ng-valid').removeClass('ng-invalid');
+ else
+ el.find('input').removeClass('ng-valid').addClass('ng-invalid');
+ };
+
+ ngModel.$render = function() {
+ scope.value = ngModel.$modelValue;
+ };
};
return {
@@ -38,11 +67,10 @@ export default ['igniteFormFieldJavaClass', ['IgniteFormGUID', (guid) => {
scope: {
id: '@',
name: '@',
+ placeholder: '@',
required: '=ngRequired',
disabled: '=ngDisabled',
- unique: '=igniteUnique',
- ngModel: '=',
ngBlur: '&',
autofocus: '=igniteFormFieldInputAutofocus'
@@ -51,6 +79,6 @@ export default ['igniteFormFieldJavaClass', ['IgniteFormGUID', (guid) => {
template,
replace: true,
transclude: true,
- require: ['^form', '?^igniteFormField']
+ require: ['ngModel', '^form', '?^igniteFormField']
};
}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/877f4a44/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
index d8e5162..ae75c27 100644
--- a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
+++ b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
@@ -16,38 +16,42 @@
mixin feedback(error, message)
i.fa.fa-exclamation-triangle.form-control-feedback(
- ng-if='!form[name].$pristine && form[name].$error.#{error}'
+ ng-if='!form[name+"JavaClass"].$pristine && form[name+"JavaClass"].$error.#{error}'
bs-tooltip='"{{ label.name }} #{message}"'
ignite-error='#{error}'
ignite-error-message='{{ label.name }} #{message}'
)
-div
- ignite-form-field-input-text(
- data-id='{{ id }}'
- data-name='{{ name }}'
- data-placeholder='Enter fully qualified class name'
+.input-tip
+ input.form-control(
+ id='{{ id }}'
+ name='{{ name }}JavaClass'
+ placeholder='Enter fully qualified class name'
+ type='text'
- data-ng-model='ngModel'
+ data-ng-model='value'
+ data-ng-blur='ngBlur()'
+ data-ng-change='ngChange()'
data-ng-required='required || false'
data-ng-disabled='disabled || false'
+ data-ng-model-options='{debounce: 150}'
data-java-keywords='true'
data-java-identifier='true'
data-java-package-specified='true'
data-java-built-in-class='true'
-
- data-ignite-unique='unique'
- data-ignite-form-field-input-autofocus='autofocus || false '
+
+ data-ignite-form-field-input-autofocus='autofocus || false'
on-enter='onEnter()'
on-escape='onEscape()'
- data-ng-blur='ngBlur()'
)
- span(ng-transclude)
- +feedback('javaPackageSpecified', 'does not have package specified')
- +feedback('javaBuiltInClass', 'should not be the Java built-in class')
- +feedback('javaKeywords', 'could not contains reserved Java keyword')
- +feedback('javaIdentifier', 'is invalid Java identifier')
- +feedback('required', 'could not be empty')
+ span(ng-transclude='')
+
+ +feedback('javaPackageSpecified', 'does not have package specified')
+ +feedback('javaBuiltInClass', 'should not be the Java built-in class')
+ +feedback('javaKeywords', 'could not contains reserved Java keyword')
+ +feedback('javaIdentifier', 'is invalid Java identifier')
+
+ +feedback('required', 'could not be empty!')
[02/11] ignite git commit: IGNITE-843 Added suffix in title.
Posted by ak...@apache.org.
IGNITE-843 Added suffix in title.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85b4b9fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85b4b9fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85b4b9fe
Branch: refs/heads/ignite-2612
Commit: 85b4b9fe14c2ec806a2743ee2eaf756f6cf1f1e1
Parents: 4c23c8e
Author: Andrey <an...@gridgain.com>
Authored: Thu Mar 3 11:06:08 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Mar 3 11:06:08 2016 +0700
----------------------------------------------------------------------
.../app/modules/branding/branding.provider.js | 12 ++++++++
.../main/js/app/modules/states/admin.state.js | 6 ++--
.../app/modules/states/configuration.state.js | 30 ++++++++++----------
.../main/js/app/modules/states/profile.state.js | 6 ++--
.../main/js/app/modules/states/signin.state.js | 6 ++--
.../src/main/js/app/modules/states/sql.state.js | 12 ++++----
6 files changed, 42 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
index d4c12a4..ce14b34 100644
--- a/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
+++ b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
@@ -16,6 +16,8 @@
*/
export default ['IgniteBranding', [function() {
+ let titleSuffix = ' – Apache Ignite Web Console';
+
let headerLogo = '/images/ignite-logo.png';
let headerText = 'Management console for Apache Ignite';
@@ -40,6 +42,15 @@ export default ['IgniteBranding', [function() {
];
/**
+ * Change title suffix.
+ *
+ * @param {String} suffix.
+ */
+ this.titleSuffix = (suffix) => {
+ titleSuffix = suffix;
+ };
+
+ /**
* Change logo in header.
*
* @param {String} url Logo path.
@@ -88,6 +99,7 @@ export default ['IgniteBranding', [function() {
this.$get = [() => {
return {
+ titleSuffix,
headerLogo,
headerText,
featuresHtml: featuresHtml.join('\n'),
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
index c183807..0de646e 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
@@ -28,9 +28,9 @@ angular
url: '/admin',
templateUrl: '/settings/admin.html',
resolve: {
- $title: () => {
- return 'List of registered users';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'List of registered users' + branding.titleSuffix;
+ }]
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
index edd7f9d..1071eb8 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@ -112,9 +112,9 @@ angular
loading: 'Loading clusters screen...'
},
resolve: {
- $title: () => {
- return 'Configure Clusters';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Configure Clusters' + branding.titleSuffix;
+ }]
}
})
.state('base.configuration.caches', {
@@ -127,9 +127,9 @@ angular
loading: 'Loading caches screen...'
},
resolve: {
- $title: () => {
- return 'Configure Caches';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Configure Caches' + branding.titleSuffix;
+ }]
}
})
.state('base.configuration.domains', {
@@ -142,9 +142,9 @@ angular
loading: 'Loading domain models screen...'
},
resolve: {
- $title: () => {
- return 'Configure Domain Model';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Configure Domain Model' + branding.titleSuffix;
+ }]
}
})
.state('base.configuration.igfs', {
@@ -157,9 +157,9 @@ angular
loading: 'Loading IGFS screen...'
},
resolve: {
- $title: () => {
- return 'Configure IGFS';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Configure IGFS' + branding.titleSuffix;
+ }]
}
})
.state('base.configuration.summary', {
@@ -171,9 +171,9 @@ angular
loading: 'Loading summary screen...'
},
resolve: {
- $title: () => {
- return 'Configurations Summary';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Configurations Summary' + branding.titleSuffix;
+ }]
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
index 23d1bec..dc9cabd 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
@@ -28,9 +28,9 @@ angular
url: '/profile',
templateUrl: '/settings/profile.html',
resolve: {
- $title: () => {
- return 'User profile';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'User profile' + branding.titleSuffix;
+ }]
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index bf5baa9..9855058 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -30,9 +30,9 @@ angular
url: '/signin',
templateUrl: '/signin.html',
resolve: {
- $title: () => {
- return 'Sign In';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Management Tool and Configuration Wizard for Apache Ignite' + branding.titleSuffix;
+ }]
}
});
}])
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
index 672d829..0c53bb6 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
@@ -36,9 +36,9 @@ angular
loading: 'Loading notebook screen...'
},
resolve: {
- $title: () => {
- return 'Query notebook';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'Query notebook' + branding.titleSuffix;
+ }]
}
})
.state('base.sql.demo', {
@@ -48,9 +48,9 @@ angular
loading: 'Enable SQL demo...'
},
resolve: {
- $title: () => {
- return 'SQL demo';
- }
+ $title: ['IgniteBranding', (branding) => {
+ return 'SQL demo' + branding.titleSuffix;
+ }]
}
});
}]);
[06/11] ignite git commit: IGNITE-2724 Fixed tooltips for ZooKeeper.
Posted by ak...@apache.org.
IGNITE-2724 Fixed tooltips for ZooKeeper.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53804c74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53804c74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53804c74
Branch: refs/heads/ignite-2612
Commit: 53804c74ef778269ef21b7990985536a0aca1360
Parents: 13bc0f5
Author: vsisko <vs...@gridgain.com>
Authored: Thu Mar 3 16:30:50 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 16:30:50 2016 +0700
----------------------------------------------------------------------
.../configuration/clusters/general/discovery/zookeeper.jade | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53804c74/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
index c1d3b0b..245df84 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
@@ -23,7 +23,7 @@ div
| Curator:
ignite-form-field-tooltip
| The Curator framework in use #[br]
- | By default generates curator of org.apache.curator.framework.imps.CuratorFrameworkImpl.CuratorFrameworkImpl
+ | By default generates curator of org.apache.curator. framework.imps.CuratorFrameworkImpl
| class with configured connect string, retry policy, and default session and connection timeouts
ignite-form-field-java-class(
data-id='curator'
@@ -55,8 +55,8 @@ div
li Max number of times - retries a max number of times
li Only once - retries only once
li Always allow retry - retries infinitely
- li Default - exponential backoff retry policy with configured base sleep time equal to 1000ms and max retry count equal to 10
li Custom - custom retry policy implementation
+ li Default - exponential backoff retry policy with configured base sleep time equal to 1000ms and max retry count equal to 10
ignite-form-field-dropdown(
data-id='retryPolicy'
data-name='retryPolicy'
[05/11] ignite git commit: IGNITE-843 Minor fix.
Posted by ak...@apache.org.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13bc0f5c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13bc0f5c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13bc0f5c
Branch: refs/heads/ignite-2612
Commit: 13bc0f5c1e9d6578cd6a73dcb169c9b0176f088e
Parents: 38ff57b
Author: Andrey <an...@gridgain.com>
Authored: Thu Mar 3 15:29:02 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Mar 3 15:29:02 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/filters/byName.filter.js | 23 +++++++++++++++++
.../main/js/app/filters/byName/byName.filter.js | 23 -----------------
.../src/main/js/app/filters/hasPojo.filter.js | 26 ++++++++++++++++++++
.../js/app/filters/hasPojo/hasPojo.filter.js | 26 --------------------
.../control-center-web/src/main/js/app/index.js | 4 +--
5 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13bc0f5c/modules/control-center-web/src/main/js/app/filters/byName.filter.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/filters/byName.filter.js b/modules/control-center-web/src/main/js/app/filters/byName.filter.js
new file mode 100644
index 0000000..3b0746f
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/filters/byName.filter.js
@@ -0,0 +1,23 @@
+/*
+ * 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 ['byName', [() => (arr, search) => {
+ if (!(arr && arr.length) || !search)
+ return arr;
+
+ return _.filter(arr, ({ name }) => name.indexOf(search) >= 0);
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/13bc0f5c/modules/control-center-web/src/main/js/app/filters/byName/byName.filter.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/filters/byName/byName.filter.js b/modules/control-center-web/src/main/js/app/filters/byName/byName.filter.js
deleted file mode 100644
index 3b0746f..0000000
--- a/modules/control-center-web/src/main/js/app/filters/byName/byName.filter.js
+++ /dev/null
@@ -1,23 +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.
- */
-
-export default ['byName', [() => (arr, search) => {
- if (!(arr && arr.length) || !search)
- return arr;
-
- return _.filter(arr, ({ name }) => name.indexOf(search) >= 0);
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/13bc0f5c/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
new file mode 100644
index 0000000..db47585
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
@@ -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.
+ */
+
+export default ['hasPojo', [() => {
+ const filter = (cache) => {
+ return cache.domains && cache.domains.length;
+ };
+
+ return ({caches} = {}) => {
+ return caches && _.chain(caches).filter(filter).first().value();
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/13bc0f5c/modules/control-center-web/src/main/js/app/filters/hasPojo/hasPojo.filter.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/filters/hasPojo/hasPojo.filter.js b/modules/control-center-web/src/main/js/app/filters/hasPojo/hasPojo.filter.js
deleted file mode 100644
index db47585..0000000
--- a/modules/control-center-web/src/main/js/app/filters/hasPojo/hasPojo.filter.js
+++ /dev/null
@@ -1,26 +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.
- */
-
-export default ['hasPojo', [() => {
- const filter = (cache) => {
- return cache.domains && cache.domains.length;
- };
-
- return ({caches} = {}) => {
- return caches && _.chain(caches).filter(filter).first().value();
- };
-}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/13bc0f5c/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 a2473e8..333f0ef 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -101,8 +101,8 @@ import IgniteCountries from './services/Countries/Countries.service';
// Providers
// Filters.
-import hasPojo from './filters/hasPojo/hasPojo.filter';
-import byName from './filters/byName/byName.filter';
+import hasPojo from './filters/hasPojo.filter';
+import byName from './filters/byName.filter';
angular
.module('ignite-console', [
[08/11] ignite git commit: IGNITE-843 Minor.
Posted by ak...@apache.org.
IGNITE-843 Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d55c8202
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d55c8202
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d55c8202
Branch: refs/heads/ignite-2612
Commit: d55c82023e54eec1b09e9f0b9277a93b58a61ef1
Parents: 877f4a4
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Mar 3 16:56:35 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 16:56:35 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class/form-field-java-class.jade | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d55c8202/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
index ae75c27..6b56e6a 100644
--- a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
+++ b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
@@ -49,9 +49,9 @@ mixin feedback(error, message)
span(ng-transclude='')
- +feedback('javaPackageSpecified', 'does not have package specified')
- +feedback('javaBuiltInClass', 'should not be the Java built-in class')
- +feedback('javaKeywords', 'could not contains reserved Java keyword')
- +feedback('javaIdentifier', 'is invalid Java identifier')
+ +feedback('javaPackageSpecified', 'does not have package specified!')
+ +feedback('javaBuiltInClass', 'should not be the Java built-in class!')
+ +feedback('javaKeywords', 'could not contains reserved Java keyword!')
+ +feedback('javaIdentifier', 'is invalid Java identifier!')
+feedback('required', 'could not be empty!')
[03/11] ignite git commit: IGNITE-843 Added suffix in title.
Posted by ak...@apache.org.
IGNITE-843 Added suffix in title.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91698c24
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91698c24
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91698c24
Branch: refs/heads/ignite-2612
Commit: 91698c2430e9d877d6a0619d7a85123104517a2d
Parents: 85b4b9f
Author: Andrey <an...@gridgain.com>
Authored: Thu Mar 3 13:26:42 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Mar 3 13:26:42 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/app/index.js | 15 +++++++---
.../main/js/app/modules/states/admin.state.js | 6 ++--
.../app/modules/states/configuration.state.js | 30 +++++++-------------
.../main/js/app/modules/states/logout.state.js | 5 +++-
.../js/app/modules/states/password.state.js | 10 +++++--
.../main/js/app/modules/states/profile.state.js | 6 ++--
.../main/js/app/modules/states/signin.state.js | 6 ++--
.../src/main/js/app/modules/states/sql.state.js | 12 +++-----
.../control-center-web/src/main/js/config.js | 1 +
.../control-center-web/src/main/js/package.json | 2 +-
.../src/main/js/views/index.jade | 5 +++-
11 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/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 25ea53f..a2473e8 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -29,7 +29,7 @@ window.angular = angular;
window.pdfMake = pdfMake;
import 'angular-ui-router';
-import 'angular-ui-router-title';
+import 'angular-ui-router-metatags';
import 'angular-animate';
import 'angular-sanitize';
import 'angular-ui-grid';
@@ -107,7 +107,7 @@ import byName from './filters/byName/byName.filter';
angular
.module('ignite-console', [
'ui.router',
- 'ui.router.title',
+ 'ui.router.metatags',
'ngRetina',
// Base modules.
'ignite-console.user',
@@ -151,7 +151,7 @@ angular
// Filters.
.filter(...hasPojo)
.filter(...byName)
-.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', function($stateProvider, $locationProvider, $urlRouterProvider) {
+.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => {
// Set up the states.
$stateProvider
.state('base', {
@@ -169,12 +169,19 @@ angular
$locationProvider.html5Mode(true);
}])
+.config(['UIRouterMetatagsProvider', (UIRouterMetatagsProvider) => {
+ UIRouterMetatagsProvider
+ .setTitleSuffix(' – Apache Ignite Web Console')
+ .setDefaultDescription('The Apache Ignite Web Console is an interactive management tool and configuration wizard for Apache Ignite which walks you through the creation of configuration files. Try the tool now.');
+}])
.run(['$rootScope', ($root) => {
$root._ = _;
}])
-.run(['$rootScope', '$state', 'Auth', 'User', ($root, $state, Auth, User) => {
+.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', ($root, $state, $meta, Auth, User) => {
$root.$state = $state;
+ $root.$meta = $meta;
+
if (Auth.authorized) {
User.read()
.then((user) => $root.$broadcast('user', user));
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
index 0de646e..af1fbde 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
@@ -27,10 +27,8 @@ angular
.state('settings.admin', {
url: '/admin',
templateUrl: '/settings/admin.html',
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'List of registered users' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'List of registered users'
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
index 1071eb8..f789175 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@ -111,10 +111,8 @@ angular
data: {
loading: 'Loading clusters screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Configure Clusters' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Configure Clusters'
}
})
.state('base.configuration.caches', {
@@ -126,10 +124,8 @@ angular
data: {
loading: 'Loading caches screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Configure Caches' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Configure Caches'
}
})
.state('base.configuration.domains', {
@@ -141,10 +137,8 @@ angular
data: {
loading: 'Loading domain models screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Configure Domain Model' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Configure Domain Model'
}
})
.state('base.configuration.igfs', {
@@ -156,10 +150,8 @@ angular
data: {
loading: 'Loading IGFS screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Configure IGFS' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Configure IGFS'
}
})
.state('base.configuration.summary', {
@@ -170,10 +162,8 @@ angular
data: {
loading: 'Loading summary screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Configurations Summary' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Configurations Summary'
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
index 7609f24..7f24a45 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
@@ -28,6 +28,9 @@ angular
url: '/logout',
controller: ['Auth', function(Auth) {
Auth.logout();
- }]
+ }],
+ metaTags: {
+ title: 'Logout'
+ }
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/password.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password.state.js b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
index 6014cd2..48d01df 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/password.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
@@ -31,10 +31,16 @@ angular
})
.state('password.reset', {
url: '/reset?{token}',
- templateUrl: '/reset.html'
+ templateUrl: '/reset.html',
+ metaTags: {
+ title: 'Reset password'
+ }
})
.state('password.send', {
url: '/send',
- templateUrl: '/reset.html'
+ templateUrl: '/reset.html',
+ metaTags: {
+ title: 'Password Send'
+ }
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
index dc9cabd..8b6cdfe 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
@@ -27,10 +27,8 @@ angular
.state('settings.profile', {
url: '/profile',
templateUrl: '/settings/profile.html',
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'User profile' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'User profile'
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
index 9855058..96ff967 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -29,10 +29,8 @@ angular
.state('signin', {
url: '/signin',
templateUrl: '/signin.html',
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Management Tool and Configuration Wizard for Apache Ignite' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Management Tool and Configuration Wizard for Apache Ignite'
}
});
}])
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
index 0c53bb6..a48842f 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
@@ -35,10 +35,8 @@ angular
data: {
loading: 'Loading notebook screen...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'Query notebook' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'Query notebook'
}
})
.state('base.sql.demo', {
@@ -47,10 +45,8 @@ angular
data: {
loading: 'Enable SQL demo...'
},
- resolve: {
- $title: ['IgniteBranding', (branding) => {
- return 'SQL demo' + branding.titleSuffix;
- }]
+ metaTags: {
+ title: 'SQL demo'
}
});
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/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 8000eac..1678d83 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -33,6 +33,7 @@ System.config({
"angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@3.1.1",
"angular-ui-router": "github:angular-ui/ui-router@0.2.18",
+ "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@1.0.3",
"angular-ui-router-title": "github:nonplus/angular-ui-router-title@0.0.4",
"babel": "npm:babel-core@5.8.35",
"babel-runtime": "npm:babel-runtime@5.8.35",
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 69c3af9..4a1101c 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -83,7 +83,7 @@
"angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
"angular-ui-router": "github:angular-ui/ui-router@^0.2.15",
- "angular-ui-router-title": "github:nonplus/angular-ui-router-title@^0.0.4",
+ "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@^1.0.3",
"blob": "github:eligrey/Blob.js@master",
"bootstrap-carousel": "github:twbs/bootstrap@^3.3.6",
"css": "github:systemjs/plugin-css@^0.1.20",
http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade
index b884db2..eebfd89 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -21,7 +21,10 @@ html(ng-app='ignite-web-console' id='app')
link(rel='shortcut icon' href='favicon.ico')
meta(http-equiv='content-type' content='text/html; charset=UTF8')
- title(ng-bind='$title')
+ title(ng-bind='$meta.title')
+
+ meta(name='description' content='{{$meta.description}}')
+ meta(name='keywords' content='{{$meta.keywords}}')
link(rel='stylesheet', href='/app.min.css')
[09/11] ignite git commit: IGNITE-843 Fixed missed catch() blocks.
Posted by ak...@apache.org.
IGNITE-843 Fixed missed catch() blocks.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e253f45b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e253f45b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e253f45b
Branch: refs/heads/ignite-2612
Commit: e253f45b3186273c4331df1ef5303710efdf2b9d
Parents: d55c820
Author: vsisko <vs...@gridgain.com>
Authored: Thu Mar 3 16:58:41 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 16:58:41 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/routes/caches.js | 3 ++-
modules/control-center-web/src/main/js/serve/routes/clusters.js | 3 ++-
modules/control-center-web/src/main/js/serve/routes/domains.js | 4 +++-
modules/control-center-web/src/main/js/serve/routes/igfs.js | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e253f45b/modules/control-center-web/src/main/js/serve/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/caches.js b/modules/control-center-web/src/main/js/serve/routes/caches.js
index 005fa53..21f6e6b 100644
--- a/modules/control-center-web/src/main/js/serve/routes/caches.js
+++ b/modules/control-center-web/src/main/js/serve/routes/caches.js
@@ -97,7 +97,8 @@ module.exports.factory = function(_, express, mongo) {
.then(() => mongo.DomainModel.update({_id: {$in: domains}}, {$addToSet: {caches: cacheId}}, {multi: true}).exec())
.then(() => res.send(cacheId))
.catch((err) => mongo.handleError(res, err));
- });
+ })
+ .catch((err) => mongo.handleError(res, err));
});
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e253f45b/modules/control-center-web/src/main/js/serve/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/clusters.js b/modules/control-center-web/src/main/js/serve/routes/clusters.js
index 3fcfca4..5621028 100644
--- a/modules/control-center-web/src/main/js/serve/routes/clusters.js
+++ b/modules/control-center-web/src/main/js/serve/routes/clusters.js
@@ -112,7 +112,8 @@ module.exports.factory = function(_, express, mongo) {
.then(() => mongo.Igfs.update({_id: {$nin: igfss}}, {$pull: {clusters: clusterId}}, {multi: true}).exec())
.then(() => res.send(clusterId))
.catch((err) => mongo.handleError(res, err));
- });
+ })
+ .catch((err) => mongo.handleError(res, err));
});
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e253f45b/modules/control-center-web/src/main/js/serve/routes/domains.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/domains.js b/modules/control-center-web/src/main/js/serve/routes/domains.js
index 257c7fa..6963294 100644
--- a/modules/control-center-web/src/main/js/serve/routes/domains.js
+++ b/modules/control-center-web/src/main/js/serve/routes/domains.js
@@ -101,7 +101,8 @@ module.exports.factory = (_, express, mongo) => {
return mongo.Cache.update({_id: {$in: caches}}, {$addToSet: {domains: savedDomain._id}}, {multi: true}).exec();
})
.then(() => _updateCacheStore(cacheStoreChanges));
- });
+ })
+ .catch((err) => mongo.handleError(res, err));
};
const _save = (domains, res) => {
@@ -135,6 +136,7 @@ module.exports.factory = (_, express, mongo) => {
return _saveDomainModel(domain, savedDomains);
})
+ .catch((err) => mongo.handleError(res, err))
);
}
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/e253f45b/modules/control-center-web/src/main/js/serve/routes/igfs.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/igfs.js b/modules/control-center-web/src/main/js/serve/routes/igfs.js
index c204079..7f03617 100644
--- a/modules/control-center-web/src/main/js/serve/routes/igfs.js
+++ b/modules/control-center-web/src/main/js/serve/routes/igfs.js
@@ -88,7 +88,8 @@ module.exports.factory = function(_, express, mongo) {
})
.then(() => res.send(igfsId))
.catch((err) => mongo.handleError(res, err));
- });
+ })
+ .catch((err) => mongo.handleError(res, err));
});
/**
[11/11] ignite git commit: IGNITE-2612 WIP reworking caches screen to
Angular directives.
Posted by ak...@apache.org.
IGNITE-2612 WIP reworking caches screen to Angular directives.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c6a73c45
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c6a73c45
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c6a73c45
Branch: refs/heads/ignite-2612
Commit: c6a73c45d146fdd3a5afcd139a3d039e712d91ac
Parents: 13075d9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Mar 3 17:33:27 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 17:33:27 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/form/field/dropdown.directive.js | 1 +
.../main/js/app/modules/states/configuration/caches/store.jade | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c6a73c45/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.directive.js b/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.directive.js
index c0c70b8..662a33b 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/form/field/dropdown.directive.js
@@ -55,6 +55,7 @@ export default ['igniteFormFieldDropdown', ['IgniteFormGUID', (guid) => {
bindToController: {
value: '=ngModel',
placeholder: '@',
+ required: '=ngRequired',
options: '=',
ngDisabled: '=',
multiple: '='
http://git-wip-us.apache.org/repos/asf/ignite/blob/c6a73c45/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
index 9190e32..7b9d513 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -125,9 +125,9 @@ form.panel.panel-default(name='store' novalidate)
-var pojoStoreFactory = storeFactory + '.CacheJdbcPojoStoreFactory'
.details-row
- +text(pojoStoreFactory, 'dataSourceBean', 'Data source bean name:', 'Name of the data source bean in Spring context', 'Bean name in Spring context', true)
+ +text(pojoStoreFactory, 'dataSourceBean', 'Data source bean name:', 'Name of the data source bean in Spring context', 'Bean name in Spring context', 'true')
.details-row
- +dialect(pojoStoreFactory, 'pojoDialect', 'Dialect', 'Dialect of SQL implemented by a particular RDBMS:', 'Generic JDBC dialect')
+ +dialect(pojoStoreFactory, 'pojoDialect', 'Dialect:', 'Dialect of SQL implemented by a particular RDBMS:', 'Generic JDBC dialect')
div(ng-if='#{storeFactoryKind} === "CacheJdbcBlobStoreFactory"')
-var blobStoreFactory = storeFactory + '.CacheJdbcBlobStoreFactory'
[10/11] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Posted by ak...@apache.org.
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13075d90
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13075d90
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13075d90
Branch: refs/heads/ignite-2612
Commit: 13075d901d011a8d598a75817404995e9a09f91e
Parents: 3581dd4 e253f45
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Mar 3 17:15:32 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 17:15:32 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class.directive.js | 46 ++++++--
.../form-field-java-class.jade | 38 ++++---
.../src/main/js/app/filters/byName.filter.js | 23 ++++
.../main/js/app/filters/byName/byName.filter.js | 23 ----
.../src/main/js/app/filters/hasPojo.filter.js | 26 +++++
.../js/app/filters/hasPojo/hasPojo.filter.js | 26 -----
.../control-center-web/src/main/js/app/index.js | 19 +++-
.../js/app/modules/branding/Logo.provider.js | 42 -------
.../js/app/modules/branding/Terms.provider.js | 41 -------
.../js/app/modules/branding/branding.module.js | 22 ++--
.../app/modules/branding/branding.provider.js | 111 +++++++++++++++++++
.../app/modules/branding/features.directive.js | 35 ++++++
.../js/app/modules/branding/footer.directive.js | 34 ++++++
.../modules/branding/header-logo.directive.js | 34 ++++++
.../js/app/modules/branding/header-logo.jade | 18 +++
.../modules/branding/header-title.directive.js | 35 ++++++
.../js/app/modules/branding/logo.directive.js | 34 ------
.../src/main/js/app/modules/branding/logo.jade | 18 ---
.../branding/powered-by-apache.directive.js | 4 +-
.../js/app/modules/branding/terms.directive.js | 5 +-
.../js/app/modules/branding/title.directive.js | 35 ------
.../main/js/app/modules/states/admin.state.js | 6 +-
.../app/modules/states/configuration.state.js | 30 ++---
.../clusters/general/discovery/zookeeper.jade | 4 +-
.../main/js/app/modules/states/logout.state.js | 5 +-
.../js/app/modules/states/password.state.js | 10 +-
.../main/js/app/modules/states/profile.state.js | 6 +-
.../main/js/app/modules/states/signin.state.js | 10 +-
.../src/main/js/app/modules/states/sql.state.js | 12 +-
.../control-center-web/src/main/js/config.js | 1 +
.../control-center-web/src/main/js/package.json | 2 +-
.../src/main/js/public/stylesheets/style.scss | 4 +
.../src/main/js/serve/routes/caches.js | 3 +-
.../src/main/js/serve/routes/clusters.js | 3 +-
.../src/main/js/serve/routes/domains.js | 4 +-
.../src/main/js/serve/routes/igfs.js | 3 +-
.../src/main/js/views/includes/footer.jade | 3 +-
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/index.jade | 7 +-
.../src/main/js/views/reset.jade | 4 +-
.../src/main/js/views/signin.jade | 12 +-
41 files changed, 468 insertions(+), 332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
----------------------------------------------------------------------