You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/09/05 15:56:46 UTC
svn commit: r1866478 [2/2] - in /ofbiz/ofbiz-framework/trunk: ./
applications/securityext/config/
applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/
applications/securityext/template/email/ framework/common/config/
framework/com...
Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl?rev=1866478&r1=1866477&r2=1866478&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl Thu Sep 5 15:56:46 2019
@@ -31,6 +31,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="loginform">
<input type="hidden" name="requirePasswordChange" value="Y"/>
<input type="hidden" name="USERNAME" value="${username}"/>
+ <input type="hidden" name="TOKEN" value="${parameters.TOKEN!}"/>
<input type="hidden" name="userTenantId" value="${tenantId}"/>
<input type="hidden" name="forgotPwdFlag" value="${parameters.forgotPwdFlag!}" />
<table cellspacing="0">
Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ForgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ForgotPassword.ftl?rev=1866478&r1=1866477&r2=1866478&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ForgotPassword.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ForgotPassword.ftl Thu Sep 5 15:56:46 2019
@@ -16,32 +16,80 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<div id="loginBar"><span>${uiLabelMap.CommonForgotYourPassword}?</span><div id="company-logo"></div></div>
+<#if securityQuestion??>
+ <#assign messageTitle = uiLabelMap.AnswerSecurityQuestion>
+<#else>
+ <#assign messageTitle = uiLabelMap.CommonForgotYourPassword>
+</#if>
+<#if ! userLoginId??>
+ <#assign userLoginId = requestParameters.USERNAME!>
+ <#if ! userLoginId?? && autoUserLogin??>
+ <#assign userLoginId = autoUserLogin.userLoginId>
+ </#if>
+</#if>
+<div id="loginBar"><span>${messageTitle}</span><div id="company-logo"></div></div>
<center>
- <div class="screenlet login-screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
+ <div class="screenlet login-screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${messageTitle}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>" name="forgotpassword">
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td class="label">${uiLabelMap.CommonUsername}</td>
+ <td><input type="text" size="20" name="USERNAME" value="${userLoginId!}"/></td>
+ </tr>
+ <#if securityQuestion?has_content>
+ <tr>
+ <td class="label">${uiLabelMap.SecurityQuestion}</td>
+ <td>
+ ${securityQuestion.description!}
+ <input type="hidden" name="securityQuestion" value="${securityQuestion.enumId!}" />
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.SecurityAnswer}</td>
+ <td>
+ <input type="text" name="securityAnswer" class="" value="" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}"/>
+ </td>
+ </tr>
+ <#elseif requestParameters.token??>
+ <input type="hidden" name="token" value="${requestParameters.token}"/>
+ <tr>
+ <td class="label">${uiLabelMap.CommonNewPassword}</td>
+ <td><input type="password" name="newPassword" autocomplete="off" value="" size="20"/></td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.CommonNewPasswordVerify}</td>
+ <td><input type="password" name="newPasswordVerify" autocomplete="off" value="" size="20"/></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonContinue}"/>
+ </td>
+ </tr>
+ <#else>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}" />
+ <input type="submit" name="EMAIL_PASSWORD" class="smallSubmit" value="${uiLabelMap.CommonEmailPassword}" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <a href='#' class="buttontext" onclick="window.history.back();">${uiLabelMap.CommonGoBack}</a>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ <input type="hidden" name="JavaScriptEnabled" value="N" />
+ </form>
+ </div>
</div>
- <div class="screenlet-body">
- <form method="post" action="<@o...@ofbizUrl>" name="getSecurityQuestion">
- <table class="basic-table" cellspacing="0">
- <tr>
- <td class="label">${uiLabelMap.CommonUsername}</td>
- <td><input type="text" size="20" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/></td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonContinue}"/>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <a href='<@o...@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
- </td>
- </tr>
- </table>
- <input type="hidden" name="JavaScriptEnabled" value="N"/>
- </form>
- </div>
- </div>
-</center>
+</center>
\ No newline at end of file
Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl?rev=1866478&r1=1866477&r2=1866478&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl Thu Sep 5 15:56:46 2019
@@ -61,7 +61,7 @@ under the License.
</table>
<input type="hidden" name="JavaScriptEnabled" value="N"/>
<br />
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a>
</form>
</div>
</div>
Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1866478&r1=1866477&r2=1866478&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Thu Sep 5 15:56:46 2019
@@ -50,7 +50,6 @@ under the License.
<property name="VT_NAV_TMPLT_LOC" value="component://rainbowstone/template/includes/TopAppBar.ftl"/>
<property name="VT_CHPWD_TMPLT_LOC" value="component://rainbowstone/template/ChangePassword.ftl"/>
<property name="VT_FGPWD_TMPLT_LOC" value="component://rainbowstone/template/ForgotPassword.ftl"/>
- <property name="VT_GSQUE_TMPLT_LOC" value="component://rainbowstone/template/GetSecurityQuestion.ftl"/>
<property name="VT_LOGIN_TMPLT_LOC" value="component://rainbowstone/template/Login.ftl"/>
<!--javascript lib-->
<property name="VT_HDR_JAVASCRIPT['add']" value="/rainbowstone/js/less.min.js"/>