From 5658fc4249369ce9cefd7f726d7f3af210e30f01 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/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(-) delete mode 100644 ui/images/bg-what-is-cloudplatform.png diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index e0dce474fc5..3dc01aa2008 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 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 f233095a6bc..a1a68cb774a 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; diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 20b35bded86..203c9daa52e 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -180,8 +180,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/images/bg-what-is-cloudplatform.png b/ui/images/bg-what-is-cloudplatform.png deleted file mode 100644 index 138c63bbaea5efabc8b92b8781b78b6b39c90ae0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32250 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 z zs+I7fU~S>F&hz_Q94v@2QO?Pr5}ja0j&5O?$+E_ zAKN0fvfwJ<2omfJxp-MI>=&!^+l{sd+0DCGCDF+qv{TMnh%zwD8Od4tMZ@b!exFYH zeJbUclC?@is9O_X#+@e{%+4SoP>iUIj5lW7xbq%OHVE4$iqr* z+fy~VM%>R{Bw6b+gCdy$Pbi}q^Ga;{qSC2MS!Vm|P+0hp-?m8mW94UtFa49S=C-ZM z!(q|`zsIVYd-=BvJnzk%M~c&y=Q9pGB3@2ulbsHx$aJ<$=SEZZG~JszKBVb7MKXPk zhq63csN&f+F=;&d_|R{HPD>ui995lM02C}}N!XrIyxepS3?>>NnudqXO|!XhroKJ5~Xd7cgZ!X!?Qhf?%8r6j5h{Kkt%J7mPPZKJ2r>Vw} zDFw4Idgd*uB|bu#I2E(k=Y)!pR6YL>EcJ;xCWjAUVeCp6#oJ_0G|eLX&v7JY-w~dk zoWXA`poZd0)|p?Mmz1pk0^vGW7hAumPnV{4#11-Z_3KK&A5~QJSQt%fS1$>t4+e zN!{*IRojc#O8OBWKR5O_;1_zo702BaYQ@LrC9t2l_w2UjR6Ge&WD5`SOHMV{Fm<#0 zSoXa2EU>X2)%C6Je5S@UQQVqNseP!jwWJE|U@S{2FQ$5Ip@{~{*-={s8Iz%DQ9ctN z3x481FypNm=QFAZj}J^H*>$Y7it%Mjv<&SL&M!z-3t@_09mjd?8TL2z;1%Wb0vhgK zdV-=NV0Iw6;z78=+vFy~4#x*7yfr7Xq|U#Q+frG0goff*FzFdID%krZB)(*cRbdgL z240+B;Xj5UB4;Al|KPGnoB|ahmati3A6P)e!cxv5O_*Abx|sm!ykivfSK1cJDV!k4 zNO&E(GeF7gx>O5SN32Znm`NRQXC5dwx5Y=P z4dD+j4A?kW0;QBmfB*jd;&rSI?B4O}HN+iR%_B#rDts)I=o2%MMW- zUEf}7DMFhwbN&+7WBl3y&({4lRF!!VKKt~nuA2o~5s?5f6|zRpb?);#x^qZppFgz7 zNL|slymCPwhIrwJ?{jh7GcUPs=PsFh$_0Ld*9NJPGR>ZiFhOl)6j)dq($35DEm=jP|vKC7wCD&&r>@u^pdIc;4j_;;^Ovd&nK z3PpKo!US5;Hl5ESmMr>Gm`Rij)O^Df>4%6}cn#)IDA%{}Ok-_w_o{SxSfcikJYrBH z4m2hvMVqz-;E224fq)DoUxkewDGdora*UlRali9ugY+?OyIMS>TMn?McuyyuUSi%SL{2DO_4GP`rl_XnFf7x7nKs%^$hL>+zEYcyw@%jmVIO)HS3OGh!~1!c z>wK^+8iu2h0c&wjewPK9q|W!zZDkC`ypl<$Q4`a1E0V@G9tRvtoi5XC!9giw??r8C zXR97twA`l-){zL>w7IfvM}#X-!c=w`Y_JG_r`f~f1-Nk zt399ur7i6Gj&5(APHH<1y!9|g0jI}|)A`!yF8s-n2i?%#`MRlm3Zlszv-2=qd|Z*8 z=kp`6NvDn6s7z`a1{RT&X<2L&6N=`hoQ*ua)5841=1?Nlljpj^79ep&McsQW@f>+- zlz5b6hg$_ZJv$;X6~^vTliSGC#r=cD@8^R;KO3--JULjWKu4Zp!2|>(wK$=5^%XBK z!jBG|O^uosemRYEGDCCHW6%K7)icCw^jb?bhn)cextvCUWUx1vYXg;Mg}7_C2CNI| zO91ColbA#(M&d*)Zl=Q7`251c3Xpf^`>Xm$(N+o5X>0_H{~^ihhSXMFkOq<&er8rV z%s7<6{6!LVWsyNhQzRs1LtxkPXVQF6ao+wWE< z<*R3n!&|qQ*SD(n6N-1^B>L!yI(d5=AM;___SJ+z7rF7PVC=7nbCchVOE?NDOA7PW zn9XI^*QoPk@t+9@vlKv|sxoq-+Hzy#Vzg%>3tLJQ4E($7j6;#p_I)dkgt-MdZGWOH z%*|`r!9Us-*mX4Ca>W_@IOSTL>mfuMY-F*crOWbT}xss0z@vpERFQ$oYZ ze#0KO-$i1`S$w!oy~2Fk1Ym1vY3Yi!Z&4pc2(2jUfI(f9?%Ylp_e=T`N;1yZP8kz9 zC_RdpvNNB^eQ6<{n$vf@W)fM(a)x8>cSJ)X#cmW5yPRnxsnNBgxpv zrY~lgr763|0x_DIm3lrS?fGuBivm3`Y)7Dmp33r})VZ_-#Vc^3_^hi>-6!osSN*k7In|Y$Bn>S;*Gc`>a_e#s}O;3P>Xdy3b z(2T3z_~ZuK!7!K?UtEQ&;MQ7?j@NjQ(!6niX2FN)hM`Z!Gqb`;K;0aaTaEdFN+1OX zAKaKapH#6W^GBN6P9C(>FX1gdi2_0Xkr=;5>u5|CSu{*wTxFujO4KAU3{o|aI_TI< zHxDgSM3x7Y2TdDNS{|^2#{)$Hot`a9{XVScT>Miz4{3=$Wn4`n+*gT6iol7TMJS#L z-}_Yzo3+je-%1hg(|KMlEWL+5Sq7%iz?f7l7-ArUwz!x^F*|ZY@S>4K-KLr;M z%AYJ#3+6ZdC@{7Qp+-$Rx^9Y4HBM6l{kb&b%+Czd_+n{i%7j~oNP=(cGCb@K&>0i5To1fL^k7&L6_K(=hOLEf@Nb z2#`a5>}|w2A6N;Zv!zOejYI9CFo40oScDUn5D>plVW@2GT}yXdW)@FTQ*!P(&xb)l zfc0dkuWSODHUsx#O6f=l>C}KM80++XJVp(42seO^Z4`x&VGTit)4D*o^)uQR{4o|PI37XJ1x75 zIk8`AUlP1Mt}9W%BQ*^f_p)T;uFIJ;12a@Df}5ETw8BbyeU;9d!s}D(PbAi1oH8l2 z%+FTMI0&e9QLQLKS~&H(4Z?b0(grubi})RGjc+D>Zwi_IF_3BO_;tnHr`}P%2NBZs6hEy`t%ws%&3y& z;oTn8*n{;^_#t<)$EUsv+iT$%beoOwS1cht=j4IE;ox4JpSLfp%F72tI+~jP z`dj#RAYctYMSq5WaCFp^XxNPCuv#kfQMdJwT~$KbcK@z&mtnl-@Amlv@!0s{UC6gD zmD-AUjg~hjB8DQ+;b^366HFC1a3sQ*Amk%bKCf}}mMYzj!K<4bhkJI0@jz(!30pEl zFOvMZ9jmOqK8Yd~oOXcB%8L#w^t@~R|5Mjh1;w=mTOhc*JHy}-+zD=jyGsTbG`PFF z2N)cJOK?qacXtR7JPGdpxSy};y}w;ub$-s?r+4@2wbqFcQmLVY%DckkA>5B+1I+tJ zkG(5An>VQ;=Rc{N$PG~X`pe3!jcOedqsoRBt;Q!l=C97pnk!@y7wJpFmX?-UpZpqq zl#jWRbRxwgQmuG>eI0LPKa$HT(PJF1(?3mQmpfHxEUC^#kU*zRUi3+YUjBRA&N6)_ zAL&c6PgfLr^Y*uCP>ew2{#YNHJB{=-aK-W>1p;KYWuQH2MuBGduJZ{gpyz|cxjE=- zS=mZ9TXIA)Sg%NXv0)`M5f8MH01pp2KI?&B5DrH}g0HGVWt{({7KjuF%l`dbZ2;&* zJuwljBp-qK_=If3haPYK%74~#T(+^b<-roYP8BREqCd#ib#VyXjP7(4B*c;NT_oja6K4RI_S$Cx1ok3(BTC*tC2FSW(x1a<8b=+2DHx>-rHc;X?+o1FE?QX#FF zDUFWDTrjy;v=LUs$`R2J@S;E&2f88g*h^P zA7YHAf~fHEmivzXo;6CM>c2$23cX&&2Kcuis_N!ASu8}EDCa9QxHH>CIHnO91d@b^ zVyl?wZb59LQlFU3%0j_#T_pX>!s={ryJR!VR zPDb>&_~e$p22HQe2Oc#jJYzVM9n+}EKZVPT0XQXO9$b%@aeMdU?4;=+9^X*|gUcTP zq*qp{)Q8NHW92Njl81N{=?Hl43Sbrb4_ALOHbXMQEg~E!{?&t)ogC6J6`~x~tj&{K z=$xHyZS)sZV{8Z`({k}x6lF(JUxj|}q%^Mny1NVDs4V5mq7NG1Q^!x=GyseA9Qll* zDQ|5LujdjLz0diDJ$YhLgSI8R^ye}~tad?I7Ver6>1Xa^XV&p__X6DR3PCTkghY5_ zB5g4(q$?S%!P07hvD3e%ZygU)o?V~)X{lZ&;}2#oQ07++KKn$vSSjn~9v|oP<(@Q` z=689zFRY!}r7uHwU%0LI8w?(W9dtaGpk2v14;Q-(GfDG)e+}R49e z4ZII!A97D!#pZoYrTXr2In~F`4W`gDz6R^xH<;2Y(E4qCqOE`6=3VCwQ~nI1zGt5_ zfw9hUk7`TsJqW6!>RFx*qmdc+>@S>odI3|O#{zi#h#y8fgsuS< z`6nkLRMLNOKF&|jWE}0OnB0lBlV`VM8xLV6<%Z*+zVx<|=fO&QFjZO{q_o4;L;L8s zDw-29P1vOoXsH3Y74NLHU($EgV0PnW2p1Ba>!4*kVyjjE8e*y_DRlBL*^w{A!``vs zivJ6wAXo{~;!w1YCC8&j!hhpVa#(lACQ+gh?wuf^E)h7&#ET1(KFS4=UO~n5i5u%I z+X4Rg4R*AM#YUfS;PP_sH2Uj9ZOZCLG_Ezo6z0>fD-=>0&m#Rv8&om?h;~d zO0Nkhhr?MYsd?qpe)~mqcp36X68xE&(2Mn5Azg`ZE1>xz8w;BCeIF?7vjG-f z&bn4>MKSmR;#{+SZXp1Q`fV(*n%Xt=^K^eMK|wtFvTl${a#HBf1yRmtkSlTu>N3e> zoFaqH+WN|L>P`ogif+oN4f zqgIAopv=U06i%oS6Pl2scr=eUedAd>9UVr~m!euzeIqfv$olB$g6}O$eAZv=ZBg&K zZr8rmu(2t(3A|HX*~B_$A+;t6+WjNhqIN5VQdlZq1b#VCd|BV>{Pz&dMkn?I0zE(o zrczc`o!+}baQg@dK^EO>^`hlSlJB4Tyh+nQhnz<=_`JQU9vuDj_*IZJY)R&TH-MpG;B4Ow$SsYfyip{P2S{k1CU{_uic3n~;5f4*wv+`X-H;{ulmg=E&8_4;v@2|e3=#r zszN(D;kiScTLr`c7l2Cra~4Ry@#AiPHt*Ljn`@;}Ih>fMS=%;=DA^$yX1u$5%Q;&! zZ>8R!ghO-)YsMsRdTj9PbUuvxyY{{YIRfE47$O|z8^}yWTVrmn62v2npSXZam^G!i z5%g}(0}tSaRW1s-O4o-=qmLQm#f>D`ssf_C`!zO>Q|3RQTK_(x)|<*KMoV{vff!w% z{UrY2|7z!cB4glEL@VdFZemuZjk)4-ekhxl=bWW({`&n!`Cq1rtg*tCY6B9=lf;m* z-32(xu^|!Jj-sK4J$ng^Pqf^ZvagbomHf^rL(v4D(&!W86ljoQjuvyfFcq?Cq@euWPSpk2a}V7~3C@rk<;?q!_0j@Q1L3 zOMWa6uM2pvOiC*3E?(RgORXN-#`4e64EGZY_e;g&t8QGf*X#b3RTjk}f;%-JUPv@3 ziheKYeIY#2A|swa>Y4?AfHV8myvR0kl_g-8?k_pr+($kE7G^2KqJ5__scA2oWJG6` zsGAr!E@@5^lv_bBt9fZNfRNK8fA0|CLF_&VD7xtT^Qo54;TKo@H)!FNCem|XQp^JJ zCjd3RYM8Iim?~YrM9D!4Kwwai#urE$O_%Ea?{kuw#AJ!e0kAOdA2+S5JQ(g955;7L z1c$Qm&%{-U7HV>m*}>9Uu!>egdOGWDN`jIWi9U+{62W^n^wZemT8S%uEBrd=GXpi= z>w4_ygyr;iHB`<1(9mN77G2p;QBmI34ZnFq!>sHV#(HYhVsptzshpKrIyrlNTsLD8 zP`>(keS7^Zp>f#fpRoZ_`gjX>lE!Qk!;EkbbWu|hII;_Uec`eh(oM@Uxiv(lUcGK} zLX1$0r}p`?s^#kXc0>qSTuV3OW=LOrd26^4LDP$ju*pW$i=&~upOmhgJ>Jvm)0*9_ zh?+3#o*68joZD!?G<9LE|J{!_{t+;w!1NuJ@`E{KD(mAQ&n~D;z6kb9)q_a8HWcvk zw9%Fe=F0ZXFDxwZBBP{x6FwWAi|*jG`^nX_f|DnDdtCkvCrRc@g_WpEe;<~nTQe%}39qus)vmb5SnZGqi^)o1psf3-6 zBlu>x1lV=B3)xC!u4TcX2KfFas{7f21+7wl{X^+m)W}LZ`m1Dg9!=0!73#eV7b_sc z1Y@l#vt~|XH$Z?QIx}@N#_*g{Nj!>t$2WRJ?KEx#qb5ZXnvp?r^^ZFlK+TH=MWVH{ zuFsc=0E~;BgFb->H5x4&zk)3GPR6EUxIU)%(~rV^9Zk7TF#08#pL`HZKsK6V^XE_Z_cRNCtib0r6$9(&d3&Wa?+4E$6d)QI#J7GO~Ik;IO=(XI#h0 zXpEPg87gk4+O*@Pb>|t=Q2_P|SbCJd#SgddsVn<0cnYm{_z-B9rqD=gzF0I1LVfSZ zI=|6P4D)BOOJ*_?#KPumLR#0?=7h?E(LtaY&Oy} zqm9$3sNb%)fP0N*`ziz-8i1p*K@ulxNWs*C;o#|0cL-J`<#BFa)3i~H;g&stri|X- z-`lP}8D)9xG3M=Kf%aGvQ)KWYSm(rP4DTA=BoDj+qf&f3DZJ|`3e620(Qa#v#~@o7 zkV$p)$SdRMY2sX3#6ylU$M}Mhh1;Pwh5tq)BTuSZ3$REkpW7kzp;>8fa5~<45CnxGizvQ_K|(U+GiuvrR5ZAcBsCuz z3B#WHvBd3j@6WrR?GIIyc$_NF-bcl^)V+^K7>U`zvc}Yf%eN$>UpVbzL5 zFSzAv%XqU7n6c179R#484AOV+;SeYs*#9j>*7p>x>esj7f4AAF@^I#V=6k^L`kSM= z`=6U66$b^+&h+zY{;EVGuknokaAVk0LNEFuA!Bq-x1={8SaSJAdQAih(XDjo{C0dx~e<%3R!tb6UKfYre`QywJ1&MWnHC& zrTvrOAoH)c+6&mKhl~JJfDAXzU;xC%hQ0UUv;_OnFslEf^W~CqE|>+V6kh zt+=@Owb)Q06Nbkp$Tg=eX?AusFvJdtMqKeKj*V#xd>Q`pn2MY;UfKDp83fh+nybHT zR($45)SEJfgB`>RSqyD{VGbnC2|JqI*ItNX zppm~=u69EF^vQh}D8z1`fgqnQTjC}E0LxUA#oB}|qiB}Wf}ayOu&*x=vHLUX!YkvnDOJ;>#N^3s*B$MVH!YLv{i~F z4>?779ZXy{5giq7SsAeumiKUbQ%GTAg;@nOr3&`hgQ*vUahG ziAVw0zIPj+174N`H*J^ur}j{lNr8sQl`C$)nUb{--K`Y?nMXpc^)qSSz<;Shi=n=g zPO~xrRx9~56sz{AzkLk39&qrct>dK$H3x2?O)86k_|{>X{)RGCyUEc3h2swvkzLg% zg9CI@N&8`2X6`%e-wqAKnryQa#PY8U*Vg(*ln~_c-H2u*Km0NQ;pt8fDt~&Zk)30A zqNxrHO%GqKO5}mtxZY>c$sCPF;pP;8P#m`Patb$Nze^I~^XvV{Q0{e2{1>yxSH$7; zCO_LxJo1={Nr4wxYJYOAn-Jlca>m0(t@Rz@dIO$r&swuEZn1{N$4Yz3xJ0-tT&^jA zm=GpkNd5{^6CiWW%%u^F@R`mc4Q5zOwh_9vrZF(sYsSumuf<(~d(g5N9}SN{S@N0h zl`@fh>v3uQB+ zmzkN;3v2K3+n<|+3oP*Q%+ywWZi3lW`##I>4N08Su*JSb2cVBWZ#+CG0bI3L7R+ZU zP@{{nka5$1+Vhd^uUJ##M&DaVJ2oLl9sp2`;H|h zWlN)2C!tK(a6RF7)A>wzY6nZ{y0R!|;hy1PYCkteOP@x3s%pT>XbX;Vh_snN#Zxic zTN5ERjv9L$36e7l8H@R2$G8!Ou?7f>WQ7yT9yl^F+t@XwtLgvsR~nHQ@zeR{&F!_` zA)7efvj|-hJn8NBHq1*+>ukVWT#?SCt7JbESAn>D z*qZ+69FtMAE+%6!kovDpy@C>|hYf8iuxd|)FLiW-h%%EidXyX&%0N45$#od^LMsxK zvh}6w!HSGH%vvaUo~xtW4|qg`Kmqo%pD^vVEg_+5ao0GICeceJnhez>=P!!o!4g>6 z*^W4Xso6)iA)Z0rCX-ka_9?0c*1)Liv{BDsZ+8a;eS(}Zc1{c{ph^5fa=Kpm*yyv! ztVCFwOc;8?mwXF*rA>iDRMcC5)5{ag`8f>vZvHO57%s%itfR+ogZv*JrjOfR=t0PY zU)Tq!Z^1CVEzayM%dnJiJLh8^zhJ+M#F9{wpZ{Gml;ri-%8)NU5p?WCYv5$hqOZ%6 z;zEM8Vub(?@b4o0fePGN=pANMYetju%EpJtVHHaPuDVMv4sKm(Lx4gaKK?UuGLm)z zt_Y;!sC#tWE@Z+U)*iv#9Nt)PBnS%0ymppXj(Qt&GKM;^yQ&K$hCfY@mvbz|(7(4p zibw$sUpeq{tNDS^skN|cSsxnObw6+9-UiFa0AVSpQEm%5YdXWSbaS@MpF*7AiQ<1d z!JJTgeDAz9@Gb1kTW|f+$`H4O&5M93Q#4C|ec8W<5Qu_o zgMfpwPFdT2K>CBd&#kt52hq3Q{7^Q9PArrY8ztgI@>5WbnNpYs{1rjhE_dGAUnkZT zLS@~#kH1&y6O<#|CSB{;NJ64;S&=`=Uec4lKFP^}z9-!Yzt50;;vct&6j_pI`N@aI zfrtS+)A)LF2Z{2Hq;eNd#7yFmDQfuE7;z(|8$48`6stUQ)Zd$p5^T*XMufSsClZZt z!?PtvEfPoPfOF_$a9Pb5`Z{@Rlpy)%xOxvRxs?w05*cY!{|X9)z{HI_9$$K;o{_Ur z+Jt{Zia37&8IF6i@92v4l*++i(P2dL|1{o%ZA+<0yEU6h$oj>HS z_pN@FH+3H(N`%>zvNS%Yw*-sC3OzgeGyV+W_WUPgP97|2FPibrV0qL(|6Hdf8 zjPJG2op!FUZ74@@c7)8zm&4V}j0PC;{pL{p?~U?$>t~!DiXD0*5|9w+bl_n@c>*|* zO!E-yExTH%l003XgHLdaWh(t(Il?;3>^t4C-p0;q=u7n%M%nKZ)uSOzAe!6}- zzV&!sl&;}==zO*-mSs`Vf}Wn!ILPZ24-Tp9nv@1qq)~kx z!(sm8?dAfTa}-tWVkrX|;3Q}S>v26u&boPc=nwPKHaD!2&aZ}pZcKb>-Uo9IDmh1u z>t_aCeb;wbE3u6h`^V!0KGKUsgQl-0Lm3&<63h#Mbs_&#;+sI;hD!rC(iPyQb|b1^YNb1Cj&`I&}F%SNe^ zfNaRTu(co!HCSWjpU7dDL2Cd7j&j+}=O)jl>|F76n>OL1;dLeHlN{UbtFKKe^gg2F z$sej}pYEtQ=i8wI9z7=;g4^01T8H!s^untO672nAC8^vB%wLMX%0KzKC_XAQ@h$fS zpRVN&HO~+EA_v;o`3iTI1v}6Pth){kl(=iSzWO-pTb%8knOyrwj`r4un4F*Y3%G>f z_Z%w5VM6}_j=xTBV1|6{35)%-_Xlh0x!GYh35Arrs9t-oq-bY{<}Ahiuk(&5vfGF3 z;(V^jni`;?;b)g(lmc|r#65b&t7~WRMHg~W8oR4T=GCP&i+-;&4$BGA*SN{BjLpRq z8qZPx5p=ES-+os{(n#XA3vTXsEdo*ASHjIoQJ_k7^rxhM+fO%~ z;O~A=&K|$!c)R4#;oI=}TXSG%`jqu>vi0gJmmqw~8TfV=_~qAC-rWieRp#

6Rt|;YQE1e%KMbwJB{|n{QN_tAjp(pwv^M=mz@ZMV5XiD&g0zZ zwAeAfte3kT@~z-ehrn|GvmLtH@XT@s_J z8mDSyU|@hoeC=IdF~^`irnHREctFLWE$G=xrf!oCFEp03-M5&tJ1L;M3r}viH2T-4 zX|J?2^wyHXquhv7J@l|lbHus4=Q}>!yO0kHJK8N7`;DWfrsl?L^^guvgVc0 zge~3*Z2!CZ?n5kMm>3WC2sivIH7#nd#8Fw;^ayvzd~UZ?s08YVoI82%o~wvyJeMk4UYpw2~!NFb(zPl{8 zJ?D_0x5R-5uG=p{%1^M5e?Zpg#GJGA| zmtP1lxz9ox?<3t_pOq%jCo`p1vpA zc+$XtWn<45#7@SlBWRU-d|(#Dws_i|XK^NslQfJFvEn{{aI(@oUVQ)G*>l|2T_mnV zohhK>u~Cr?;%9{C5|q{U-D{$$9tB*&@ZR3ujIOKPGr!m_s<%J7-Ie_1Sq3&~9f2-B z2c7XnU0H`=mSdRYepf+sxMmPHIF+YHD#2J>X7aD}XmS>TT+%sc@?%?;fjHkuGA49W zO6L`!Essb@yGNYrOixD_yXilX1Fx)7QB0~O{jHY^%ksPrrcN@xeBqG&<)oL;Cs~;J zy{eXjQq1RC0e~)BAG4xjpNDD#JN<`!Y3c-LT`n1W$ujE@=~#X&koNul{)KwlHjA@_ zVU=-ZzlXR9W56B-=nXR;{Z2M121Z6<_31KZ&uY#l>@OlJ4$17=n3M5kl>mp~5sDrj z!^Xq!Qd6$W!dEqAMc7f zg%t^?_K3iMl$B4!T=qsBX?hBMf<&loY&Q-K?nuHyT3P%jzpe+WNs&4j`sbp|<&7Rn zW^ZSXK3bK6I|A=hbMLmjJvCK8^N95X7hz|73ok=tUz)72-x;H(A0IlSF~naKH-7~p z&mF(5Y%fRcK(G8C>w}oGy^@k#@;vOeEv$bWf-Li(^D%~)28If$_vevf_>tFhKPlE* z4R_+SU~l`2{s=b3ePz*Eu{?jkoij6|(U(|5wd<)m@o++3GpGv0KuMKa62B zw1>B^QF6iLD=SQJ9sGVw^d9&PGiCO4ese`Iw=u}O}1(+WAM61 z=>7OyGbd>Al$&lN`*mqt$&r=j(i*qIn{~J?*x@+wsC^A=HX3_ zkpVE!=1E*+{qy7fu=sa=tKjpd?tg(@K7KvZ1gKO^5`=jyUk3EgW$(49u_X1BBuCQp zp5ANBP<`u1X9?2x9z9GFTEXtB0=6hr&@)@f$>K3~7K@>{XoILN1%bt)H}WQ86>im& z+583jwD=ZNzDC;ZdK^Wey>4xMI#Oo9n>oJfV{UChmHyjLg@h-Lo z-p#Ekaj+@J$3F}Na8HY0fIXKREJ=iv5@i#`DmW}V)M0Z}x!cKEC2TyMHK1-;?-ovS zbgwY>iVT<+%nXy(ie zn;PvhM^Mp8!H6w=f?z2@S{t~0zrBZwl|R4Xg-7#CN)7sGLn_qThy0l-fpFO-AT5L?) z=jDCB*wGv%vSk<^{u9Odr_Z7yIL!Uix6lqo*5$pc_6`d%Q>jYXba@)3twwo!`iI=x zPAyW0;Ar#$-6HE4)oIDG2Rn@=ph9;xh!oM$B3%mv+;7MbgYKI5yK_q~)QsCzZ_)1i z7U$g$Fsd`{NXtRl2#jhKg6~69K7A!B=B>xF$lcpZqLSUa-dSn@$GD_r%_ zA0CIANh^2V$as;Qtg%(S??i%*FU7!u4IvpENDDUf$xN876E1}iv8 zCcMI)Q}K;DzkRU|-Pcz+s`X!tj4MKb!q{E^VnMV%%^DK z&O;b4`^s}F*!pn^XfzTjgBZU`$iSC74gsGZ+@>{U);xkTUl=KkR=i7QBJ=yCmvTdB zWGm$_MN&~!WKsJ@jM+;dd5bWRdxc*E}DXA`e=LG{b^c)|dtzdR~g(iMg7+7(~>Qpz>7nZj!> zeXmjWPZJSomvB^qgIG?lox%dr1~ zh&((??Pf+Mh}J&Ckijv0DE@di`)xYMyY^w_L){W~T+Th}B>TTZaN@ep|hrXL&6h<&7zr6=Rsk~Y?JbJK+yB=N6)wZlAl-7XxKqa24tJs$D2zfc8ZLs z+_c?KQPD3okeh^{n;r^NnwVD97Pi{PL^-M3T{iQ`XmI{$*h+D)k?XhPfl%3hD;FgZ zhOt`#XYuv(ROGfo28k?W9ehgXNcn~@k0TXwhm?Q(Ud1(P*{PE!c0EoIvVE=X5I8xG z?(3fhqEkNs<4;5K>i*mmrW0Ot*Aiu3pTTMpK^W?jcBo-}abAm(#hr+kBgB70Q3p zVrl%vJVM<~HUXHCbJ0X37V8*0s9Cdvx&I*E_p4ZL(v|94%jllk3jEbq;XO)ZfW6mK zL9u)vX8}LHtUSS9#`0cCBihX93Gw$;U;Rqf`lLxPZh@5~3Id4V77f$U3>kRskSQ7E zGq1LdpxqysaRKcqkA}ljDDYB=$oNE3aT`*yzU5{VaQIu8p67CTDp&kXH=wvTII|-z zaKotC6yo5PAiY8O$(iZP`W=5*+MriUO1RPws-E!x6gm4 z{;muVz(W}&VI`Op26F>LvSM7!G!s=smNHQKVETrw=5-1LDD3Q?pYEpeHk-uO=bnvL zW3w?Q_2zMqrslrXNo#1P0f`?}V0BK~}_sQYD!rLg?PHDA0%1(ib_=cCHNv(KxG z`!{tM9ui>EN&m{^YMZt|ojK>gGm$C!phdkzCP(ojZAhQ+mu@ynQUA3?#hxl4XrpLX z>gad;DU#HqI-{A+$2Pl&5}{v#cg7d7?~ncCXEJ53a~sYzI*m_dP`v~x47JRzuIl?{ zp@d3YEX=FEkrV#>&|8B{&-i>&(`rN;J@N!|0&k>H`!pe|TjQn-kO6)lH~pPYrV|*h zZ5n&Twew^>ji?A@PnHi!y<2d-I#34U4dsQ7hSi^q?7JkYZE<(h{(A}gAyft6)ss7M zQi>G-HsdWLVbb9JnXxtImWW4nBlfiMh9dIdH9JwUo=^awJxY9BJl8j%mi}O93 z0Ya~oOCXO34?v=(G#-g;$Z;x-)Z8L(CW!bc0g1}~rK!FB0Z{Ep5Di}i4Faa5vUx#9 zrMe>x!U^=J7rFQ{+r#wkh8Rcw)Htz048JeYhCas!rzjLA5w&kHZ_JO?7%Dx_orncV z|CV-z?QwGA42&P2q3fqki3>lB_-IU8dmov#4Orzf3-aZJ?< z5VlqQRxI+qAH4%|Z;$63vk?(ga(y^XOxp=Ts4CpfFS%`EzysFt8=88BR7neUqO>`M zf<#H`*`U?Gp@CgQD_NLSgUnj`PBqNmDpG66!x02!KI0i@%jW&u*9v!GNFJb6|Nag^}?&PGz- ziF>=ZX!&JxIAx&gZdL8;^~!GI(|~${J7YT}iWX(lzyOZz@I{I(GH`^~-)x5d8S`F2 zq%6t;2Z0ay5(WSKv-CL{?e)BLn_;;qBZ!)WDV|QEDGlJLN$SmXO*3med#S<=1P@TEgvJQ2ck!hi(Q8zFTWNUtVJ%a|P540erE8nKr9fS~(*y^>6lN zGELo>1YP!J2X3rHzsZQTXePpyDc)@;OgyWKsCE>WW=mV*Krb^u_MWZ>-)7P*Z@K9i zU(1_WOk(8tQz{CKP&T4ck^(lOjMz^TzfU$N!OEZMgJoTf@2%=RM3!X|hUI0z z7v_fa1}J|zJc^jq(ajJTIJ+XX{=m@m@w`rjF@9O9Qp#lEH~YLTf-Krb=R~pMnS-5o zrIYOe=9C@@_FRrd6UO{Gtg^B>e1+L2=tM5yQR__oOZZD^KziEYhKq4xE*IrbHy_Im z6XDLwO|lzVX9wb*=I8zDQ0tzn(jT}yAl+m`Cw5HdI=0`08=-`w&b`8fE_V3uHa=_X zeYE8WP*aJ6{TfD$LkjuBcVzAQcc=gPY4lSz+yL*8#cjiCAII7$1ZaHE=9!AhaxMdzJ?1An_u5oO zn|7=WP1J9Sm90O@tcz;aY{Gzc1Gx1DaEN<64uO5*_nJ~IIX7=)NbqD}Bt*0ysl@w> zrRJz^53HbhC(yjx^yrpN`2ze0k!l7 zwn_4_E?B4?qb5vh$I|Z3DF;)Kv0ZNLmkS^SNFUstfduKIMTDXCw4Satf#U07QHz6|!;HMW zFzap~AA~M}BIU^zZ7qSRqTkKFBp#-s?deo!lJP>oveD|d4Q)g>$AX&~^jh$PIAf483%DH~YOX=oqCQ1;ZJhpx{sWYh(9s zRyxFboe-xln-qqtp(>7#U^m$H|14E1R*jnM|3K7AJ@&}u3N;(lD5Y>-|8)Fs66JdR z#Y+R4$A{q5&HTnPpJ|7Cm4?s{IQTfPR5k$_LUdj85zD^1Tfn5~%4``WL5jEFJ56PK zyb4CS=@P6w%G>gq`XSq3679Ft`2u?-^q4#2bw68({R9=&BkqZ)O38R{E6tL?7Utuf zNa2otSWv!b(tgG@3bx4uJrrA#P|*7)M`I;O5o+Pv|KTsH%GC$@@B$#UJ~bEIV8Hhd z!;*<6+Z%m^PUH=ETY&!$X@Far6xHgPbgy{O{scC+Ha+9y=gNVXiX9&ws+D}1Iko0 zGR(}y;o?SL(8qs9Jnd%QwVg*kRs3ZQ*e6CGl8|O&Eh{1f&Lgl?ewrtUhGrI=AK?jS^vu#C;MnvpBX16?d>L# z$c2$kYxzfE*3e!v`#ul-tQ(-&*A2BKo{EX`Ura$)*0GHExlr`q%qTX=5v59q8(89 z?UVVwvEFxhzo;G;KwZ}okM4Rf600vakgxX71{2@o&@WUvi`|fXU+?byQnY*=!&=y3 zvpTDWVJgO^PZf6`_3ms56~ezm7ZccKpjk_Q)9EXS5}y@(8-n;M~7s z+^wIl3780npJhDyrxtIRgR=K@gL}aZu9L-5_v3?Dzaxbt#pXPAemsZY(|LgmbMOG& zO!c!4U$F9!f@fmaRVI`u=6_m+eVJ;A8iFf!F^>e23|WD8t|(b>%Kq%b(d3)g*QZkc zVT^s!3=wsI<%|@ z`E-;fci8STjAaJnS~PBDD(T7n5heYkOdSm1mbqMf>TUp-8oZT^OjZ^pYoVUd|7vA1 zdO-)K=1L?FF`evcvi0&^&RRC{M6-z=HF<_F)*`OC7og%z6>(v#jEw?{cfy z#fNyD7#Y}mtX88vSXx;wuA&`dnPl6c`HVRHLCz%yP*4Hq90~`G-+b0!?ZS7n zqJhSVm`RFt5_@d73~zC+l{s-qQXGfAv)B=f-Cd1vzl?JscX2`!&C>v)i_W7V&y*pF zcGtCLDS!#|q~l{Qy%&UYm$J9(Dae|$1)MTkb@Mn+q$W%$OY6d0`D>w(DS(Ce3F8)a z+HB(o%p@_$)>iWKkMl_@bXjG(iNv7Za*{Z-Zt>a;7qRz' - }); - }, - whatIsAZone: function(args) { args.response.success({ text: 'message.installWizard.copy.whatIsAZone' diff --git a/ui/scripts/ui-custom/installWizard.js b/ui/scripts/ui-custom/installWizard.js index 96d9d5c5d94..923e4637275 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 = $('

').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 = $('
').addClass('intro'); var $title = $('
').addClass('title') - .html(checkTitle(title)); + .html(title); var $subtitle = $('
').addClass('subtitle') - .html(checkTitle(subtitle)); + .html(subtitle); var $copy = getCopy(copyID, $('

')); var $prev = elems.prevButton(_l('label.back')); var $continue = elems.nextButton('OK'); @@ -218,8 +205,8 @@ tooltip: function(title, content) { return $('
').addClass('tooltip-info').append( $('
').addClass('arrow'), - $('
').addClass('title').html(checkTitle(_l(title))), - $('
').addClass('content').append($('

').html(checkTitle(_l(content)))) + $('

').addClass('title').html(_l(title)), + $('
').addClass('content').append($('

').html(_l(content))) ); }, @@ -230,8 +217,8 @@ return $('

').addClass('header') .append( $.merge( - $('

').html(checkTitle(_l('label.installWizard.title'))), - $('

').html(checkTitle(_l('label.installWizard.subtitle'))) + $('

').html(_l('label.installWizard.title')), + $('

').html(_l('label.installWizard.subtitle')) ) ); }, @@ -311,36 +298,13 @@ * Layout/behavior for each step in wizard */ var steps = { - eula: function(args) { - var $intro = $('
').addClass('intro eula'); - 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')); - - $continue.click(function() { - goTo('intro'); - - return false; - }); - - return $intro.append($title, $subtitle, - $copy, - $continue); - }, - intro: function(args) { - 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 $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')); var $copy = getCopy('whatIsCloudStack', $('

')); 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('');