From 5a674a149929db342190d23c92ba2729d0553ff1 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Tue, 20 Sep 2016 17:26:19 +0530 Subject: [PATCH 01/10] CHanges for setting wizard --- .../private/ajax/Settings/Dashboard.html | 15 ++++++--- .../ajax/Settings/configManagementWizard.html | 25 ++++++++++++--- .../private/ajax/Settings/providerWizard.html | 24 +++++++++++--- .../private/ajax/Settings/settingsWizard.html | 31 +++++++++++++++---- client/htmls/private/css/wizardBg.css | 19 ++++++++++++ 5 files changed, 94 insertions(+), 20 deletions(-) create mode 100644 client/htmls/private/css/wizardBg.css diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html index bcefc338e..7109d0bb9 100755 --- a/client/htmls/private/ajax/Settings/Dashboard.html +++ b/client/htmls/private/ajax/Settings/Dashboard.html @@ -148,17 +148,21 @@
3

Provider Configuration

+
+
+ 4
+

Gallery Setup

- 4
+ 5

Devops Roles

- 5
+ 6

Track

- 6
+ 7

CMDB Configuration

@@ -250,8 +254,9 @@
$('#startConfig a, #orgConfiguration a,#configManagement a').addClass('green-btn').removeClass('process-btn'); $('#configManagement a').trigger('click'); } else if (data.previousStep.name === 'Config Management') { - $('#configManagement a').removeClass('active-btn process-btn').addClass('green-btn'); - $('#startConfig a,#orgConfiguration a').addClass('green-btn'); + + $('#startConfig a,#orgConfiguration a,#configManagement a').removeClass('active-btn process-btn').addClass('green-btn'); + //$('').addClass('green-btn'); $('#providerConfiguration a').trigger('click'); } else if (data.previousStep.name === 'Provider Configuration') { $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').removeClass('active-btn process-btn').addClass('green-btn'); diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html index 64b02cccd..c4e8794c5 100644 --- a/client/htmls/private/ajax/Settings/configManagementWizard.html +++ b/client/htmls/private/ajax/Settings/configManagementWizard.html @@ -1,3 +1,4 @@ + - +
    +
  1. 1 + Create Providers +
    2. +
  2. 2 + Create VmImages + +
    3. +
@@ -372,6 +378,16 @@

Create Providers

\ 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 8ea272037..794bf4de7 100644 --- a/client/htmls/private/ajax/Settings/bgWizard.html +++ b/client/htmls/private/ajax/Settings/bgWizard.html @@ -15,7 +15,7 @@

Create Business Group

@@ -24,7 +24,7 @@

Create Business Group

- +
@@ -35,20 +35,27 @@

Create Business Group

var current_fs, next_fs, previous_fs; //fieldsets var left, opacity, scale; //fieldset properties which we will animate var animating; //flag to prevent quick multi-click glitches - + $('.providerSelect').removeClass('hidden'); - $.get('/d4dMasters/readmasterjsonnew/1',function(data){ - $("#orgDropdown").empty(); - for(var i=0;i').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname); - $('#orgDropdown').append($option); - } - orgNameForSetup = $('#orgDropdown option:last').attr('rowid'); - orgIdForSetup = $('#orgDropdown option:last').val(); - $('#orgDropdown option:last').attr('selected','selected') - var $optionSelect = $('').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname); + $('#orgDropdown').append($option); + } + orgNameForSetup = $('#orgDropdown option:last').attr('rowid'); + orgIdForSetup = $('#orgDropdown option:last').val(); + lastDropdownValue = $('#orgDropdown option:selected').val(); + $('#orgDropdown option:last').attr('selected','selected') + var $optionSelect = $('