You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jl...@apache.org on 2012/12/17 05:39:44 UTC
git commit: CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform
references
Updated Branches:
refs/heads/master 0661f9b81 -> 5658fc424
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5658fc42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5658fc42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5658fc42
Branch: refs/heads/master
Commit: 5658fc4249369ce9cefd7f726d7f3af210e30f01
Parents: 0661f9b
Author: John Kinsella <jl...@stratosec.co>
Authored: Sun Dec 16 20:39:03 2012 -0800
Committer: John Kinsella <jl...@stratosec.co>
Committed: Sun Dec 16 20:39:03 2012 -0800
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 2 -
.../classes/resources/messages_fr_FR.properties | 2 -
.../classes/resources/messages_ja.properties | 2 -
.../classes/resources/messages_pt_BR.properties | 2 -
.../classes/resources/messages_ru_RU.properties | 2 -
.../classes/resources/messages_zh_CN.properties | 2 -
docs/README.txt | 2 +-
ui/css/cloudstack3.css | 41 ----------
ui/dictionary.jsp | 2 -
ui/images/bg-what-is-cloudplatform.png | Bin 32250 -> 0 bytes
ui/scripts/cloudStack.js | 27 ++-----
ui/scripts/installWizard.js | 7 --
ui/scripts/ui-custom/installWizard.js | 61 +++------------
13 files changed, 19 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index e0dce47..3dc01aa 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -316,8 +316,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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 3710d25..4ba3c72 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=G�rer les ressources
label.port.forwarding.policies=R�gles de transfert de port
label.load.balancing.policies=R�gles de r�partition de charge
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages_ja.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index ec785f6..7555b83 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=負荷分散ポリシー
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index 2b6a5d3..3bc435b 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 Licen�a
-label.license.agreement.subtitle=Por favor aceite a EULA do CloudStack&\#8482 antes de instalar.
label.manage.resources=Gerenciar Recursos
label.port.forwarding.policies=Pol�ticas de redirecionamento de portas
label.load.balancing.policies=Pol�ticas de balanceamento de carga
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages_ru_RU.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index 0c6b962..dd7e746 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=Политики балансировки нагрузки
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index f866017..62160d9 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=负载平衡策略
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/docs/README.txt
----------------------------------------------------------------------
diff --git a/docs/README.txt b/docs/README.txt
index 7f096e4..e327fb9 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -201,7 +201,7 @@ TAGS FOR A SECTION
<section id="INSERT A UNIQUE SECTION ID HERE, PROBABLY MATCHING THE TITLE BELOW. KEEP THE QUOTE MARKS.">
<title>Text of the section title</title>
<para>Here's the text of a paragraph in this section.</para>
- <para>Always use &PRODUCT; rather than typing CloudStack or CloudPlatform.</para>
+ <para>Always use &PRODUCT; rather than typing CloudStack.</para>
<para>Indent with 4 spaces, not with tab characters.</para>
<para>To hyperlink to a URL outside this document: <ulink url="http://external URL here">Display text of the link here</ulink></para>
<para>To hyperlink to another section in this document: <xref linkend="SECTION ID OF THE OTHER SECTION GOES HERE." />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index f233095..a1a68cb 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -656,44 +656,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;
@@ -2072,15 +2040,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;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 20b35bd..203c9da 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -180,8 +180,6 @@ dictionary = {
'label.installWizard.subtitle': '<fmt:message key="label.installWizard.subtitle"/>',
'label.installWizard.title': '<fmt:message key="label.installWizard.title"/>',
'label.agree': '<fmt:message key="label.agree"/>',
-'label.license.agreement.subtitle': '<fmt:message key="label.license.agreement.subtitle"/>',
-'label.license.agreement': '<fmt:message key="label.license.agreement"/>',
'label.port.forwarding.policies': '<fmt:message key="label.port.forwarding.policies"/>',
'label.load.balancing.policies': '<fmt:message key="label.load.balancing.policies"/>',
'label.networking.and.security': '<fmt:message key="label.networking.and.security"/>',
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/images/bg-what-is-cloudplatform.png
----------------------------------------------------------------------
diff --git a/ui/images/bg-what-is-cloudplatform.png b/ui/images/bg-what-is-cloudplatform.png
deleted file mode 100644
index 138c63b..0000000
Binary files a/ui/images/bg-what-is-cloudplatform.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 8fda244..fab6f7d 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -401,22 +401,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 }));
}
}
}
@@ -431,22 +430,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) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/scripts/installWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index ce136d7..dff12a0 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -207,13 +207,6 @@
});
},
- // EULA
- eula: function(args) {
- args.response.success({
- text: '<iframe src="eula.html" />'
- });
- },
-
whatIsAZone: function(args) {
args.response.success({
text: 'message.installWizard.copy.whatIsAZone'
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5658fc42/ui/scripts/ui-custom/installWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/installWizard.js b/ui/scripts/ui-custom/installWizard.js
index 96d9d5c..923e463 100644
--- a/ui/scripts/ui-custom/installWizard.js
+++ b/ui/scripts/ui-custom/installWizard.js
@@ -19,23 +19,10 @@
var context = args.context;
var $installWizard = $('<div>').addClass('install-wizard');
var $container = args.$container;
- var eulaHTML = args.eula;
var state = {}; // Hold wizard form state
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
*/
@@ -55,7 +42,7 @@
cloudStack.installWizard.copy[id]({
response: {
success: function(args) {
- $elem.append(checkTitle(_l(args.text)));
+ $elem.append(_l(args.text));
}
}
});
@@ -103,9 +90,9 @@
var $intro = $('<div></div>').addClass('intro');
var $title = $('<div></div>').addClass('title')
- .html(checkTitle(title));
+ .html(title);
var $subtitle = $('<div></div>').addClass('subtitle')
- .html(checkTitle(subtitle));
+ .html(subtitle);
var $copy = getCopy(copyID, $('<p></p>'));
var $prev = elems.prevButton(_l('label.back'));
var $continue = elems.nextButton('OK');
@@ -218,8 +205,8 @@
tooltip: function(title, content) {
return $('<div>').addClass('tooltip-info').append(
$('<div>').addClass('arrow'),
- $('<div>').addClass('title').html(checkTitle(_l(title))),
- $('<div>').addClass('content').append($('<p>').html(checkTitle(_l(content))))
+ $('<div>').addClass('title').html(_l(title)),
+ $('<div>').addClass('content').append($('<p>').html(_l(content)))
);
},
@@ -230,8 +217,8 @@
return $('<div></div>').addClass('header')
.append(
$.merge(
- $('<h2></h2>').html(checkTitle(_l('label.installWizard.title'))),
- $('<h3></h3>').html(checkTitle(_l('label.installWizard.subtitle')))
+ $('<h2></h2>').html(_l('label.installWizard.title')),
+ $('<h3></h3>').html(_l('label.installWizard.subtitle'))
)
);
},
@@ -311,36 +298,13 @@
* Layout/behavior for each step in wizard
*/
var steps = {
- eula: function(args) {
- var $intro = $('<div></div>').addClass('intro eula');
- var $title = $('<div></div>').addClass('title').html(checkTitle(_l('label.license.agreement')));
- var $subtitle = $('<div></div>').addClass('subtitle').html(checkTitle(_l('label.license.agreement.subtitle')));
- var $copy = $('<div></div>').addClass('eula-copy').html(eulaHTML);
- var $continue = elems.nextButton(_l('label.agree'));
-
- $continue.click(function() {
- goTo('intro');
-
- return false;
- });
-
- return $intro.append($title, $subtitle,
- $copy,
- $continue);
- },
-
intro: function(args) {
- if (eulaHTML && eulaHTML.length){
- var $intro = $('<div></div>').addClass('intro what-is-cloudplatform'); }
- else {
- var $intro = $('<div></div>').addClass('intro what-is-cloudstack');
-
- }
- var $title = $('<div></div>').addClass('title').html(checkTitle(_l('label.what.is.cloudstack')));
- var $subtitle = $('<div></div>').addClass('subtitle').html(checkTitle(_l('label.introduction.to.cloudstack')));
+ var $intro = $('<div></div>').addClass('intro what-is-cloudstack');
+ var $title = $('<div></div>').addClass('title').html(_l('label.what.is.cloudstack'));
+ var $subtitle = $('<div></div>').addClass('subtitle').html(_l('label.introduction.to.cloudstack'));
var $copy = getCopy('whatIsCloudStack', $('<p></p>'));
var $continue = elems.nextButton(_l('label.continue.basic.install'));
- var $advanced = elems.nextButton(checkTitle(_l('label.skip.guide'))).addClass('advanced-installation');
+ var $advanced = elems.nextButton(_l('label.skip.guide')).addClass('advanced-installation');
$continue.click(function() {
goTo('changeUser');
@@ -811,8 +775,7 @@
}
};
- var initialStep = eulaHTML ?
- steps.eula().addClass('step') : steps.intro().addClass('step');
+ var initialStep = steps.intro().addClass('step');
showDiagram('');