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/02/19 11:55:19 UTC
[1/4] ignite git commit: IGNITE-2287 Reworked codegeneration of
example code.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 a3214be18 -> 8909d236e
IGNITE-2287 Reworked codegeneration of example code.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc5ada54
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc5ada54
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc5ada54
Branch: refs/heads/ignite-2612
Commit: dc5ada545a57a3020395d350dfc0ea0c8cb20332
Parents: 695c217
Author: vsisko <vs...@gridgain.com>
Authored: Fri Feb 19 14:54:48 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 19 14:54:48 2016 +0700
----------------------------------------------------------------------
.../main/js/helpers/generator/generator-java.js | 199 ++++++++++++++-----
1 file changed, 148 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dc5ada54/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index abee0be..57ac1da 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -2561,13 +2561,7 @@ $generatorJava.dataSourceClassName = function (res, storeFactory) {
return undefined;
};
-var MAX_PARKING_CNT = 5;
-var MAX_CAR_CNT = 10;
-var MAX_COUNTRY_CNT = 5;
-var MAX_DEPARTMENT_CNT = 5;
-var MAX_EMPLOYE_CNT = 10;
-
-// Defined queries for demo data.
+// Descriptors for generation of demo data.
var PREDEFINED_QUERIES = [
{
schema: 'CARS',
@@ -2576,13 +2570,13 @@ var PREDEFINED_QUERIES = [
'ID INTEGER NOT NULL PRIMARY KEY,\n' +
'NAME VARCHAR(50) NOT NULL,\n' +
'CAPACITY INTEGER NOT NULL)',
- fillQuery: function () {
- var queries = ['DELETE FROM CARS.PARKING;'];
-
- for (var id = 0; id < MAX_PARKING_CNT; id++)
- queries.push('INSERT INTO CARS.PARKING(ID, NAME, CAPACITY) VALUES(' + id + ', \'Parking #' + (id + 1) + '\', 10);');
-
- return queries;
+ clearQuery: 'DELETE FROM CARS.PARKING',
+ insertCntConsts: [{name: 'EXAMPLE_MAX_PARKING_CNT', val: 5, comment: 'How many parkings to generate.'}],
+ insertPattern: ['INSERT INTO CARS.PARKING(ID, NAME, CAPACITY) VALUES(?, ?, ?)'],
+ fillInsertParameters: function (res) {
+ res.line('stmt.setInt(1, id);');
+ res.line('stmt.setString(2, "Parking #" + (id + 1));');
+ res.line('stmt.setInt(3, 10 + rnd.nextInt(20));');
},
selectQuery: [
"SELECT * FROM PARKING WHERE CAPACITY >= 20"
@@ -2595,13 +2589,17 @@ var PREDEFINED_QUERIES = [
'ID INTEGER NOT NULL PRIMARY KEY,\n' +
'PARKING_ID INTEGER NOT NULL,\n' +
'NAME VARCHAR(50) NOT NULL);',
- fillQuery: function () {
- var queries = ['DELETE FROM CARS.CAR;'];
-
- for (var id = 0; id < MAX_CAR_CNT; id++)
- queries.push('INSERT INTO CARS.CAR(ID, PARKING_ID, NAME) VALUES(' + id + ', ' + Math.floor(Math.random() * MAX_PARKING_CNT) + ', \'Car #' + (id + 1) + '\');');
-
- return queries;
+ clearQuery: 'DELETE FROM CARS.CAR',
+ rndRequired: true,
+ insertCntConsts: [
+ {name: 'EXAMPLE_MAX_CAR_CNT', val: 10, comment: 'How many cars to generate.'},
+ {name: 'EXAMPLE_MAX_PARKING_CNT', val: 5, comment: 'How many parkings to generate.'}
+ ],
+ insertPattern: ['INSERT INTO CARS.CAR(ID, PARKING_ID, NAME) VALUES(?, ?, ?)'],
+ fillInsertParameters: function (res) {
+ res.line('stmt.setInt(1, id);');
+ res.line('stmt.setInt(2, rnd.nextInt(EXAMPLE_MAX_PARKING_CNT));');
+ res.line('stmt.setString(3, "Car #" + (id + 1));');
},
selectQuery: [
"SELECT * FROM CAR WHERE PARKINGID = 2"
@@ -2613,13 +2611,13 @@ var PREDEFINED_QUERIES = [
'ID INTEGER NOT NULL PRIMARY KEY,\n' +
'NAME VARCHAR(50),\n' +
'POPULATION INTEGER NOT NULL);',
- fillQuery: function () {
- var queries = ['DELETE FROM COUNTRY;'];
-
- for (var id = 0; id < MAX_COUNTRY_CNT; id++)
- queries.push('INSERT INTO COUNTRY(ID, NAME, POPULATION) VALUES(' + id + ', \'Country #' + (id + 1) + '\', ' + ((id + 1) * 10000000) + ');');
-
- return queries;
+ clearQuery: 'DELETE FROM COUNTRY',
+ insertCntConsts: [{name: 'EXAMPLE_MAX_COUNTRY_CNT', val: 5, comment: 'How many countries to generate.'}],
+ insertPattern: ['INSERT INTO COUNTRY(ID, NAME, POPULATION) VALUES(?, ?, ?)'],
+ fillInsertParameters: function (res) {
+ res.line('stmt.setInt(1, id);');
+ res.line('stmt.setString(2, "Country #" + (id + 1));');
+ res.line('stmt.setInt(3, 10000000 + rnd.nextInt(100000000));');
},
selectQuery: [
"SELECT * FROM COUNTRY WHERE POPULATION BETWEEN 15000000 AND 25000000"
@@ -2631,13 +2629,17 @@ var PREDEFINED_QUERIES = [
'ID INTEGER NOT NULL PRIMARY KEY,\n' +
'COUNTRY_ID INTEGER NOT NULL,\n' +
'NAME VARCHAR(50) NOT NULL);',
- fillQuery: function () {
- var queries = ['DELETE FROM DEPARTMENT;'];
-
- for (var id = 0; id < MAX_DEPARTMENT_CNT; id++)
- queries.push('INSERT INTO DEPARTMENT(ID, COUNTRY_ID, NAME) VALUES(' + id + ', ' + Math.floor(Math.random() * MAX_COUNTRY_CNT) + ', \'Department #' + (id + 1) + '\');');
-
- return queries;
+ clearQuery: 'DELETE FROM DEPARTMENT',
+ rndRequired: true,
+ insertCntConsts: [
+ {name: 'EXAMPLE_MAX_DEPARTMENT_CNT', val: 5, comment: 'How many departments to generate.'},
+ {name: 'EXAMPLE_MAX_COUNTRY_CNT', val: 5, comment: 'How many countries to generate.'}
+ ],
+ insertPattern: ['INSERT INTO DEPARTMENT(ID, COUNTRY_ID, NAME) VALUES(?, ?, ?)'],
+ fillInsertParameters: function (res) {
+ res.line('stmt.setInt(1, id);');
+ res.line('stmt.setInt(2, rnd.nextInt(EXAMPLE_MAX_COUNTRY_CNT));');
+ res.line('stmt.setString(3, "Department #" + (id + 1));');
},
selectQuery: [
"SELECT * FROM DEPARTMENT"
@@ -2656,23 +2658,62 @@ var PREDEFINED_QUERIES = [
'HIRE_DATE DATE NOT NULL,\n' +
'JOB VARCHAR(50) NOT NULL,\n' +
'SALARY DOUBLE);',
- fillQuery: function () {
- var queries = ['DELETE FROM EMPLOYEE;'];
+ clearQuery: 'DELETE FROM EMPLOYEE',
+ rndRequired: true,
+ insertCntConsts: [
+ {name: 'EXAMPLE_MAX_EMPLOYEE_CNT', val: 10, comment: 'How many employees to generate.'},
+ {name: 'EXAMPLE_MAX_DEPARTMENT_CNT', val: 5, comment: 'How many departments to generate.'}
+ ],
+ specialGeneration: function (res, conVar) {
+ $generatorJava.declareVariableCustom(res, 'stmt', 'java.sql.PreparedStatement', conVar +
+ '.prepareStatement("INSERT INTO EMPLOYEE(ID, DEPARTMENT_ID, FIRST_NAME, LAST_NAME, EMAIL, PHONE_NUMBER, HIRE_DATE, JOB, SALARY) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)")');
+
+ res.startBlock('for (int id = 0; id < EXAMPLE_MAX_DEPARTMENT_CNT; id ++) {');
+ res.line('stmt.setInt(1, id);');
+ res.line('stmt.setInt(2, id);');
+ res.line('stmt.setString(3, "First name manager #" + (id + 1));');
+ res.line('stmt.setString(4, "Last name manager#" + (id + 1));');
+ res.line('stmt.setString(5, "Email manager#" + (id + 1));');
+ res.line('stmt.setString(6, "Phone number manager#" + (id + 1));');
+ res.line('stmt.setString(7, "2014-01-01");');
+ res.line('stmt.setString(8, "Job manager #" + (id + 1));');
+ res.line('stmt.setDouble(9, 1000.0 + rnd.nextInt(500));');
- for (var id = 0; id < MAX_DEPARTMENT_CNT; id++)
- queries.push('INSERT INTO EMPLOYEE(ID, DEPARTMENT_ID, FIRST_NAME, LAST_NAME, EMAIL, PHONE_NUMBER, HIRE_DATE, JOB, SALARY) VALUES(' +
- id + ', ' + id + ', \'First name manager #' + (id + 1) + '\', \'Last name manager #' + (id + 1) + '\', \'Email manager #' +
- (id + 1) + '\', \'Phone number manager #' + (id + 1) + '\', \'2014-01-01\', \'Job manager #' + (id + 1) + '\', ' + (1100 + 50 * id) + ');');
+ res.needEmptyLine = true;
- for (id = 0; id < MAX_EMPLOYE_CNT; id++) {
- var depId = Math.floor(Math.random() * MAX_DEPARTMENT_CNT);
+ res.line('stmt.executeUpdate();');
- queries.push('INSERT INTO EMPLOYEE(ID, DEPARTMENT_ID, MANAGER_ID, FIRST_NAME, LAST_NAME, EMAIL, PHONE_NUMBER, HIRE_DATE, JOB, SALARY) VALUES(' +
- (100 + id) + ', ' + depId + ', ' + depId + ', \'First name employee #' + (id + 1) + '\', \'Last name employee #' + (id + 1) + '\', \'Email employee #' +
- (id + 1) + '\', \'Phone number employee #' + (id + 1) + '\', \'2014-01-01\', \'Job employee #' + (id + 1) + '\', ' + (600 + 50 * id + 50 * depId) + ');');
- }
+ res.endBlock('}');
+
+ res.needEmptyLine = true;
+
+ $generatorJava.declareVariableCustom(res, 'stmt', 'java.sql.PreparedStatement', conVar +
+ '.prepareStatement("INSERT INTO EMPLOYEE(ID, DEPARTMENT_ID, MANAGER_ID, FIRST_NAME, LAST_NAME, EMAIL, PHONE_NUMBER, HIRE_DATE, JOB, SALARY) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")');
- return queries;
+ res.startBlock('for (int id = 0; id < EXAMPLE_MAX_EMPLOYEE_CNT; id ++) {');
+
+ res.needEmptyLine = true;
+
+ res.line('int depId = rnd.nextInt(EXAMPLE_MAX_DEPARTMENT_CNT);');
+
+ res.line('stmt.setInt(1, EXAMPLE_MAX_DEPARTMENT_CNT + id);');
+ res.line('stmt.setInt(2, depId);');
+ res.line('stmt.setInt(3, depId);');
+ res.line('stmt.setString(4, "First name manager #" + (id + 1));');
+ res.line('stmt.setString(5, "Last name manager#" + (id + 1));');
+ res.line('stmt.setString(6, "Email manager#" + (id + 1));');
+ res.line('stmt.setString(7, "Phone number manager#" + (id + 1));');
+ res.line('stmt.setString(8, "2014-01-01");');
+ res.line('stmt.setString(9, "Job manager #" + (id + 1));');
+ res.line('stmt.setDouble(10, 600.0 + rnd.nextInt(300));');
+
+ res.needEmptyLine = true;
+
+ res.line('stmt.executeUpdate();');
+
+ res.endBlock('}');
+
+ res.needEmptyLine = true;
},
selectQuery: [
"SELECT * FROM EMPLOYEE WHERE MANAGERID IS NOT NULL"
@@ -2765,14 +2806,49 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
typeByDs[ds].push(type);
});
+ var rndDefined = false;
+
+ var generatedConsts = [];
+
+ _.forEach(typeByDs, function (types) {
+ _.forEach(types, function (type) {
+ _.forEach(type.domains, function (domain) {
+ var desc = _.find(PREDEFINED_QUERIES, function (desc) {
+ return domain.valueType.toUpperCase().endsWith(desc.type);
+ });
+
+ if (desc) {
+ if (!rndDefined && desc.rndRequired) {
+ res.line('/** Random generator for demo data. */');
+ $generatorJava.declareVariableCustom(res, 'rnd', 'java.util.Random', 'new Random()', 'private static final');
+
+ rndDefined = true;
+ }
+
+ _.forEach(desc.insertCntConsts, function (cnt) {
+ if (!_.contains(generatedConsts, cnt.name)) {
+ res.line('/** ' + cnt.comment + ' */');
+ res.line('private static final int ' + cnt.name + ' = ' + cnt.val + ';');
+ res.needEmptyLine = true;
+
+ generatedConsts.push(cnt.name);
+ }
+ });
+ }
+ });
+ });
+ });
+
+ res.needEmptyLine = true;
+
// Generation of fill database method
- res.line('/** Fill data for domain model demo example. */');
+ res.line('/** Fill data for Demo example. */');
res.startBlock('private static void prepareExampleData() throws ' + res.importClass('java.sql.SQLException') + ' {');
_.forEach(typeByDs, function (types, ds) {
var conVar = ds + 'Con';
- res.startBlock('try (' + res.importClass('java.sql.Connection') + ' ' + conVar + ' = ' + factoryCls + '.DataSources.INSTANCE_' + ds + '.getConnection()) {');
+ res.startBlock('try (' + res.importClass('java.sql.Connection') + ' ' + conVar + ' = ' + res.importClass(factoryCls) + '.DataSources.INSTANCE_' + ds + '.getConnection()) {');
_.forEach(types, function (type) {
_.forEach(type.domains, function (domain) {
@@ -2785,7 +2861,28 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
_prepareStatement(res, conVar, 'CREATE SCHEMA IF NOT EXISTS ' + desc.schema);
_prepareStatement(res, conVar, desc.create);
- _prepareStatement(res, conVar, desc.fillQuery().join('\n'));
+
+ _prepareStatement(res, conVar, desc.clearQuery);
+
+ res.needEmptyLine = true;
+
+ if (!desc.specialGeneration) {
+ $generatorJava.declareVariableCustom(res, 'stmt', 'java.sql.PreparedStatement', conVar + '.prepareStatement("' + desc.insertPattern + '")');
+
+ res.startBlock('for (int id = 0; id < ' + desc.insertCntConsts[0].name + '; id ++) {');
+
+ desc.fillInsertParameters(res);
+
+ res.needEmptyLine = true;
+
+ res.line('stmt.executeUpdate();');
+
+ res.endBlock('}');
+
+ res.needEmptyLine = true;
+ }
+ else
+ desc.specialGeneration(res, conVar);
res.line(conVar + '.commit();');
[4/4] 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/8909d236
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8909d236
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8909d236
Branch: refs/heads/ignite-2612
Commit: 8909d236ea1bc7676491b2fca14d10fc405213f8
Parents: 3f37fc8
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 19 17:55:38 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 19 17:55:38 2016 +0700
----------------------------------------------------------------------
.../caches/concurrency.directive.js | 27 ++++++
.../configuration/caches/concurrency.jade | 99 ++++++++++++++++++++
.../configuration/caches/memory.directive.js | 27 ++++++
.../states/configuration/caches/memory.jade | 99 ++++++++++++++++++++
.../configuration/caches/query.directive.js | 27 ++++++
.../states/configuration/caches/query.jade | 99 ++++++++++++++++++++
.../configuration/caches/store.directive.js | 27 ++++++
.../states/configuration/caches/store.jade | 99 ++++++++++++++++++++
.../src/main/js/views/configuration/caches.jade | 8 ++
9 files changed, 512 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
new file mode 100644
index 0000000..fcf0877
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './concurrency.jade!';
+
+export default ['igniteConfigurationCachesGeneral', [() => {
+ return {
+ scope: true,
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
new file mode 100644
index 0000000..689b036
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
@@ -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.
+
+- var model = 'backupItem'
+
+form.panel.panel-default(name='general' novalidate)
+ .panel-heading(bs-collapse-toggle)
+ ignite-form-panel-chevron
+ label General
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-body
+ .col-sm-6
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Name:
+ ignite-form-field-tooltip
+ | Cache name
+ ignite-form-field-input-text(
+ data-id='cacheName'
+ data-name='cacheName'
+ data-ng-model='#{model}.name'
+ data-ng-required='true'
+ data-placeholder='Input name'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Clusters: #[a(ui-sref='base.configuration.clusters({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='clusters'
+ data-name='clusters'
+ data-options='clusters'
+ data-multiple='true'
+ data-ng-model='#{model}.clusters'
+ data-ng-disabled='!clusters.length'
+ data-placeholder='{{ clusters.length ? "Choose clusters": "No clusters configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Domain models: #[a(ui-sref='base.configuration.domains({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='domains'
+ data-name='domains'
+ data-options='domains'
+ data-multiple='true'
+ data-ng-model='#{model}.domains'
+ data-ng-disabled='!domains.length'
+ data-placeholder='{{ domains.length ? "Choose domain models": "No domain models configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Cache mode:
+ ignite-form-field-tooltip
+ | Cache modes:#[br]
+ ul: li Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes
+ li Replicated - in this mode all the keys are distributed to all participating nodes
+ li Local - in this mode caches residing on different grid nodes will not know about each other
+ ignite-form-field-dropdown(
+ data-id='cacheMode'
+ data-name='cacheMode'
+ data-options='[\
+ {value: "LOCAL", label: "LOCAL"},\
+ {value: "REPLICATED", label: "REPLICATED"},\
+ {value: "PARTITIONED", label: "PARTITIONED"}\
+ ]'
+ data-ng-model='#{model}.cacheMode'
+ data-placeholder='PARTITIONED'
+ )
+ ignite-ui-ace.col-sm-6
+ .preview-panel(ng-init='mode = false')
+ .preview-legend
+ a(ng-class='{active: !mode, inactive: mode}' ng-click='mode = false') XML
+ |
+ a(ng-class='{active: mode, inactive: !mode}' ng-click='mode = true') Java
+ .preview-content(ng-if='mode')
+ ignite-ui-ace-java(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
+ .preview-content(ng-if='!mode')
+ ignite-ui-ace-xml(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.directive.js
new file mode 100644
index 0000000..0f8662d
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.directive.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './memory.jade!';
+
+export default ['igniteConfigurationCachesMemory', [() => {
+ return {
+ scope: true,
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
new file mode 100644
index 0000000..689b036
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
@@ -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.
+
+- var model = 'backupItem'
+
+form.panel.panel-default(name='general' novalidate)
+ .panel-heading(bs-collapse-toggle)
+ ignite-form-panel-chevron
+ label General
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-body
+ .col-sm-6
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Name:
+ ignite-form-field-tooltip
+ | Cache name
+ ignite-form-field-input-text(
+ data-id='cacheName'
+ data-name='cacheName'
+ data-ng-model='#{model}.name'
+ data-ng-required='true'
+ data-placeholder='Input name'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Clusters: #[a(ui-sref='base.configuration.clusters({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='clusters'
+ data-name='clusters'
+ data-options='clusters'
+ data-multiple='true'
+ data-ng-model='#{model}.clusters'
+ data-ng-disabled='!clusters.length'
+ data-placeholder='{{ clusters.length ? "Choose clusters": "No clusters configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Domain models: #[a(ui-sref='base.configuration.domains({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='domains'
+ data-name='domains'
+ data-options='domains'
+ data-multiple='true'
+ data-ng-model='#{model}.domains'
+ data-ng-disabled='!domains.length'
+ data-placeholder='{{ domains.length ? "Choose domain models": "No domain models configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Cache mode:
+ ignite-form-field-tooltip
+ | Cache modes:#[br]
+ ul: li Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes
+ li Replicated - in this mode all the keys are distributed to all participating nodes
+ li Local - in this mode caches residing on different grid nodes will not know about each other
+ ignite-form-field-dropdown(
+ data-id='cacheMode'
+ data-name='cacheMode'
+ data-options='[\
+ {value: "LOCAL", label: "LOCAL"},\
+ {value: "REPLICATED", label: "REPLICATED"},\
+ {value: "PARTITIONED", label: "PARTITIONED"}\
+ ]'
+ data-ng-model='#{model}.cacheMode'
+ data-placeholder='PARTITIONED'
+ )
+ ignite-ui-ace.col-sm-6
+ .preview-panel(ng-init='mode = false')
+ .preview-legend
+ a(ng-class='{active: !mode, inactive: mode}' ng-click='mode = false') XML
+ |
+ a(ng-class='{active: mode, inactive: !mode}' ng-click='mode = true') Java
+ .preview-content(ng-if='mode')
+ ignite-ui-ace-java(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
+ .preview-content(ng-if='!mode')
+ ignite-ui-ace-xml(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
new file mode 100644
index 0000000..25e958c
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './query.jade!';
+
+export default ['igniteConfigurationCachesMemory', [() => {
+ return {
+ scope: true,
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
new file mode 100644
index 0000000..689b036
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
@@ -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.
+
+- var model = 'backupItem'
+
+form.panel.panel-default(name='general' novalidate)
+ .panel-heading(bs-collapse-toggle)
+ ignite-form-panel-chevron
+ label General
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-body
+ .col-sm-6
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Name:
+ ignite-form-field-tooltip
+ | Cache name
+ ignite-form-field-input-text(
+ data-id='cacheName'
+ data-name='cacheName'
+ data-ng-model='#{model}.name'
+ data-ng-required='true'
+ data-placeholder='Input name'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Clusters: #[a(ui-sref='base.configuration.clusters({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='clusters'
+ data-name='clusters'
+ data-options='clusters'
+ data-multiple='true'
+ data-ng-model='#{model}.clusters'
+ data-ng-disabled='!clusters.length'
+ data-placeholder='{{ clusters.length ? "Choose clusters": "No clusters configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Domain models: #[a(ui-sref='base.configuration.domains({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='domains'
+ data-name='domains'
+ data-options='domains'
+ data-multiple='true'
+ data-ng-model='#{model}.domains'
+ data-ng-disabled='!domains.length'
+ data-placeholder='{{ domains.length ? "Choose domain models": "No domain models configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Cache mode:
+ ignite-form-field-tooltip
+ | Cache modes:#[br]
+ ul: li Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes
+ li Replicated - in this mode all the keys are distributed to all participating nodes
+ li Local - in this mode caches residing on different grid nodes will not know about each other
+ ignite-form-field-dropdown(
+ data-id='cacheMode'
+ data-name='cacheMode'
+ data-options='[\
+ {value: "LOCAL", label: "LOCAL"},\
+ {value: "REPLICATED", label: "REPLICATED"},\
+ {value: "PARTITIONED", label: "PARTITIONED"}\
+ ]'
+ data-ng-model='#{model}.cacheMode'
+ data-placeholder='PARTITIONED'
+ )
+ ignite-ui-ace.col-sm-6
+ .preview-panel(ng-init='mode = false')
+ .preview-legend
+ a(ng-class='{active: !mode, inactive: mode}' ng-click='mode = false') XML
+ |
+ a(ng-class='{active: mode, inactive: !mode}' ng-click='mode = true') Java
+ .preview-content(ng-if='mode')
+ ignite-ui-ace-java(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
+ .preview-content(ng-if='!mode')
+ ignite-ui-ace-xml(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
new file mode 100644
index 0000000..4964a7e
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './store.jade!';
+
+export default ['igniteConfigurationCachesMemory', [() => {
+ return {
+ scope: true,
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/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
new file mode 100644
index 0000000..689b036
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -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.
+
+- var model = 'backupItem'
+
+form.panel.panel-default(name='general' novalidate)
+ .panel-heading(bs-collapse-toggle)
+ ignite-form-panel-chevron
+ label General
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-body
+ .col-sm-6
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Name:
+ ignite-form-field-tooltip
+ | Cache name
+ ignite-form-field-input-text(
+ data-id='cacheName'
+ data-name='cacheName'
+ data-ng-model='#{model}.name'
+ data-ng-required='true'
+ data-placeholder='Input name'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Clusters: #[a(ui-sref='base.configuration.clusters({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='clusters'
+ data-name='clusters'
+ data-options='clusters'
+ data-multiple='true'
+ data-ng-model='#{model}.clusters'
+ data-ng-disabled='!clusters.length'
+ data-placeholder='{{ clusters.length ? "Choose clusters": "No clusters configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Domain models: #[a(ui-sref='base.configuration.domains({id: #{model}._id})') (add)]
+ ignite-form-field-tooltip
+ | Associate clusters with the current cache
+ ignite-form-field-dropdown(
+ data-id='domains'
+ data-name='domains'
+ data-options='domains'
+ data-multiple='true'
+ data-ng-model='#{model}.domains'
+ data-ng-disabled='!domains.length'
+ data-placeholder='{{ domains.length ? "Choose domain models": "No domain models configured" }}'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Cache mode:
+ ignite-form-field-tooltip
+ | Cache modes:#[br]
+ ul: li Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes
+ li Replicated - in this mode all the keys are distributed to all participating nodes
+ li Local - in this mode caches residing on different grid nodes will not know about each other
+ ignite-form-field-dropdown(
+ data-id='cacheMode'
+ data-name='cacheMode'
+ data-options='[\
+ {value: "LOCAL", label: "LOCAL"},\
+ {value: "REPLICATED", label: "REPLICATED"},\
+ {value: "PARTITIONED", label: "PARTITIONED"}\
+ ]'
+ data-ng-model='#{model}.cacheMode'
+ data-placeholder='PARTITIONED'
+ )
+ ignite-ui-ace.col-sm-6
+ .preview-panel(ng-init='mode = false')
+ .preview-legend
+ a(ng-class='{active: !mode, inactive: mode}' ng-click='mode = false') XML
+ |
+ a(ng-class='{active: mode, inactive: !mode}' ng-click='mode = true') Java
+ .preview-content(ng-if='mode')
+ ignite-ui-ace-java(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
+ .preview-content(ng-if='!mode')
+ ignite-ui-ace-xml(data-cluster='backupItem' data-generator='cacheDomains' data-caches='caches')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8909d236/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 a00fe69..4c10464 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
@@ -34,3 +34,11 @@ include ../includes/infos
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate)
.panel-group(bs-collapse ng-model='ui.activePanels' data-allow-multiple='true')
ignite-configuration-caches-general
+ ignite-configuration-caches-memory
+ ignite-configuration-caches-query
+ ignite-configuration-caches-store
+ ignite-configuration-caches-concurrency
+ ignite-configuration-caches-rebalance
+ ignite-configuration-caches-server-near-cache
+ ignite-configuration-caches-statistics
+
[2/4] ignite git commit: IGNITE-843 Fixed signin on enter + minor
code cleanup.
Posted by ak...@apache.org.
IGNITE-843 Fixed signin on enter + minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea979d83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea979d83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea979d83
Branch: refs/heads/ignite-2612
Commit: ea979d83a7629e1d7007fa3e99b35d70c50b3559
Parents: dc5ada5
Author: vsisko <vs...@gridgain.com>
Authored: Fri Feb 19 14:56:45 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 19 14:56:45 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/serve/routes/public.js | 2 +-
.../control-center-web/src/main/js/views/signin.jade | 2 +-
.../src/main/js/views/sql/notebook-new.jade | 13 ++++++-------
.../src/main/js/views/templates/clone.jade | 10 +++++-----
5 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index fe11359..1de5433 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2054,7 +2054,7 @@ consoleModule.controller('resetPassword', [
}
]);
-// Login popup controller.
+// Sign in controller.
// TODO IGNITE-1936 Refactor this controller.
consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', function ($scope, $focus, Auth, countries) {
$scope.auth = Auth.auth;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/serve/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/public.js b/modules/control-center-web/src/main/js/serve/routes/public.js
index 02986a8..33aa287 100644
--- a/modules/control-center-web/src/main/js/serve/routes/public.js
+++ b/modules/control-center-web/src/main/js/serve/routes/public.js
@@ -116,7 +116,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
});
/**
- * Login in exist account.
+ * Sign in into exist account.
*/
router.post('/signin', (req, res, next) => {
passport.authenticate('local', (errAuth, user) => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/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 cb78abc..663b77b 100644
--- a/modules/control-center-web/src/main/js/views/signin.jade
+++ b/modules/control-center-web/src/main/js/views/signin.jade
@@ -63,7 +63,7 @@ header#header.header
.settings-row(ng-show='action != "password/forgot"')
+lblRequired('Password:')
.col-xs-9.col-md-8
- input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "password/forgot"' on-enter='action == "login" && form.$valid && auth(action, user_info)')
+ input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "password/forgot"' on-enter='action == "signin" && form.$valid && auth(action, user_info)')
.settings-row(ng-if='action == "signup"')
+lblRequired('Confirm:')
.col-xs-9.col-md-8
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
index 6a7766c..2a50137 100644
--- a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
+++ b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
@@ -20,13 +20,12 @@
.modal-header
button.close(ng-click='$hide()') ×
h4.modal-title New SQL notebook
- form.form-horizontal(name='ui.inputForm' novalidate)
- .modal-body.row
- .login
- .col-sm-3
- label.required.labelFormField Name:
- .col-sm-9
- input.form-control(id='create-notebook' type='text' ng-model='name' required on-enter='ui.inputForm.$valid && createNewNotebook(name)' auto-focus)
+ form.form-horizontal.modal-body.row(name='ui.inputForm' novalidate)
+ div
+ .col-sm-2
+ label.required.labelFormField Name:
+ .col-sm-10
+ input.form-control(id='create-notebook' type='text' ng-model='name' required on-enter='ui.inputForm.$valid && createNewNotebook(name)' auto-focus)
.modal-footer
button.btn.btn-default(id='copy-btn-cancel' ng-click='$hide()') Cancel
button.btn.btn-primary(id='copy-btn-confirm' ng-disabled='ui.inputForm.$invalid' ng-click='createNewNotebook(name)') Create
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/views/templates/clone.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/clone.jade b/modules/control-center-web/src/main/js/views/templates/clone.jade
index 9628cc5..26b5385 100644
--- a/modules/control-center-web/src/main/js/views/templates/clone.jade
+++ b/modules/control-center-web/src/main/js/views/templates/clone.jade
@@ -21,11 +21,11 @@
button.close(ng-click='$hide()') ×
h4.modal-title Clone
form.form-horizontal.modal-body.row(name='ui.inputForm' novalidate)
- .login
- .col-sm-3
- label.required.labelFormField New name:
- .col-sm-9
- input.form-control(id='copy-new-name' type='text' ng-model='newName' required auto-focus)
+ div
+ .col-sm-2
+ label.required.labelFormField New name:
+ .col-sm-10
+ input.form-control(id='copy-new-name' type='text' ng-model='newName' required auto-focus)
.modal-footer
button.btn.btn-default(id='copy-btn-cancel' ng-click='$hide()') Cancel
button.btn.btn-primary(id='copy-btn-confirm' ng-disabled='ui.inputForm.$invalid' ng-click='ok(newName)') Confirm
[3/4] ignite git commit: Merge branches 'ignite-2612' and
'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-2612
Posted by ak...@apache.org.
Merge branches 'ignite-2612' and '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/3f37fc8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f37fc8d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f37fc8d
Branch: refs/heads/ignite-2612
Commit: 3f37fc8d122e5a181859492e4d445b0eab3a4fbe
Parents: a3214be ea979d8
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 19 16:45:30 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 19 16:45:30 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../main/js/helpers/generator/generator-java.js | 199 ++++++++++++++-----
.../src/main/js/serve/routes/public.js | 2 +-
.../src/main/js/views/signin.jade | 2 +-
.../src/main/js/views/sql/notebook-new.jade | 13 +-
.../src/main/js/views/templates/clone.jade | 10 +-
6 files changed, 162 insertions(+), 66 deletions(-)
----------------------------------------------------------------------