diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 5e44099e12e..2957897b3ce 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -557,6 +557,11 @@ body.login { height: 540px; } +.install-wizard .step.intro.what-is-cloudplatform p { + background: url(../images/bg-what-is-cloudplatform.png) no-repeat 50% 237px; + height: 540px; +} + /*** Diagram*/ .install-wizard .diagram { width: 910px; @@ -7990,7 +7995,7 @@ div.panel.ui-dialog div.list-view div.fixed-header { .project-selector .button.cancel { color: #808080; - background: url("../images/gradients.png") repeat scroll 0 -480px #B6B6B6; + background: #B6B6B6 url("../images/gradients.png") repeat 0 -480px; border: 1px solid #AAAAAA; border-radius: 4px 4px 4px 4px; font-size: 13px; @@ -8000,19 +8005,18 @@ div.panel.ui-dialog div.list-view div.fixed-header { color: #838181; /*+placement:shift 488px 9px;*/ position: relative; + left: 488px; + top: 9px; left: 170px; top: -8px; margin: 19px 0 0 0px; width: 54px; - } .project-selector .button.cancel:hover { color: #3A3A3A; - } - /*** Resource management*/ .project-dashboard .resources { } diff --git a/ui/images/bg-what-is-cloudplatform.png b/ui/images/bg-what-is-cloudplatform.png new file mode 100644 index 00000000000..138c63bbaea Binary files /dev/null and b/ui/images/bg-what-is-cloudplatform.png differ diff --git a/ui/images/bg-what-is-cloudstack.png b/ui/images/bg-what-is-cloudstack.png index d6153ac5569..e03a9723402 100644 Binary files a/ui/images/bg-what-is-cloudstack.png and b/ui/images/bg-what-is-cloudstack.png differ diff --git a/ui/scripts/ui-custom/installWizard.js b/ui/scripts/ui-custom/installWizard.js index 4dcad5a7d6a..ee2fcd86a73 100644 --- a/ui/scripts/ui-custom/installWizard.js +++ b/ui/scripts/ui-custom/installWizard.js @@ -20,6 +20,18 @@ var launchStart; // Holds last launch callback, in case of error var $launchState; + // Checking if title should be ‘CloudStack’ or ‘CloudPlatform’ – replacing occurrences thereby + var checkTitle = function(str) { + // Getting the flag that indicates if EULA is present + if (eulaHTML && eulaHTML.length) { return str.replace(/CloudStack/ig,'CloudPlatform'); } + else { return str; } + } + + /* var data = $("p"); + $(data).each(function() { + $(this).html(checkTitle($(this).html())); + }); +*/ /** * Successful installation action */ @@ -39,7 +51,7 @@ cloudStack.installWizard.copy[id]({ response: { success: function(args) { - $elem.append(_l(args.text)); + $elem.append(checkTitle(_l(args.text))); } } }); @@ -87,9 +99,9 @@ var $intro = $('
').addClass('intro'); var $title = $('').addClass('title') - .html(title); + .html(checkTitle(title)); var $subtitle = $('').addClass('subtitle') - .html(subtitle); + .html(checkTitle(subtitle)); var $copy = getCopy(copyID, $('')); var $prev = elems.prevButton(_l('label.back')); var $continue = elems.nextButton('OK'); @@ -202,8 +214,8 @@ tooltip: function(title, content) { return $('').html(_l(content))) + $('
').html(checkTitle(_l(content)))) ); }, @@ -214,8 +226,8 @@ return $('
').addClass('header') .append( $.merge( - $('').html(_l('label.installWizard.title')), - $('').html(_l('label.installWizard.subtitle')) + $('').html(checkTitle(_l('label.installWizard.title'))), + $('').html(checkTitle(_l('label.installWizard.subtitle'))) ) ); }, @@ -297,8 +309,8 @@ var steps = { eula: function(args) { var $intro = $('').addClass('intro eula'); - var $title = $('').addClass('title').html(_l('label.license.agreement')); - var $subtitle = $('').addClass('subtitle').html(_l('label.license.agreement.subtitle')); + var $title = $('').addClass('title').html(checkTitle(_l('label.license.agreement'))); + var $subtitle = $('').addClass('subtitle').html(checkTitle(_l('label.license.agreement.subtitle'))); var $copy = $('').addClass('eula-copy').html(eulaHTML); var $continue = elems.nextButton(_l('label.agree')); @@ -314,12 +326,17 @@ }, intro: function(args) { - var $intro = $('').addClass('intro what-is-cloudstack'); - var $title = $('').addClass('title').html(_l('label.what.is.cloudstack')); - var $subtitle = $('').addClass('subtitle').html(_l('label.introduction.to.cloudstack')); + if (eulaHTML && eulaHTML.length){ + var $intro = $('').addClass('intro what-is-cloudplatform'); } + else { + var $intro = $('').addClass('intro what-is-cloudstack'); + + } + var $title = $('').addClass('title').html(checkTitle(_l('label.what.is.cloudstack'))); + var $subtitle = $('').addClass('subtitle').html(checkTitle(_l('label.introduction.to.cloudstack'))); var $copy = getCopy('whatIsCloudStack', $('')); var $continue = elems.nextButton(_l('label.continue.basic.install')); - var $advanced = elems.nextButton(_l('label.skip.guide')).addClass('advanced-installation'); + var $advanced = elems.nextButton(checkTitle(_l('label.skip.guide'))).addClass('advanced-installation'); $continue.click(function() { goTo('changeUser'); @@ -792,6 +809,7 @@ var initialStep = eulaHTML ? steps.eula().addClass('step') : steps.intro().addClass('step'); + showDiagram(''); $('html body').addClass('install-wizard'); @@ -801,7 +819,9 @@ elems.body().append(initialStep), $diagramParts ).appendTo($container); - }; + + + }; cloudStack.uiCustom.installWizard = installWizard; }(jQuery, cloudStack));