svn commit: r1728026 - in /ofbiz/trunk/framework/common: data/CommonTypeData.xml widget/CommonScreens.xml
Locked
 
|
Author: nmalin
Date: Tue Feb 2 00:08:55 2016 New Revision: 1728026 URL: http://svn.apache.org/viewvc?rev=1728026&view=rev Log: Add new template location : VT_LOGIN_TMPLT_LOC for the login VT_CHPWD_TMPLT_LOC for the changePassword VT_FGPWD_TMPLT_LOC for the forgetPassword VT_GSQUE_TMPLT_LOC for the getSecurityQuestion Related issue OFBIZ-6868. The origin requirement came from issue OFBIZ-6843 with proposition to adding new theme with dedicate template for these previous element Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=1728026&r1=1728025&r2=1728026&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Tue Feb 2 00:08:55 2016 @@ -109,6 +109,10 @@ under the License. <Enumeration enumId="VT_FORM_MACRO_LIB" description="Theme Form Macro Library Location" enumTypeId="VT_RES_TYPE" sequenceId="18"/> <Enumeration enumId="VT_TREE_MACRO_LIB" description="Theme Tree Macro Library Location" enumTypeId="VT_RES_TYPE" sequenceId="19"/> <Enumeration enumId="VT_MENU_MACRO_LIB" description="Theme Menu Macro Library Location" enumTypeId="VT_RES_TYPE" sequenceId="20"/> + <Enumeration enumId="VT_LOGIN_TMPLT_LOC" description="Login Template Location" enumTypeId="VT_RES_TYPE" sequenceId="21"/> + <Enumeration enumId="VT_CHPWD_TMPLT_LOC" description="Change Password Template Location" enumTypeId="VT_RES_TYPE" sequenceId="22"/> + <Enumeration enumId="VT_FGPWD_TMPLT_LOC" description="Forget Password Template Location" enumTypeId="VT_RES_TYPE" sequenceId="23"/> + <Enumeration enumId="VT_GSQUE_TMPLT_LOC" description="Security Question Template Location" enumTypeId="VT_RES_TYPE" sequenceId="24"/> <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/> <VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1728026&r1=1728025&r2=1728026&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Feb 2 00:08:55 2016 @@ -551,8 +551,14 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <section> + <actions> + <set field="loginTemplateLocation" from-field="layoutSettings.VT_LOGIN_TMPLT_LOC[0]" default-value="component://common/webcommon/login.ftl"/> + </actions> + <widgets /> + </section> <platform-specific> - <html><html-template location="component://common/webcommon/login.ftl"/></html> + <html><html-template location="${loginTemplateLocation}"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -587,8 +593,14 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <section> + <actions> + <set field="changePasswordTemplateLocation" from-field="layoutSettings.VT_CHPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/changePassword.ftl"/> + </actions> + <widgets /> + </section> <platform-specific> - <html><html-template location="component://common/webcommon/changePassword.ftl"/></html> + <html><html-template location="${changePasswordTemplateLocation}"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -601,8 +613,14 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <section> + <actions> + <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/forgotPassword.ftl"/> + </actions> + <widgets /> + </section> <platform-specific> - <html><html-template location="component://common/webcommon/forgotPassword.ftl"/></html> + <html><html-template location="${forgotPasswordTemplateLocation}"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -625,22 +643,34 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <section> + <actions> + <set field="getSecurityQuestionTemplateLocation" from-field="layoutSettings.VT_GSQUE_TMPLT_LOC[0]" default-value="component://common/webcommon/getSecurityQuestion.ftl"/> + </actions> + <widgets /> + </section> <platform-specific> - <html><html-template location="component://common/webcommon/getSecurityQuestion.ftl"/></html> + <html><html-template location="${getSecurityQuestionTemplateLocation}"/></html> </platform-specific> </decorator-section> </decorator-screen> </widgets> </section> </screen> - + <screen name="forgotPassword"> <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://common/webcommon/forgotPassword.ftl"/></html> + <section> + <actions> + <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/forgotPassword.ftl"/> + </actions> + <widgets /> + </section> + <platform-specific> + <html><html-template location="${forgotPasswordTemplateLocation}"/></html> </platform-specific> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |