svn commit: r945061 - in /ofbiz/trunk/framework/common/webcommon: WEB-INF/common-controller.xml forgotPassword.ftl

Author: jleroux
Date: Mon May 17 10:19:18 2010
New Revision: 945061

URL: http://svn.apache.org/viewvc?rev=945061&view=rev
Log:
A patch from Ankit Jain "Link back to login page from Forgot Password page" https://issues.apache.org/jira/browse/OFBIZ-3469 - OFBIZ-3469

This one works! (with a little help from me)

Modified:
    ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl

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=945061&r1=945060&r2=945061&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Mon May 17 10:19:18 2010
@@ -191,6 +191,11 @@ under the License.
         <response name="success" type="view" value="showHelp"/>
     </request-map>
 
+    <request-map uri="authview">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="main"/>
+    </request-map>
+    
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="main" type="none"/>

Modified: ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl?rev=945061&r1=945060&r2=945061&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl Mon May 17 10:19:18 2010
@@ -35,6 +35,7 @@ under the License.
             </td>
           </tr>
         </table>
+        <a href='<@ofbizUrl>authview</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
         <input type="hidden" name="JavaScriptEnabled" value="N"/>
       </form>
     </div>