ZhouXY108/wisemapping-open-source
1
1
Fork 0
mirror of https://github.com/wisemapping/wisemapping-open-source.git synced 2025-04-19 02:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v3.0.2' of bitbucket.org:wisemapping/wisemapping-open-source into release/v3.0.2

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-01-24 20:26:54 -03:00
commit 5ca8c4718f
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
View File

@ -78,7 +78,7 @@ public class UsersController {
result = new ModelAndView("forgotPasswordError"); result = new ModelAndView("forgotPasswordError");
} }
catch (InvalidAuthSchemaException e) { catch (InvalidAuthSchemaException e) {
result = new ModelAndView("forgotPasswordError"); result = new ModelAndView("userForgotPasswordOpenId");
} }
return result; return result;
} }

2
wise-webapp/src/main/resources/messages_en.properties
View File

@ -267,6 +267,8 @@ OPEN_OFFICE_EXPORT_FORMAT_DETAILS=Get your map as OpenOffice Write Document
MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x
MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format
MINDMAP_IS_LOCKED=Mindmap is locked for edition. MINDMAP_IS_LOCKED=Mindmap is locked for edition.
OPENID_ACCOUNT_PASSWORD=Registered OpenID account password could not be changed
OPENID_ACCOUNT_PASSWORD_DETAIL=Your account has been registered using OpenId. Try to login using either your Google, AOL or Yahoo account.

5
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@ -63,6 +63,11 @@
<put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/> <put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
</definition> </definition>
<definition name="userForgotPasswordOpenId" extends="errorTemplate">
<put-attribute name="title" value="OPENID_ACCOUNT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordOpenId.jsp"/>
</definition>
<definition name="forgotPasswordSuccess" extends="errorTemplate"> <definition name="forgotPasswordSuccess" extends="errorTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/> <put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/> <put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>

6
wise-webapp/src/main/webapp/jsp/userForgotPasswordOpenId.jsp Executable file
View File

@ -0,0 +1,6 @@
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<h2><spring:message code="OPENID_ACCOUNT_PASSWORD"/></h2>
<p><spring:message code="OPENID_ACCOUNT_PASSWORD_DETAIL"/></p>