From 7d7c3eb6da1031db8314ff084e76f6fdef73f09d Mon Sep 17 00:00:00 2001 From: John Kinsella Date: Sun, 16 Dec 2012 20:39:03 -0800 Subject: [PATCH] CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references Tried to remove any references to license agreements, EULA, Citrix, or CloudPlatform. Tested through devcloud, didn't see decreased UI functionality. --- .../classes/resources/messages.properties | 2 - .../resources/messages_fr_FR.properties | 2 - .../classes/resources/messages_ja.properties | 2 - .../resources/messages_pt_BR.properties | 2 - .../resources/messages_ru_RU.properties | 2 - .../resources/messages_zh_CN.properties | 2 - docs/README.txt | 2 +- ui/css/cloudstack3.css | 41 ------------- ui/dictionary.jsp | 2 - ui/scripts/cloudStack.js | 27 ++------ ui/scripts/installWizard.js | 7 --- ui/scripts/ui-custom/installWizard.js | 61 ++++--------------- 12 files changed, 19 insertions(+), 133 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index b40fce4e28b..862434daec5 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -292,8 +292,6 @@ label.installWizard.subtitle=This tour will aid you in setting up your CloudStac label.continue=Continue label.installWizard.title=Hello and Welcome to CloudStack™ label.agree=Agree -label.license.agreement=License Agreement -label.license.agreement.subtitle=Please accept the CloudStack™ EULA before installing. label.manage.resources=Manage Resources label.port.forwarding.policies=Port forwarding policies label.load.balancing.policies=Load balancing policies diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties index 3710d25a916..4ba3c725892 100644 --- a/client/WEB-INF/classes/resources/messages_fr_FR.properties +++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties @@ -292,8 +292,6 @@ label.installWizard.subtitle=Ce tutorial vous aidera label.continue=Continuer label.installWizard.title=Bonjour et bienvenue dans CloudStack label.agree=Accepter -label.license.agreement=Accord de licence -label.license.agreement.subtitle=Merci d\'accepter l\'EULA CloudStack avant d\'installer. label.manage.resources=Grer les ressources label.port.forwarding.policies=Rgles de transfert de port label.load.balancing.policies=Rgles de rpartition de charge diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index ec785f6f83e..7555b83dd78 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -295,8 +295,6 @@ label.installWizard.subtitle=このガイド ツアーは CloudStack™ 環 label.continue=続行 label.installWizard.title=CloudStack™ へようこそ label.agree=同意する -label.license.agreement=ライセンス契約 -label.license.agreement.subtitle=インストールの前に CloudStack™ エンド ユーザー ライセンス契約に同意してください。 label.manage.resources=リソースの管理 label.port.forwarding.policies=ポート転送ポリシー label.load.balancing.policies=負荷分散ポリシー diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties index 2b6a5d3ce45..3bc435b9717 100644 --- a/client/WEB-INF/classes/resources/messages_pt_BR.properties +++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties @@ -292,8 +292,6 @@ label.installWizard.subtitle=Este tour vai auxiliar voc label.continue=Continuar label.installWizard.title=Ol, seja bem vindo ao CloudStack&\#8482 label.agree=Concordo -label.license.agreement=Acordo de Licena -label.license.agreement.subtitle=Por favor aceite a EULA do CloudStack&\#8482 antes de instalar. label.manage.resources=Gerenciar Recursos label.port.forwarding.policies=Polticas de redirecionamento de portas label.load.balancing.policies=Polticas de balanceamento de carga diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties index 0c6b962d1cf..dd7e7460744 100644 --- a/client/WEB-INF/classes/resources/messages_ru_RU.properties +++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties @@ -292,8 +292,6 @@ label.installWizard.subtitle=Это руководство настроит ва label.continue=Продолжить label.installWizard.title=Здравствуйте и добро пожаловать в CloudStack\! label.agree=Согласен -label.license.agreement=Лицензионное соглашение -label.license.agreement.subtitle=Для продолжения установки согласитесь с лицензионным соглашением. label.manage.resources=Управление ресурсами label.port.forwarding.policies=Политики проброса портов label.load.balancing.policies=Политики балансировки нагрузки diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index f86601773cb..62160d98488 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -295,8 +295,6 @@ label.installWizard.subtitle=此教程将帮助您设置 CloudStack™ 安装 label.continue=继续 label.installWizard.title=您好，欢迎使用 CloudStack™ label.agree=同意 -label.license.agreement=许可协议 -label.license.agreement.subtitle=必须先接受 CloudStack™ EULA 才能进行安装。 label.manage.resources=管理资源 label.port.forwarding.policies=端口转发策略 label.load.balancing.policies=负载平衡策略 diff --git a/docs/README.txt b/docs/README.txt index 7f096e4b117..e327fb9101c 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -201,7 +201,7 @@ TAGS FOR A SECTION
Text of the section title Here's the text of a paragraph in this section. - Always use &PRODUCT; rather than typing CloudStack or CloudPlatform. + Always use &PRODUCT; rather than typing CloudStack. Indent with 4 spaces, not with tab characters. To hyperlink to a URL outside this document: Display text of the link here To hyperlink to another section in this document: diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index fd970c41f61..766a52619a0 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -616,44 +616,12 @@ div.list-view div.toolbar div.section-switcher div.section-select label { position: absolute; } -/*** EULA*/ -.install-wizard .eula-copy { - width: 688px; - height: 480px; - background: #FFFFFF; - border: 1px solid #BCBCBC; - /*+box-shadow:0px 4px 10px #B9B9B9;*/ - -moz-box-shadow: 0px 4px 10px #B9B9B9; - -webkit-box-shadow: 0px 4px 10px #B9B9B9; - -o-box-shadow: 0px 4px 10px #B9B9B9; - box-shadow: 0px 4px 10px #B9B9B9; - padding: 5px; - /*+border-radius:4px;*/ - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - border-radius: 4px 4px 4px 4px; - overflow: auto; - overflow-x: hidden; -} - -.install-wizard .eula-copy p { - font-size: 12px; - margin-top: 21px; -} - /*** Intro*/ .install-wizard .step.intro.what-is-cloudstack p { background: url(../images/bg-what-is-cloudstack.png) no-repeat 50% 237px; 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; @@ -1794,15 +1762,6 @@ div.detail-group.actions td { cursor: pointer; } -#header div.logo { - width: 170px; - height: 47px; - position: relative; - float: left; - margin: 4px 0 0 19px; - background: url(../images/logo-cloudplatform.png) no-repeat 0 center; -} - #header.nologo div.logo { width: 170px; height: 47px; diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 9457e30af79..a3759544b41 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -160,8 +160,6 @@ dictionary = { 'label.installWizard.subtitle': '', 'label.installWizard.title': '', 'label.agree': '', -'label.license.agreement.subtitle': '', -'label.license.agreement': '', 'label.port.forwarding.policies': '', 'label.load.balancing.policies': '', 'label.networking.and.security': '', diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 1d2dbe8f438..ed504c84af7 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -372,22 +372,21 @@ response: { success: function(args) { if (args.doInstall && isAdmin()) { - var initInstallWizard = function(eulaHTML) { + var initInstallWizard = function() { cloudStack.uiCustom.installWizard({ $container: $container, context: context, - eula: eulaHTML, complete: function() { // Show cloudStack main UI - $container.cloudStack($.extend(cloudStackArgs, { hasLogo: loginArgs.eula })); + $container.cloudStack($.extend(cloudStackArgs, { hasLogo: false })); } }); }; - initInstallWizard(loginArgs.eula); + initInstallWizard(); } else { // Show cloudStack main UI - $container.cloudStack($.extend(cloudStackArgs, { hasLogo: loginArgs.eula })); + $container.cloudStack($.extend(cloudStackArgs, { hasLogo: false })); } } } @@ -402,22 +401,8 @@ } }; - // EULA check - $.ajax({ - url: 'eula.' + g_lang + '.html', - dataType: 'html', - success: function(html) { - document.title = 'CloudPlatform'; - cloudStack.uiCustom.login($.extend(loginArgs, { eula: html, hasLogo: true })); - }, - error: function() { - document.title = 'CloudStack'; - cloudStack.uiCustom.login(loginArgs); - }, - beforeSend : function(XMLHttpResponse) { - return true; - } - }); + document.title = 'CloudStack'; + cloudStack.uiCustom.login(loginArgs); // Localization cloudStack.localizationFn = function(str) { diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js index ce136d7dc13..dff12a0c0b7 100644 --- a/ui/scripts/installWizard.js +++ b/ui/scripts/installWizard.js @@ -207,13 +207,6 @@ }); }, - // EULA - eula: function(args) { - args.response.success({ - text: '