OFBiz › OFBiz - Commits

svn commit: r1042250 - in /ofbiz/trunk: framework/common/config/ framework/common/script/org/ofbiz/common/ framework/common/webcommon/ framework/common/webcommon/WEB-INF/ framework/common/widget/ specialpurpose/myportal/script/org/ofbiz/myportal/ speci...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
buscob
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1042250 - in /ofbiz/trunk: framework/common/config/ framework/common/script/org/ofbiz/common/ framework/common/webcommon/ framework/common/webcommon/WEB-INF/ framework/common/widget/ specialpurpose/myportal/script/org/ofbiz/myportal/ speci...

buscob
Author: buscob
Date: Sat Dec  4 22:29:33 2010
New Revision: 1042250

URL: http://svn.apache.org/viewvc?rev=1042250&view=rev
Log:
Reverted revision 1042196 as suggested by Adam.
This change introduces framework dependencies from applications.
More work is needed to the patch in https://issues.apache.org/jira/browse/OFBIZ-4037 before committing again.

Added:
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/RegisterPerson.ftl
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/widget/RegisterPerson.ftl
    ofbiz/trunk/specialpurpose/myportal/widget/login.ftl
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/widget/login.ftl
    ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaCode.ftl
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaCode.ftl
    ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaImage.ftl
      - copied unchanged from r1042195, ofbiz/trunk/specialpurpose/myportal/widget/reloadCaptchaImage.ftl
Removed:
    ofbiz/trunk/framework/common/script/org/ofbiz/common/RegisterEvents.xml
    ofbiz/trunk/framework/common/webcommon/registerPerson.ftl
    ofbiz/trunk/framework/common/webcommon/reloadCaptchaCode.ftl
    ofbiz/trunk/framework/common/webcommon/reloadCaptchaImage.ftl
    ofbiz/trunk/framework/common/widget/RegisterScreens.xml
Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/config/general.properties
    ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl
    ofbiz/trunk/framework/common/webcommon/login.ftl
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sat Dec  4 22:29:33 2010
@@ -1108,14 +1108,6 @@
         <value xml:lang="zh">无法找到</value>
         <value xml:lang="zh_TW">無法找到</value>
     </property>
-    <property key="CommonCaptchaMissingError">
-        <value xml:lang="en">Verify code captcha is missing or wrong</value>
-        <value xml:lang="fr">Vérifier le code captcha, il est absent ou erroné</value>
-        <value xml:lang="it">Verifica il codice captcha, è mancante o errato</value>
-        <value xml:lang="th">รหัสตัวเลขที่ท่านกรอกมีข้อผิดพลาด</value>
-        <value xml:lang="zh">缺少验证码或验证码错误</value>
-        <value xml:lang="zh_TW">沒有驗證碼或是錯誤</value>
-    </property>
     <property key="CommonChange">
         <value xml:lang="ar">تغيير</value>
         <value xml:lang="de">Verändern</value>
@@ -2869,25 +2861,6 @@
         <value xml:lang="zh">第一个</value>
         <value xml:lang="zh_TW">第一個</value>
     </property>
-    <property key="CommonFirstName">
-        <value xml:lang="cs">Jméno</value>
-        <value xml:lang="de">Vorname</value>
-        <value xml:lang="en">First name</value>
-        <value xml:lang="en_GB">Forename</value>
-        <value xml:lang="es">Nombre</value>
-        <value xml:lang="fr">Prénom</value>
-        <value xml:lang="hi_IN">पहला नाम</value>
-        <value xml:lang="it">Nome</value>
-        <value xml:lang="ja">First name</value>
-        <value xml:lang="nl">Voornaam</value>
-        <value xml:lang="pt_BR">Nome</value>
-        <value xml:lang="pt_PT">Primeiro Nome</value>
-        <value xml:lang="ro">Nume </value>
-        <value xml:lang="ru">Имя</value>
-        <value xml:lang="th">ชื่อ</value>
-        <value xml:lang="zh">名字</value>
-        <value xml:lang="zh_TW">名字</value>
-    </property>
     <property key="CommonFollowingErrorsOccurred">
         <value xml:lang="ar">الأخطاء التالية حدثت</value>
         <value xml:lang="de">Folgende Fehler sind aufgetreten</value>
@@ -3890,25 +3863,6 @@
         <value xml:lang="zh">最近的</value>
         <value xml:lang="zh_TW">最近的</value>
     </property>
-    <property key="CommonLastName">
-        <value xml:lang="cs">Příjmení</value>
-        <value xml:lang="de">Nachname</value>
-        <value xml:lang="en">Last name</value>
-        <value xml:lang="en_GB">Surname</value>
-        <value xml:lang="es">Apellidos</value>
-        <value xml:lang="fr">Nom</value>
-        <value xml:lang="hi_IN">अन्त नाम</value>
-        <value xml:lang="it">Cognome</value>
-        <value xml:lang="ja">Last name</value>
-        <value xml:lang="nl">Familienaam</value>
-        <value xml:lang="pt_BR">Segundo nome</value>
-        <value xml:lang="pt_PT">Apelido</value>
-        <value xml:lang="ro">Nume de Familie</value>
-        <value xml:lang="ru">Фамилия</value>
-        <value xml:lang="th">นามสกุล</value>
-        <value xml:lang="zh">姓氏</value>
-        <value xml:lang="zh_TW">姓氏</value>
-    </property>
     <property key="CommonLastSytemNotes">
         <value xml:lang="en">Last system notes</value>
         <value xml:lang="fr">Dernières tâches affectées</value>
@@ -4415,21 +4369,6 @@
         <value xml:lang="zh_CN">方法</value>
         <value xml:lang="zh_TW">方法</value>
     </property>
-    <property key="CommonMiddleName">
-        <value xml:lang="de">Zweiter Vorname</value>
-        <value xml:lang="en">Middle Name</value>
-        <value xml:lang="es">Segundo nombre</value>
-        <value xml:lang="fr">Nom intermédiaire</value>
-        <value xml:lang="hi_IN">मध्य नाम</value>
-        <value xml:lang="it">Nome centrale</value>
-        <value xml:lang="nl">Tussenvoegsel</value>
-        <value xml:lang="pt_BR">Nome do meio</value>
-        <value xml:lang="ro">Nume Central</value>
-        <value xml:lang="ru">Отчество</value>
-        <value xml:lang="th">ชื่อกลาง</value>
-        <value xml:lang="zh">中间名</value>
-        <value xml:lang="zh_TW">中間名</value>
-    </property>
     <property key="CommonMilliSecond">
         <value xml:lang="de">Millisekunde</value>
         <value xml:lang="en">Millisecond</value>
@@ -4779,13 +4718,6 @@
         <value xml:lang="en">New Portal Page</value>
         <value xml:lang="it">Nuova pagina portale</value>
     </property>
-    <property key="CommonNewRegistration">
-        <value xml:lang="en">New Registration </value>
-        <value xml:lang="fr">Nouvel enregistrement</value>
-        <value xml:lang="it">Nuovo utente</value>
-        <value xml:lang="th">ลงทะเบียน </value>
-        <value xml:lang="zh">新注册</value>
-    </property>
     <property key="CommonNewSelection">
         <value xml:lang="ar">إختيار جديد</value>
         <value xml:lang="de">Neue Auswahl</value>
@@ -5669,10 +5601,6 @@
         <value xml:lang="zh">请修改你的密码</value>
         <value xml:lang="zh_TW">請修改你的密碼</value>
     </property>
-    <property key="CommonPasswordVerify">
-        <value xml:lang="en">Confirm Password</value>
-        <value xml:lang="it">Conferma password</value>
-    </property>
     <property key="CommonPaymentMethodType">
         <value xml:lang="ar">نوع طريقة التسديد</value>
         <value xml:lang="de">Zahlungsmethode Typ</value>
@@ -6386,13 +6314,6 @@
         <value xml:lang="zh_CN">刷新</value>
         <value xml:lang="zh_TW">更新</value>
     </property>
-    <property key="CommonRegisterComplete">
-        <value xml:lang="en">Register of new person is complete...Please </value>
-        <value xml:lang="fr">L'enregistrement de la nouvelle personne est complet...SVP</value>
-        <value xml:lang="it">Creazione nuovo utente completata...prego </value>
-        <value xml:lang="th">การลงทะเบียนใหม่สำหรับบุคคลได้ทำการเสร็จสิ้นสมบูรณ์แล้ว...สามารถเข้าสู่ระบบได้ </value>
-        <value xml:lang="zh">完成新人员注册...请</value>
-    </property>
     <property key="CommonRegistered">
         <value xml:lang="ar">مستخدم مسجل</value>
         <value xml:lang="cs">Registrovaný uživatel</value>
@@ -6449,11 +6370,6 @@
         <value xml:lang="zh">发布版本</value>
         <value xml:lang="zh_TW">發佈版本</value>
     </property>
-    <property key="CommonReloadImage">
-        <value xml:lang="en">reload image</value>
-        <value xml:lang="it">Ricarica immagine</value>
-        <value xml:lang="zh">刷新图片</value>
-    </property>
     <property key="CommonRemove">
         <value xml:lang="ar">نزع</value>
         <value xml:lang="cs">Odstranit</value>
@@ -8686,13 +8602,6 @@
         <value xml:lang="zh_CN">值</value>
         <value xml:lang="zh_TW">數值</value>
     </property>
-    <property key="CommonVerifyCaptcha">
-        <value xml:lang="en">Verify code</value>
-        <value xml:lang="fr">Vérifier le code captcha</value>
-        <value xml:lang="it">Verifica codice</value>
-        <value xml:lang="th">ใส่รหัสตามรูป</value>
-        <value xml:lang="zh">验证验证码</value>
-    </property>
     <property key="CommonView">
         <value xml:lang="ar">مشهد</value>
         <value xml:lang="cs">Náhled</value>
@@ -8977,10 +8886,6 @@
         <value xml:lang="zh_CN">哪里</value>
         <value xml:lang="zh_TW">哪里</value>
     </property>
-    <property key="CommonWhyRegister">
-        <value xml:lang="en">Why would you like to register?</value>
-        <value xml:lang="it">Perche' desideri registrarti?</value>
-    </property>
     <property key="CommonWidth">
         <value xml:lang="ar">العرض</value>
         <value xml:lang="de">Breite</value>

Modified: ofbiz/trunk/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/general.properties (original)
+++ ofbiz/trunk/framework/common/config/general.properties Sat Dec  4 22:29:33 2010
@@ -130,8 +130,3 @@ http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJ
 
 # -- Y if you want to display the multi-tenant textbox in the login page
 multitenant=N
-
-# -- Y if you want new users be allowed to register online
-login.newRegistration.allow=Y
-# -- Y if you want that a captcha image check field is used when registering new users
-login.newRegistration.useCaptcha=Y

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Sat Dec  4 22:29:33 2010
@@ -95,25 +95,6 @@ under the License.
         <response name="success" type="view" value="forgotPassword"/>
         <response name="error" type="view" value="forgotPassword"/>
     </request-map>
-    <request-map uri="newRegisterLogin">
-        <security https="true" auth="false"/>
-        <event type="java" invoke="getCodeCaptcha" path="org.ofbiz.common.Captcha"/>
-        <response name="success" type="view" value="newRegisterLogin"/>
-    </request-map>
-    <request-map uri="createRegister">
-        <security https="true" auth="false"/>
-        <event type="simple" invoke="createRegister" path="component://common/script/org/ofbiz/common/RegisterEvents.xml"/>
-        <response name="error" type="view" value="newRegisterLogin"/>
-        <response name="resultPage" type="view" value="newRegisterLogin"/>
-    </request-map>
-    <request-map uri="reloadCaptchaImage">
-        <security https="true" auth="false"/>        
-        <response name="success" type="view" value="reloadCaptchaImage"/>
-    </request-map>
-    <request-map uri="reloadCaptchaCode">
-        <security https="true" auth="false"/>
-        <response name="success" type="view" value="reloadCaptchaCode"/>
-    </request-map>
     <request-map uri="view">
         <security https="false" auth="false"/>
         <response name="success" type="request" value="main"/>
@@ -253,9 +234,6 @@ under the License.
     <view-map name="login" type="screen" page="component://common/widget/CommonScreens.xml#login"/>
     <view-map name="requirePasswordChange" type="screen" page="component://common/widget/CommonScreens.xml#requirePasswordChange"/>
     <view-map name="forgotPassword" type="screen" page="component://common/widget/CommonScreens.xml#forgotPassword"/>
-    <view-map name="newRegisterLogin" type="screen" page="component://common/widget/RegisterScreens.xml#newRegisterLogin"/>  
-    <view-map name="reloadCaptchaImage" type="screen" page="component://common/widget/RegisterScreens.xml#reloadCaptchaImage"/>
-    <view-map name="reloadCaptchaCode" type="screen" page="component://common/widget/RegisterScreens.xml#reloadCaptchaCode"/>
     <view-map name="EventMessages" type="screen" page="component://common/widget/CommonScreens.xml#EventMessages"/>
 
     <view-map name="ListLocales" type="screen" page="component://common/widget/LookupScreens.xml#ListLocales"/>

Modified: ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl Sat Dec  4 22:29:33 2010
@@ -31,11 +31,11 @@ under the License.
           </tr>
           <tr>
             <td colspan="2" align="center">
-              <input type="submit" name="GET_PASSWORD_HINT" value="${uiLabelMap.CommonGetPasswordHint}"/>&nbsp;<input type="submit" name="EMAIL_PASSWORD" value="${uiLabelMap.CommonEmailPassword}"/>
+              <input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}"/>&nbsp;<input type="submit" name="EMAIL_PASSWORD" class="smallSubmit" value="${uiLabelMap.CommonEmailPassword}"/>
             </td>
           </tr>
         </table>
-        <a href='<@ofbizUrl>authview</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
+        <a href='<@ofbizUrl>authview</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
         <input type="hidden" name="JavaScriptEnabled" value="N"/>
       </form>
     </div>

Modified: ofbiz/trunk/framework/common/webcommon/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/login.ftl?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/login.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/login.ftl Sat Dec  4 22:29:33 2010
@@ -19,7 +19,6 @@ under the License.
 
 <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
 <#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
-<#assign allowNewRegistration = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "login.newRegistration.allow")>
 
 <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
 <#if username != "">
@@ -27,6 +26,7 @@ under the License.
 <#else>
   <#assign focusName = true>
 </#if>
+<center>
   <div class="screenlet login-screenlet">
     <div class="screenlet-title-bar">
       <h3>${uiLabelMap.CommonRegistered}</h3>
@@ -59,16 +59,12 @@ under the License.
           </tr>
         </table>
         <input type="hidden" name="JavaScriptEnabled" value="N"/>
-        <br/>
-        <center>
-          <a href="<@ofbizUrl>forgotPassword</@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a>
-          <#if ("Y" == allowNewRegistration)>
-            &nbsp;&nbsp;&nbsp;&nbsp;<a href="<@ofbizUrl>newRegisterLogin</@ofbizUrl>">${uiLabelMap.CommonNewRegistration}</a>
-          </#if>
-        </center>
+        <br />
+        <a href="<@ofbizUrl>forgotPassword</@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a>
       </form>
     </div>
   </div>
+</center>
 
 <script language="JavaScript" type="text/javascript">
   document.loginform.JavaScriptEnabled.value = "Y";

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Sat Dec  4 22:29:33 2010
@@ -36,6 +36,25 @@
         <security https="true" auth="true"/>
         <response name="success" type="request" value="showPortalPage"/>
     </request-map>
+    <request-map uri="newRegisterLogin">
+        <security https="true" auth="false"/>
+        <event type="java" invoke="getCodeCaptcha" path="org.ofbiz.common.Captcha"/>
+        <response name="success" type="view" value="newRegisterLogin"/>
+    </request-map>
+    <request-map uri="createRegister">
+        <security https="true" auth="false"/>
+        <event type="simple" invoke="createRegister" path="component://myportal/script/org/ofbiz/myportal/Events.xml"/>
+        <response name="error" type="view" value="newRegisterLogin"/>
+        <response name="resultPage" type="view" value="newRegisterLogin"/>
+    </request-map>
+    <request-map uri="reloadCaptchaImage">
+        <security https="true" auth="false"/>        
+        <response name="success" type="view" value="reloadCaptchaImage"/>
+    </request-map>
+    <request-map uri="reloadCaptchaCode">
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="reloadCaptchaCode"/>
+    </request-map>
 
     <request-map uri="LookupUserLoginAndPartyDetails">
         <security https="true" auth="true"/>
@@ -43,6 +62,10 @@
     </request-map>
     
     <view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
+    <view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/>
+    <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>  
+    <view-map name="reloadCaptchaImage" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaImage"/>
+    <view-map name="reloadCaptchaCode" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaCode"/>
 
     <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
 

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1042250&r1=1042249&r2=1042250&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sat Dec  4 22:29:33 2010
@@ -120,6 +120,65 @@ under the License.
         </section>
     </screen>
     
+    <screen name="login">
+        <section>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific>
+                            <html><html-template location="component://myportal/widget/login.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <!--New Register Person-->
+    <screen name="newRegisterLogin">
+        <section>
+            <actions>
+                <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <not><if-empty field="parameters.partyId"/></not>
+                            </condition>
+                            <actions>
+                                <set field="partyId" from-field="parameters.partyId"/>
+                            </actions>
+                            <widgets>
+                                <label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"/>
+                                <screenlet title="${uiLabelMap.PartyPersonalInformation}">
+                                    <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <screenlet title="${uiLabelMap.MyPortalNewRegistration}">
+                                    <section>
+                                        <actions>
+                                            <set field="fileName" from-field="parameters.fileName"/>
+                                            <set field="idKey" from-field="parameters.ID_KEY"/>
+                                        </actions>
+                                        <widgets>
+                                            <!--<include-form name="RegisterPerson" location="component://myportal/widget/MyPortalForms.xml"/>  -->
+                                            <platform-specific>
+                                                <html><html-template location="component://myportal/widget/RegisterPerson.ftl"/></html>
+                                            </platform-specific>
+                                        </widgets>
+                                    </section>
+                                </screenlet>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="CommonRequestDecorator">
         <section>
             <widgets>
@@ -143,6 +202,27 @@ under the License.
         </section>
     </screen>
     
+    <screen name="reloadCaptchaImage">
+        <section>
+            <actions>
+                <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://myportal/widget/reloadCaptchaImage.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="reloadCaptchaCode">
+        <section>
+            <actions>
+                <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://myportal/widget/reloadCaptchaCode.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
     <screen name="CommonOpportunityDecorator">
         <section>
             <actions>


Free forum by Nabble Edit this page