From bd45989a31bd88c924c00b5a48a1c6b803ac06dc Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 14 Sep 2016 13:34:25 +0530 Subject: [PATCH 01/11] CAT-2329 and CAT-2332 Fixed --- .../private/ajax/Settings/CreateProviders.html | 2 +- .../private/ajax/Settings/providerSync.html | 16 ++++++++-------- client/htmls/public/js/awsCapacity.js | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html index 3b997d41c..c677ead19 100755 --- a/client/htmls/private/ajax/Settings/CreateProviders.html +++ b/client/htmls/private/ajax/Settings/CreateProviders.html @@ -234,7 +234,7 @@

- +
diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 1cdbbb150..76716513f 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1115,12 +1115,12 @@

Importing Instances

var tagsProjSelectedVal = $projecttagsList.val(); var tagsenvSelectedVal = $envtagsList.val(); var tagsbgSelectedVal = $bgtagsList.val(); - - if((tagsbgSelectedVal == tagsProjSelectedVal) && (tagsbgSelectedVal == tagsenvSelectedVal)){ + if((tagsbgSelectedVal === tagsProjSelectedVal) + || (tagsbgSelectedVal === tagsenvSelectedVal) + || (tagsProjSelectedVal === tagsenvSelectedVal)){ bootbox.alert("Tag name cannot be same to create catalyst entity mapping"); - return; + return false; } - //Creating the data to Post for Save tags. var tagsData = [{ "catalystEntityType": catalystEntityBgName, @@ -1695,9 +1695,9 @@

Importing Instances

"columns": [ {"data": "platformId","orderable" : true }, {"data": "os","orderable" : false }, - {"data": "ip","orderable" : true, + {"data": "","orderable" : true, "render": function(data, type, full){ - if(data !== null){ + if(full.ip && full.ip !== null){ return data; }else{ return full.privateIpAddress; @@ -1868,9 +1868,9 @@

Importing Instances

"columns": [ {"data": "platformId","orderable" : true }, {"data": "os","orderable" : false }, - {"data": "ip","orderable" : true, + {"data": "","orderable" : true, "render": function(data, type, full){ - if(data !== null){ + if(full.ip && full.ip !== null){ return data; }else{ return full.privateIpAddress; diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 771fe231c..6bd34d537 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -300,12 +300,12 @@ $(document).ready(function() { } }, { - "data": "ip", + "data": "", "orderable": true, "render": function(data, type, full) { - if (data !== null) { + if(full.ip && full.ip !== null){ return data; - } else { + }else{ return full.privateIpAddress; } } @@ -373,12 +373,12 @@ $(document).ready(function() { "data": "os", "orderable": false }, { - "data": "ip", + "data": "", "orderable": true, "render": function(data, type, full) { - if (data !== null) { + if(full.ip && full.ip !== null){ return data; - } else { + }else{ return full.privateIpAddress; } } From 259c4c3b10579c9d5b48e06b5f1878dfba803a46 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 14 Sep 2016 16:04:08 +0530 Subject: [PATCH 02/11] CAT-2333 Fixed --- .../private/ajax/Settings/providerSync.html | 16 ++++------------ client/htmls/public/js/awsCapacity.js | 8 ++------ server/app/model/classes/instance/instance.js | 17 ++++++----------- .../unassigned-instances.js | 16 ++++++---------- .../unmanaged-instance/unmanaged-instance.js | 18 +++++++----------- 5 files changed, 25 insertions(+), 50 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 76716513f..701daf361 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1696,12 +1696,8 @@

Importing Instances

{"data": "platformId","orderable" : true }, {"data": "os","orderable" : false }, {"data": "","orderable" : true, - "render": function(data, type, full){ - if(full.ip && full.ip !== null){ - return data; - }else{ - return full.privateIpAddress; - } + "render":function(data, type, full, meta) { + return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; } }, {"data": "","orderable" : true, @@ -1869,12 +1865,8 @@

Importing Instances

{"data": "platformId","orderable" : true }, {"data": "os","orderable" : false }, {"data": "","orderable" : true, - "render": function(data, type, full){ - if(full.ip && full.ip !== null){ - return data; - }else{ - return full.privateIpAddress; - } + "render":function(data, type, full, meta) { + return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; } }, {"data": "state","orderable" : true }, diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 6bd34d537..492c73ed3 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -375,12 +375,8 @@ $(document).ready(function() { }, { "data": "", "orderable": true, - "render": function(data, type, full) { - if(full.ip && full.ip !== null){ - return data; - }else{ - return full.privateIpAddress; - } + "render":function(data, type, full, meta) { + return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; } }, { "data": "state", diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js index 485885150..0d639e938 100755 --- a/server/app/model/classes/instance/instance.js +++ b/server/app/model/classes/instance/instance.js @@ -2118,23 +2118,18 @@ var InstancesDao = function() { this.updateInstanceStatus = function(instanceId, instance, callback) { var updateObj = {}; + updateObj['instanceState'] = instance.state; + updateObj['subnetId']= instance.subnetId; + updateObj['instanceIP'] = instance.ip; + updateObj['vpcId'] = instance.vpcId; + updateObj['privateIpAddress'] = instance.privateIpAddress; + updateObj['tags'] = instance.tags; if(instance.status && instance.status === 'shutting-down'){ - updateObj['instanceState'] = instance.status; updateObj['isDeleted'] = false; }else if (instance.state === 'terminated') { - updateObj['instanceState'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; updateObj['isDeleted'] = true; - updateObj['tags'] = instance.tags; }else { - updateObj['instanceState'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; updateObj['isDeleted'] = false; - updateObj['tags'] = instance.tags; } Instances.update({ "_id": ObjectId(instanceId) diff --git a/server/app/model/unassigned-instances/unassigned-instances.js b/server/app/model/unassigned-instances/unassigned-instances.js index 4a3075748..3c22fad2e 100644 --- a/server/app/model/unassigned-instances/unassigned-instances.js +++ b/server/app/model/unassigned-instances/unassigned-instances.js @@ -186,20 +186,16 @@ UnassignedInstancesSchema.statics.updateInstance = function updateInstance(param UnassignedInstancesSchema.statics.updateInstanceStatus = function updateInstanceStatus(instanceId,instance,callback) { var updateObj={}; + updateObj['state'] = instance.state; + updateObj['subnetId']= instance.subnetId; + updateObj['ip'] = instance.ip; + updateObj['vpcId'] = instance.vpcId; + updateObj['privateIpAddress'] = instance.privateIpAddress; + updateObj['tags'] = instance.tags; if(instance.state === 'terminated'){ - updateObj['state'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; updateObj['isDeleted'] = true; - updateObj['tags'] = instance.tags; }else{ - updateObj['state'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; updateObj['isDeleted'] = false; - updateObj['tags'] = instance.tags; } UnassignedInstances.update({ "_id": ObjectId(instanceId) diff --git a/server/app/model/unmanaged-instance/unmanaged-instance.js b/server/app/model/unmanaged-instance/unmanaged-instance.js index 5aee11688..4fdda1e63 100644 --- a/server/app/model/unmanaged-instance/unmanaged-instance.js +++ b/server/app/model/unmanaged-instance/unmanaged-instance.js @@ -291,20 +291,16 @@ UnmanagedInstanceSchema.statics.getInstancesByProviderIdOrgIdAndPlatformId = fun UnmanagedInstanceSchema.statics.updateInstanceStatus = function updateInstanceStatus(instanceId,instance,callback) { var updateObj={}; + updateObj['state'] = instance.state; + updateObj['subnetId']= instance.subnetId; + updateObj['ip'] = instance.ip; + updateObj['vpcId'] = instance.vpcId; + updateObj['privateIpAddress'] = instance.privateIpAddress; + updateObj['tags'] = instance.tags; if(instance.state === 'terminated'){ - updateObj['state'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; updateObj['isDeleted'] = true; - updateObj['tags'] = instance.tags; }else{ - updateObj['state'] = instance.state; - updateObj['subnetId']= instance.subnetId; - updateObj['vpcId'] = instance.vpcId; - updateObj['privateIpAddress'] = instance.privateIpAddress; - updateObj['isDeleted'] = false; - updateObj['tags'] = instance.tags; + updateObj['isDeleted'] = false; } UnmanagedInstance.update({ "_id": ObjectId(instanceId) From 04723f282649d426343c303950ecc9fede7ba4aa Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 14 Sep 2016 17:31:38 +0530 Subject: [PATCH 03/11] CAT-2333 Fixed --- client/htmls/private/ajax/Settings/providerSync.html | 4 ++-- client/htmls/public/js/awsCapacity.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 701daf361..bfb4727f6 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1697,7 +1697,7 @@

Importing Instances

{"data": "os","orderable" : false }, {"data": "","orderable" : true, "render":function(data, type, full, meta) { - return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; + return full.ip !== null ? full.ip:full.privateIpAddress; } }, {"data": "","orderable" : true, @@ -1866,7 +1866,7 @@

Importing Instances

{"data": "os","orderable" : false }, {"data": "","orderable" : true, "render":function(data, type, full, meta) { - return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; + return full.ip !== null ? full.ip:full.privateIpAddress; } }, {"data": "state","orderable" : true }, diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 492c73ed3..5a285514a 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -376,7 +376,7 @@ $(document).ready(function() { "data": "", "orderable": true, "render":function(data, type, full, meta) { - return (full.ip !== null || full.ip !== 'null') ? full.ip:full.privateIpAddress; + return full.ip !== null ? full.ip:full.privateIpAddress; } }, { "data": "state", From 81c5db02bd65bc2dfaf8e1b64520be18818e0990 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 10:52:17 +0530 Subject: [PATCH 04/11] Setting Wizard Implementation --- .../model/setting-wizard/setting-wizard.js | 70 +++++++++++++++++++ server/app/routes/v1.0/routes.js | 3 + .../app/routes/v1.0/routes_setting_wizard.js | 35 ++++++++++ server/install.js | 1 + 4 files changed, 109 insertions(+) create mode 100644 server/app/model/setting-wizard/setting-wizard.js create mode 100644 server/app/routes/v1.0/routes_setting_wizard.js diff --git a/server/app/model/setting-wizard/setting-wizard.js b/server/app/model/setting-wizard/setting-wizard.js new file mode 100644 index 000000000..a76dfa382 --- /dev/null +++ b/server/app/model/setting-wizard/setting-wizard.js @@ -0,0 +1,70 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed 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 logger = require('_pr/logger')(module); +var mongoose = require('mongoose'); + + +var Schema = mongoose.Schema; + +var SettingWizardSchema = new Schema({ + orgId: { + type: String, + required: true, + trim: true + }, + currentStep: Schema.Types.Mixed, + nextStep:Schema.Types.Mixed, + isCompleted: { + type: String, + required: true, + trim: true + } +}); + + +SettingWizardSchema.statics.createSettingWizard = function createSettingWizard(settingWizard, callback) { + var that = this; + var settingWizardObj = new that(settingWizard); + settingWizardObj.save(function(err, settingWizardDetails) { + if (err) { + logger.debug("Got error while creating setting-Wizard: ", err); + callback(err, null); + return; + } + logger.debug("Creating setting-Wizard: ", JSON.stringify(settingWizardDetails)); + callback(null, settingWizardDetails); + return; + }); +}; + + +SettingWizardSchema.statics.getSettingWizardByOrgId = function getSettingWizardByOrgId(orgId, callback) { + this.find({ + orgId:orgId + }, function(err, settingWizardDetails) { + if (err) { + logger.debug("Got error while fetching getSettingWizardByOrgId: ", err); + callback(err, null); + } + logger.debug("Got setting-Wizard: ", JSON.stringify(settingWizardDetails)); + callback(null, settingWizardDetails); + }); +}; + +var settingWizard = mongoose.model("settingWizard", SettingWizardSchema); +module.exports = settingWizard; diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js index f9a8c588f..ee2f00cd0 100755 --- a/server/app/routes/v1.0/routes.js +++ b/server/app/routes/v1.0/routes.js @@ -72,6 +72,7 @@ var cors = require('cors'); var auditTrail = require('./routes_audit_trails'); var scripts = require('./routes_scripts'); var fileUpload = require('./routes_fileUpload'); +var settingWizard = require('./routes_setting_wizard'); /* * @TODO * Change app to router in internal routes files @@ -178,6 +179,8 @@ module.exports.setRoutes = function(app) { fileUpload.setRoutes(app, sessionVerificationFunc); + settingWizard.setRoutes(app, sessionVerificationFunc); + app.get('/', function(req, res) { res.redirect('/cat3'); diff --git a/server/app/routes/v1.0/routes_setting_wizard.js b/server/app/routes/v1.0/routes_setting_wizard.js new file mode 100644 index 000000000..e8b242902 --- /dev/null +++ b/server/app/routes/v1.0/routes_setting_wizard.js @@ -0,0 +1,35 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed 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 logger = require('_pr/logger')(module); +var settingWizard = require('_pr/model/settingWizard'); + + +module.exports.setRoutes = function(app, sessionVerificationFunc) { + app.all('/setting-wizard/*', sessionVerificationFunc); + + app.get('/setting-wizard/org/:orgId', function(req, res) { + settingWizard.getSettingWizardInfo(req.params.projectId, req.params.envName, req.query.application, req.query.version, function(err, appData) { + if (err) { + res.status(500).send(errorResponses.db.error); + return; + } + res.status(200).send(appData); + return; + }); + }); +}; diff --git a/server/install.js b/server/install.js index 370278b28..3556fa42f 100755 --- a/server/install.js +++ b/server/install.js @@ -67,6 +67,7 @@ function getDefaultsConfig() { return config.catalystHome + this.cookbooksDirName + "/"; } }, + settingWizardSteps:[{OrgDetails:['Organization','BusinessGroup','Project']},{chefDetails:['chefServer','Environment']},], constantData: { common_field: ['envId', 'providerId', 'orgId', 'bgId','organizationId','businessGroupId', 'projectId','templateType','blueprintConfig.cloudProviderType','cloudProviderType'], sort_field: ['name', 'description'], From 2db0f6bbfec6a08af9e722f66e6451764f66644d Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 12:50:01 +0530 Subject: [PATCH 05/11] Setting Wizard Implementation --- .../private/ajax/Settings/settingsWizard.html | 652 +++++++++--------- 1 file changed, 325 insertions(+), 327 deletions(-) diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html index 99979d0ed..09f8236fa 100644 --- a/client/htmls/private/ajax/Settings/settingsWizard.html +++ b/client/htmls/private/ajax/Settings/settingsWizard.html @@ -1,348 +1,346 @@ -
- -
    -
  • Create Organisation
    • -
  • Create BG
    • -
  • Create Project
    • - -
- -
-
-
+ + +
    +
  • Create Organisation
    • +
  • Create BG
    • +
  • Create Project
    • +
+ + + +
+

Create Organization

-
-
+
+
-
-
-
-
- - -
-
- - +
+
+
+
+ + +
+
+ + +
+
+ + + + + +
-
-
-
+
+
-
-
- -
- -
-
-
+
+
+ + + + + +
+
+

Create Business Group

-
-
+
+
-
-
-
- - -
-
- - -
-
-
+
+
+
+ + +
+
+ + +
+
+
-
-
- - -
-
-
-
+
+
+ + + + + +
+
+

Create Project

-
-
+
+
-
-
- - - -
- - -
- -
-
- - -
-
- - -
- -
- - -
- - - - - - - - - - -
RepositoryNameAction
-
-
- - - -
-
+
+
+ + + +
+ + +
+ +
+
+ + +
+
+ + +
+ +
+ + +
+ + + + + + + + + + +
RepositoryNameAction
+
+
+ + +
+
-
-
- - -
- +
+ + + + + + \ No newline at end of file From 523f240d9e6e1428de2cedef56b1e25ff0d0bac3 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 12:53:23 +0530 Subject: [PATCH 06/11] Setting Wizard Implementation --- server/app/model/setting-wizard/package.json | 3 +++ server/app/routes/v1.0/routes_setting_wizard.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 server/app/model/setting-wizard/package.json diff --git a/server/app/model/setting-wizard/package.json b/server/app/model/setting-wizard/package.json new file mode 100644 index 000000000..74f37297d --- /dev/null +++ b/server/app/model/setting-wizard/package.json @@ -0,0 +1,3 @@ +{ + "main":"setting-wizard.js" +} \ No newline at end of file diff --git a/server/app/routes/v1.0/routes_setting_wizard.js b/server/app/routes/v1.0/routes_setting_wizard.js index e8b242902..53e300fbc 100644 --- a/server/app/routes/v1.0/routes_setting_wizard.js +++ b/server/app/routes/v1.0/routes_setting_wizard.js @@ -16,7 +16,7 @@ var logger = require('_pr/logger')(module); -var settingWizard = require('_pr/model/settingWizard'); +var settingWizard = require('_pr/model/setting-wizard'); module.exports.setRoutes = function(app, sessionVerificationFunc) { From e6de62a4191d56cd1730106ca99a8567cec4d510 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 15:34:10 +0530 Subject: [PATCH 07/11] Setting Wizard Implementation --- .../private/ajax/Settings/settingsWizard.html | 97 ++++++++++++------- client/htmls/private/js/settingscommon.js | 5 - server/app/routes/v1.0/routes_d4dMasters.js | 3 + 3 files changed, 63 insertions(+), 42 deletions(-) diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html index 09f8236fa..5d8340ec1 100644 --- a/client/htmls/private/ajax/Settings/settingsWizard.html +++ b/client/htmls/private/ajax/Settings/settingsWizard.html @@ -122,18 +122,18 @@

Create Organization

- +
- +
- +
@@ -157,11 +157,11 @@

Create Business Group

- +
-
@@ -171,11 +171,11 @@

Create Business Group

- + -
+ + <!– widget content –>
@@ -195,13 +195,13 @@

Create Project

-
-
@@ -232,7 +232,7 @@

Create Project

-
+--> + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html index 09f8236fa..948edd266 100644 --- a/client/htmls/private/ajax/Settings/settingsWizard.html +++ b/client/htmls/private/ajax/Settings/settingsWizard.html @@ -103,147 +103,49 @@
    -
  • Create Organisation
    • -
  • Create BG
    • -
  • Create Project
    • +
  • Create Organisation
    • +
  • Create BG
    • +
  • Create Project
- -
-
-
+
+ +
+

Create Organization

-
-
-
-
-
-
-
- - -
-
- - -
-
- - - - - -
-
-
-
-
-
-
- - - - - -
-
-
-

Create Business Group

-
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
- - -
- - -
-
-
-

Create Project

-
-
+
+
-
-
- - - +
+
+
- - -
- + +
- - + +
-
- - +
+ + + + +
- -
- - -
- - - - - - - - - - -
RepositoryNameAction
-
-
- - -
-
+
+
+
-
-
- - - - - - +
+
+
+ +
+ +
\ No newline at end of file diff --git a/client/htmls/private/css/wizard.css b/client/htmls/private/css/wizard.css new file mode 100644 index 000000000..0a9a12cbb --- /dev/null +++ b/client/htmls/private/css/wizard.css @@ -0,0 +1,91 @@ +.wizardSetup form { + margin: 10px auto; + position: relative; + } + + /*Hide all except first fieldset*/ + .wizardSetup form:not(:first-of-type) { + display: none; + } + + /*buttons*/ + .wizardSetup form .action-button { + width: 100px; + background: #27AE60; + font-weight: bold; + color: white; + border: 0 none; + border-radius: 1px; + cursor: pointer; + padding: 10px 5px; + margin: 10px 5px; + } + .wizardSetup form .action-button:hover, #msform .action-button:focus { + box-shadow: 0 0 0 2px white, 0 0 0 3px #27AE60; + } + /*headings*/ + .wizardSetup .fs-title { + font-size: 15px; + text-transform: uppercase; + color: #2C3E50; + margin-bottom: 10px; + } + .wizardSetup .fs-subtitle { + font-weight: normal; + font-size: 13px; + color: #666; + margin-bottom: 20px; + } + /*progressbar*/ + #progressbar { + overflow: hidden; + text-align: center; + /*CSS counters to number the steps*/ + counter-reset: step; + margin-top: 5px; + } + #progressbar li { + list-style-type: none; + font-size: 15px; + width: 33.33%; + float: left; + position: relative; + } + #progressbar li:before { + content: counter(step); + counter-increment: step; + width: 20px; + line-height: 20px; + display: block; + font-size: 10px; + color: #fff; + background: #7d7676; + border-radius: 3px; + margin: 0 auto 5px auto; + } + /*progressbar connectors*/ + #progressbar li:after { + content: ''; + width: 100%; + height: 2px; + background: #7d7676; + position: absolute; + left: -50%; + top: 9px; + z-index: -1; /*put it behind the numbers*/ + } + #progressbar li:first-child:after { + /*connector not needed before the first step*/ + content: none; + } + /*marking active/completed steps green*/ + /*The number of the step and the connector before it = green*/ + #progressbar li.active:before, #progressbar li.active:after{ + background: #27AE60; + color: white; + } + + .wizardSetup form .content { + margin:0 auto!important; + padding: 10px; + } \ No newline at end of file From eb6832b92bfba07e3b23b6bbbc313e769e1ad402 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 17:16:12 +0530 Subject: [PATCH 09/11] Changes for setting wizard --- .../private/ajax/Settings/Dashboard.html | 19 +- .../htmls/private/ajax/Settings/bgWizard.html | 1 - .../ajax/Settings/configManagementWizard.html | 281 ++++++++++++++++++ .../private/ajax/Settings/projWizard.html | 6 +- .../private/ajax/Settings/puppetWizard.html | 0 .../private/ajax/Settings/settingsWizard.html | 4 +- .../model/setting-wizard/setting-wizard.js | 31 +- server/app/routes/v1.0/routes_d4dMasters.js | 269 +++++++++++------ .../app/routes/v1.0/routes_setting_wizard.js | 2 +- server/install.js | 11 +- 10 files changed, 500 insertions(+), 124 deletions(-) create mode 100644 client/htmls/private/ajax/Settings/configManagementWizard.html create mode 100644 client/htmls/private/ajax/Settings/puppetWizard.html diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html index 7be89e048..9c8151853 100755 --- a/client/htmls/private/ajax/Settings/Dashboard.html +++ b/client/htmls/private/ajax/Settings/Dashboard.html @@ -92,9 +92,9 @@

1

Org Configuration

-
+
2
-

Chef Configuration

+

Config Management

3
@@ -102,15 +102,11 @@

4
-

Repositories

-
-
- 5
-

Security Access Control

+

Devops Roles

6
-

Telemetry

+

Track

7
@@ -152,11 +148,4 @@

}); $('#orgConfiguration a').trigger('click'); - -/*$('#providerConfiguration a').click(function(e){ - $('a.btn').addClass('active-btn'); - $(this).removeClass('process-btn'); - e.preventDefault(); - $('.contentSetting').load(this.getAttribute('href')); -});*/ \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html index 4a1c7f7e8..af8067a17 100644 --- a/client/htmls/private/ajax/Settings/bgWizard.html +++ b/client/htmls/private/ajax/Settings/bgWizard.html @@ -67,7 +67,6 @@

Create Business Group

var $option = $('').val(data[i].orgname).attr('rowid',data[i].rowid).html(data[i].orgname); $('#orgname').append($option); } - }); diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html new file mode 100644 index 000000000..a678a454d --- /dev/null +++ b/client/htmls/private/ajax/Settings/configManagementWizard.html @@ -0,0 +1,281 @@ + + + + +
    +
  • Chef Server
    • +
  • Puppet Server
    • +
  • Environments
    • +
+ +
+
+
+
+

New Configuration Management

+
+
+
+
+
+ +
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/projWizard.html b/client/htmls/private/ajax/Settings/projWizard.html index b94664243..de918c4fe 100644 --- a/client/htmls/private/ajax/Settings/projWizard.html +++ b/client/htmls/private/ajax/Settings/projWizard.html @@ -36,7 +36,7 @@

Create Project

-
+ -

-
+
@@ -187,21 +187,24 @@

New Configuration Management

+
+ +
-
- -
+ \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/dockerWizard.html b/client/htmls/private/ajax/Settings/dockerWizard.html new file mode 100644 index 000000000..a27b3d964 --- /dev/null +++ b/client/htmls/private/ajax/Settings/dockerWizard.html @@ -0,0 +1,166 @@ +
+
+
+

Create Docker

+
+
+
+
+
+ +
+
+ + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/envWizard.html b/client/htmls/private/ajax/Settings/envWizard.html index 48513682f..11dafed20 100644 --- a/client/htmls/private/ajax/Settings/envWizard.html +++ b/client/htmls/private/ajax/Settings/envWizard.html @@ -5,7 +5,7 @@

Create Environment

-
+
@@ -56,12 +56,13 @@

Create Environment

+
+ +
-
- -
+