zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish account settings option.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-20 13:28:45 -03:00
parent a845a87183
commit cfe78bdf7e
46 changed files with 387 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wise-webapp/src/main/webapp/WEB-INF/classes/mail/activationAccountMail.vm
View File

@@ -1,41 +0,0 @@
<html>
<body>
<div style="background-color: #d1e4f0; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
<div style="height: 36px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="35px" width="2px" style="padding: 0; padding-right: 5px; text-align:center">
<img src="https://ssl.gstatic.com/docs/documents/share/images/services/document-1.png"
alt="Document"/>
</td>
<td valign="middle" height="32px" style="padding: 0;">I've shared <a
href='https://docs.google.com/document/d/1kx48Yhpt01y2LZnIVGJNgKTg_IlvQMh=47R2NIwRn4Hg/edit'>Untitled
document
</a>
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px;">
Click to open:
<ul style="list-style-type: none; padding: 0; margin: 0;">
<li style="margin: 0;">
<a href="https://docs.google.com/document/d/1kx48Yhpt01y2LZnIVG=JNgKTg_IlvQMh47R2NIwRn4Hg/edit">Untitled
document</a></li>
</ul>
<span style="color: #898989;">Google Docs makes it easy to create, store and share online documents, spreadsheets and presentations.</span>
<div style="text-align: right;">
<a href="https://docs.google.com">
<img style="border: 0;margin-top: 10px;"
src="https://ssl.gstatic.com/docs/documents/share/images/services/docs_logo-1.gif"
alt="Logo for Google Docs"/>
</a>
</div>
</div>
</div>
</body>
</html>

29
wise-webapp/src/main/webapp/WEB-INF/classes/mail/confirmationMail.vm
View File

@@ -1,29 +0,0 @@
<html>
<body>
<h3>Welcome to WiseMapping!</h3>
<p>
To active your account and verify your e-mail address, please click on the following link.
</p>
<a href="${emailcheck}">${emailcheck}</a>
</p>
<p>
If you have received this mail by error, you do not need to take any action to cancel the account. The account will
not be activated, and you will not receive any futher emails.
</p>
<p>
If clicking the link above does not work, copy and paste the URL in a new browser window instead.
</p>
<p>
For questions or concerns regarding your account, send us an email to support@wisemapping.com.
</p>
<p>
Cheers, <br/>
The WiseMapping Team.
<a href="http://www.wisemapping.com">WiseMapping Site</a>
</p>
</body>
</html>

41
wise-webapp/src/main/webapp/WEB-INF/classes/mail/newCollaboration.vm
View File

@@ -1,41 +0,0 @@
<html>
<body>
<div style="background-color: #fbeed5; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}">
<img style="border: 0;margin-top: 10px;"
src="${baseUrl}/images/logo-small.png"
alt="WiseMapping Log"/>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">I've shared <a
href='${mapEditUrl}'>
${mindmap.title}</a> mindmap with you.
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
<p><strong>Message from ${senderMail}: </strong></p>
#if($message )
<pre style="font-family: Arial, sans-serif; color: #000; ">${message}</pre>
#end
<p>Click to open: <a href="${mapEditUrl}">${mindmap.title}</a></p>
<p style="color: #898989;">Do you have a WiseMapping account ?. Don't worry, you can create an account for
free. </p>
</div>
</div>
<p style="font-size: 13px;font-family: Arial, sans-serif">Important: Do not reply this email. If
you need further help or have any concerns regarding your account, contact us to <a href="mailto:${supportEmail}">here</a>.
</p>
</body>
</html>

37
wise-webapp/src/main/webapp/WEB-INF/classes/mail/passwordRecovery.vm
View File

@@ -1,37 +0,0 @@
<html>
<body>
<div style="background-color: #fbeed5; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}">
<img style="border: 0;margin-top: 10px;"
src="${baseUrl}/images/logo-small.png"
alt="WiseMapping Log"/>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">
Your password has been reset
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
<p>A temporal password has been generated for you account. </p>
<p><strong>New Password: ${password}</strong></p>
<p>You can login clicking <a href="${baseUrl}/c/login">here</a>.We strongly encourage you to change the password as soon as possible.</p>
</div>
</div>
<p style="font-size: 13px;font-family: Arial, sans-serif">Important: Do not reply this email. If
you need further help or have any concerns regarding your account, contact us to <a href="mailto:${supportEmail}">here</a>.
</p>
</body>
</html>

23
wise-webapp/src/main/webapp/WEB-INF/classes/mail/welcome.vm
View File

@@ -1,23 +0,0 @@
<html>
<body style="font-family: Arial, sans-serif; color: #000;">
<p>
Hi,
</p>
<p>
Thank you so much for your interest in WiseMapping. Your subscription was a success! If you have any questions or
have any feedback, please don't hesitate to reply to this email, or use the on line form. We'd love to hear from
you.
</p>
<p>
For questions or concerns regarding your account, send us an email to ${supportEmail}.
</p>
<p>
Cheers, <br/>
The WiseMapping Team.
<a href="${baseUrl}">WiseMapping Site</a>
</p>
</body>
</html>

10
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@@ -11,6 +11,7 @@ VIEWERS=Viewers
ADD_VIEWERS=Add Viewers
CURRENT_VIEWERS=Current Viewers
USER_REGISTRATION=User Registration
SEND_ME_A_NEW_PASSWORD=Send Me A New Password
CANCEL=Cancel
SUBMIT=Submit
FIRSTNAME=Firstname
@@ -19,6 +20,8 @@ EMAIL=Email
HELP=Help
LOGOUT=Logout
PASSWORD=Password
NEW_PASSWORD=New password
CONFIRM_NEW_PASSWORD=Confirm new password
MY_WISEMAPS=My Wisemaps
SAVE_AND_CLOSE=Save and Close
RETYPE_PASSWORD=Retype Password
@@ -26,7 +29,7 @@ REGISTER=Register
REMEMBER_ME=Stay signed in
SIGN_IN=Sign In
SIGN_UP=Sign Up
SETTINGS=Settings
ACCOUNT=Account
USERNAME=Username
BACK=Back
CLOSE=Close
@@ -39,7 +42,7 @@ ROLE=Role
YOUR_ROLE=Your Role
CAPTCHA= Word Verification
FORGOT_PASSWORD=Forgot Password ?
CHANGE_PASSWORD=Change your Password
CHANGE_PASSWORD=Change Password
FAQ=Frequent Asked Questions
SHORT_FAQ=FAQ
LOGIN=Login
@@ -99,6 +102,7 @@ EMAIL_ALREADY_EXIST=Email already exists
NO_VALID_EMAIL_ADDRESS=Invalid email address
USERNAME_ALREADY_EXIST=Username already exists
PASSWORD_MISSMATCH=Your password entries did not match
CHANGE_PASSWORD_SUCCESS=Your password has been changed successfully.
TYPE_CHARACTER_BELOW=Type the characters you see in the picture below.
WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
@@ -139,7 +143,7 @@ INSERT=Insert
WISE_IT=Wise It!
EDITOR.LAST_SAVED=last modification by {0}
SHARE_IT=Share It
SETTINGS_DETAIL=Do you want to change you user options?. Here is the place.
ACCOUNT_DETAIL=Do you want to change you user options?. Here is the place.
SETTINGS_MSG=Please, select what option want to change from you profile:
TAGS=Tags
AVAILABLE_TAGS = Available tags

4
wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
View File

@@ -25,7 +25,7 @@ REGISTER=Registraci&oacute;n
REMEMBER_ME=Recordar mi sesi&oacute;n
SIGN_IN=Entrar
SIGN_UP=Registrate
SETTINGS=Configuraci&oacute;n
ACCOUNT=Configuraci&oacute;n
USERNAME=Nombre de usuario
BACK=Atr&aacute;s
CLOSE=Cerrar
@@ -141,7 +141,7 @@ INSERT=Insertar
WISE_IT=Wise It!
EDITOR.LAST_SAVED=ultima modificaci&oacute;n hecha por {0}
SHARE_IT=Compartilo
SETTINGS_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
SETTINGS_MSG=Por favor, seleccione que opci&oacute;n desea modificar de su perfil:
TAGS=Etiquetas
AVAILABLE_TAGS = Etiquetas disponibles

4
wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties
View File

@@ -25,7 +25,7 @@ REGISTER = S\'inscrire
REMEMBER_ME = M\u00e9moriser
SIGN_IN = S\'identifier
SIGN_UP = Se d\u00e9connecter
SETTINGS = Param\u00e9tres du compte
ACCOUNT = Param\u00e9tres du compte
USERNAME = Pseudo
BACK = Pr\u00e9c\u00e9dent
CLOSE = Fermer
@@ -145,7 +145,7 @@ INSERT = Ins\u00e9rer
EDITOR.LAST_SAVED = Derni\u00e9re modification par
SHARE_IT = Partager
SETTINGS_DETAIL = Souhaitez-vous modifier les options de votre profil ?
ACCOUNT_DETAIL = Souhaitez-vous modifier les options de votre profil ?
SETTINGS_MSG = S\u00e9lectionnez les options que vous souhaitez modifier dans votre profil
TAGS = Mots-cl\u00e9s
AVAILABLE_TAGS = Mots-cl\u00e9s disponibles

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

@@ -94,10 +94,9 @@
<put-attribute name="body" value="/jsp/mindmapDetail.jsp"/>
</definition>
<definition name="setting" extends="dialogTemplate">
<definition name="accountSettings" extends="dialogTemplate">
<put-attribute name="title" value="SETTINGS"/>
<put-attribute name="details" value="SETTINGS_MSG"/>
<put-attribute name="body" value="/jsp/setting.jsp"/>
<put-attribute name="body" value="/jsp/accountSettings.jsp"/>
</definition>
<definition name="editProfile" extends="dialogTemplate">
@@ -173,11 +172,4 @@
<put-attribute name="details" value="KEYBOARD_MSG"/>
<put-attribute name="body" value="/jsp/keyboard.jsp"/>
</definition>
<definition name="changePassword" extends="dialogTemplate">
<put-attribute name="title" value="CHANGE_PASSWORD"/>
<put-attribute name="details" value="FIELD_REQUIRED_MSG"/>
<put-attribute name="body" value="/jsp/changePassword.jsp"/>
</definition>
</tiles-definitions>

3
wise-webapp/src/main/webapp/WEB-INF/web.xml
View File

@@ -90,8 +90,7 @@
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>
<!--/WEB-INF/wisemapping-servlet.xml-->
/WEB-INF/wisemapping-nservlet.xml
/WEB-INF/wisemapping-servlet.xml
</param-value>
</init-param>

97
wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
<context:component-scan base-package="com.wisemapping.ncontroller"/>
<context:annotation-config/>
<mvc:annotation-driven/>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/app.properties"/>
</bean>
<bean id="exceptionHandlerResolver"
class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
<property name="defaultStatusCode" value="500"/>
<property name="defaultErrorView" value="unexpectedError"/>
<property name="exceptionMappings">
<props>
<prop key="com.wisemapping.exceptions.UnsupportedBrowserException">browserNotSupported</prop>
<!-- Security exceptions are wrapped in this exceptions -->
<prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
</props>
</property>
</bean>
<bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
</bean>
<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions">
<list>
<value>/WEB-INF/defs/definitions.xml</value>
</list>
</property>
</bean>
<bean id="localeResolver"
class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
<property name="defaultLocale" value="en"/>
</bean>
<bean id="localeChangeInterceptor"
class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
<property name="paramName" value="language"/>
</bean>
<bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl">
<property name="privateKey" value="${registration.recaptcha.privateKey}"/>
<property name="publicKey" value="${registration.recaptcha.publicKey}"/>
<property name="includeNoscript" value="false"/>
</bean>
<bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<!-- one of the properties available; the maximum file size in bytes -->
<property name="maxUploadSize" value="522240"/>
</bean>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<list>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home</value>
<value>/c/login</value>
<value>/c/user/registration</value>
<value>/c/captcha</value>
<value>/c/publicView</value>
<value>/service/*</value>
<value>/c/search</value>
<value>/c/keyboard</value>
<value>/c/renameMap</value>
<value>/c/embeddedView</value>
<value>/c/user/resetPassword</value>
</list>
</property>
</bean>
<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
<property name="basenames">
<list>
<value>messages</value>
</list>
</property>
</bean>
</beans>

110
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -1,51 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
<beans>
<context:component-scan base-package="com.wisemapping.ncontroller"/>
<context:annotation-config/>
<mvc:annotation-driven/>
<bean id="userValidator" class="com.wisemapping.validator.UserValidator">
<property name="userService" ref="userService"/>
<property name="captchaService" ref="reCaptcha"/>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/app.properties"/>
</bean>
<bean id="settingResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
<property name="mappings">
<bean id="exceptionHandlerResolver"
class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
<property name="defaultStatusCode" value="500"/>
<property name="defaultErrorView" value="unexpectedError"/>
<property name="exceptionMappings">
<props>
<prop key="settings">settings</prop>
<prop key="com.wisemapping.exceptions.UnsupportedBrowserException">browserNotSupported</prop>
<!-- Security exceptions are wrapped in this exceptions -->
<prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
</props>
</property>
</bean>
<bean id="settingsController" class="com.wisemapping.controller.SettingsController">
<property name="methodNameResolver" ref="settingResolver"/>
<bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
</bean>
<bean id="changePasswordValidator" class="com.wisemapping.validator.ChangePasswordValidator"/>
<bean id="changePasswordController" class="com.wisemapping.controller.ChangePasswordController">
<property name="sessionForm" value="false"/>
<property name="commandName" value="changePassword"/>
<property name="commandClass" value="com.wisemapping.view.ChangePasswordBean"/>
<property name="validator" ref="changePasswordValidator"/>
<property name="formView" value="changePassword"/>
<property name="successView" value="closeDialog"/>
<property name="userService" ref="userService"/>
<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions">
<list>
<value>/WEB-INF/defs/definitions.xml</value>
</list>
</property>
</bean>
<bean id="editProfileValidator" class="com.wisemapping.validator.EditProfileValidator">
<property name="userService" ref="userService"/>
<bean id="localeResolver"
class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
<property name="defaultLocale" value="en"/>
</bean>
<bean id="editProfileController" class="com.wisemapping.controller.EditProfileController">
<property name="sessionForm" value="false"/>
<property name="commandName" value="editProfile"/>
<property name="commandClass" value="com.wisemapping.view.UserBean"/>
<property name="validator" ref="editProfileValidator"/>
<property name="formView" value="editProfile"/>
<property name="successView" value="closeDialog"/>
<property name="userService" ref="userService"/>
<bean id="localeChangeInterceptor"
class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
<property name="paramName" value="language"/>
</bean>
<bean id="activationController" class="com.wisemapping.controller.ActivationController">
<property name="userService" ref="userService"/>
<bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl">
<property name="privateKey" value="${registration.recaptcha.privateKey}"/>
<property name="publicKey" value="${registration.recaptcha.publicKey}"/>
<property name="includeNoscript" value="false"/>
</bean>
ans>
<bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<!-- one of the properties available; the maximum file size in bytes -->
<property name="maxUploadSize" value="522240"/>
</bean>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<list>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home</value>
<value>/c/login</value>
<value>/c/user/registration</value>
<value>/c/captcha</value>
<value>/c/publicView</value>
<value>/service/*</value>
<value>/c/search</value>
<value>/c/keyboard</value>
<value>/c/renameMap</value>
<value>/c/embeddedView</value>
<value>/c/user/resetPassword</value>
</list>
</property>
</bean>
<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
<property name="basenames">
<list>
<value>messages</value>
</list>
</property>
</bean>
</beans>

99
wise-webapp/src/main/webapp/jsp/accountSettings.jsp Executable file
View File

@@ -0,0 +1,99 @@
<%@ include file="/jsp/init.jsp" %>
<div>
<ul class="nav nav-tabs">
<li class="active"><a href="#changeUserPanel" data-toggle="pill">General</a></li>
<li><a href="#changePasswordPanel" data-toggle="pill">Security</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane fade active in" id="changeUserPanel">
<div id="changeInfoMsg" class="alert">
</div>
<form action="#" method="POST" id="changeUserForm">
<fieldset>
<label for="email"><strong><spring:message code="EMAIL"/>:</strong></label>
<input type="text" name="password" id="email" required="required" readonly="readonly"
value="${user.email}"/>
<label for="userName"><strong><spring:message code="USERNAME"/>:</strong></label>
<input type="text" name="password" id="userName" required="required" value="${user.username}"
readonly="readonly"/>
<label for="firstname"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
<input type="text" name="firstname" id="firstname" required="required" value="${user.firstname}"/>
<label for="lastname"><strong><spring:message code="LASTNAME"/>:</strong></label>
<input type="text" name="lastname" id="lastname" required="required" value="${user.lastname}"/>
<br/>
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary" value="Save"/>
</fieldset>
</form>
</div>
<div class="tab-pane fade" id="changePasswordPanel">
<div id="changePasswordMsg" class="alert">
</div>
<form action="#" method="POST" id="changePasswordForm">
<fieldset>
<label for="password"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
<input type="password" name="password" id="password" required="required"/>
<label for="repassword"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
<input type="password" name="password" id="repassword" required="required"/>
<br/>
<input type="submit" id="changePasswordBtn" class="btn btn-primary"
value="<spring:message code="CHANGE_PASSWORD"/>"/>
</fieldset>
</form>
</div>
</div>
</div>
<script type="text/javascript">
$('#changePasswordMsg').hide();
function postChange(url, postBody, msgContainerId, successMsg) {
// Change success message ...
jQuery.ajax(url, {
async:false,
dataType: 'json',
data: postBody,
type: 'PUT',
contentType:"text/plain; charset=utf-8",
success : function(data, textStatus, jqXHR) {
$('#' + msgContainerId).removeClass('alert-error').addClass('alert-info').show();
$('#' + msgContainerId).text(successMsg);
},
error: function(jqXHR, textStatus, errorThrown) {
$('#' + msgContainerId).removeClass('alert-info').addClass('alert-error').show();
$('#' + msgContainerId).text(textStatus);
}
});
}
$('#changePasswordForm').submit(function(event) {
var inputVal = $('#changePasswordForm #password').val();
var rinputVal = $('#changePasswordForm #repassword').val();
if (inputVal != rinputVal) {
// Password mismatch message ...
$('#changePasswordMsg').removeClass('alert-info').addClass('alert-error').show();
$('#changePasswordMsg').text('<spring:message code="PASSWORD_MISSMATCH"/>');
} else {
postChange("service/account/password", inputVal, 'changePasswordMsg', '<spring:message code="CHANGE_PASSWORD_SUCCESS"/>');
}
event.preventDefault();
});
$('#changeUserForm').submit(function(event) {
var fistname = $('#changeUserForm #firstname').val();
var lastname = $('#changeUserForm #lastname').val();
postChange("service/account/firstname", fistname, 'changeInfoMsg', 'Your info has been changed successfully');
postChange("service/account/lastname", lastname, 'changeInfoMsg', 'Your info has been changed successfully');
event.preventDefault();
});
</script>

4
wise-webapp/src/main/webapp/jsp/editorHeader.jsp
View File

@@ -17,8 +17,8 @@
<spring:message code="MY_WISEMAPS"/>
</a>
| <a href="${pageContext.request.contextPath}/c/settings" rel="moodalbox 400px 250px wizard"
title="<spring:message code="SETTINGS_DETAIL"/>">
<spring:message code="SETTINGS"/>
title="<spring:message code="ACCOUNT_DETAIL"/>">
<spring:message code="ACCOUNT"/>
</a>
| <a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>

50
wise-webapp/src/main/webapp/jsp/header.jsp
View File

@@ -1,17 +1,33 @@
<%@page pageEncoding="UTF-8"%>
<%@page pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<div id="settings-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="ACCOUNT"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-cancel" data-dismiss="modal">Close</button>
</div>
</div>
<div id="header">
<div id="headerToolbar">
<c:choose>
<c:when test="${principal != null}">
<div id="headerActions">
<spring:message code="WELCOME"/>, ${principal.firstname}
| <span><a href="${pageContext.request.contextPath}/c/maps/"><spring:message code="MY_WISEMAPS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/settings" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/maps/"><spring:message
code="MY_WISEMAPS"/></a></span>
| <span><a id="userSettingsBtn" href="#"
title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message
code="ACCOUNT"/></a></span>
| <span><a href="${pageContext.request.contextPath}/c/logout"
title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
</div>
</c:when>
<c:when test="${param.removeSignin!=true}">
@@ -20,7 +36,7 @@
<span><a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
<spring:message code="SIGN_IN"/>
</a></span>
</div>
</div>
</c:when>
</c:choose>
<div class="header_languages">
@@ -38,13 +54,6 @@
</div>
<c:if test="${param.onlyActionHeader!=true}">
<div id="headerContent">
<div id="headerButtons">
<%--<div id="blogLink">--%>
<%--<a href="${pageContext.request.contextPath}/c/blog" title="<spring:message code="BLOG_TITLE"/>">--%>
<%--<spring:message code="BLOG"/>--%>
<%--</a>--%>
<%--</div>--%>
</div>
<a href="${pageContext.request.contextPath}/c/home" title="Homepage">
<div id="headerLogo">&nbsp;</div>
</a>
@@ -55,3 +64,20 @@
</div>
</c:if>
<script type="text/javascript">
$('#userSettingsBtn').click(
function(event) {
$('#settings-dialog-modal .modal-body').load("/c/account/settings"),function() {
$('#settings-dialog-modal .btn-accept').unbind('click').click(function() {
// hacer lago ...
});
};
$('#settings-dialog-modal').modal();
event.preventDefault();
});
</script>

4
wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
View File

@@ -49,11 +49,11 @@
<li><strong><spring:message code="URL"/>:</strong>
<li><input name="url"
value="http://www.wisemapping.com/c/publicView?mapId=${mindmap.id}"
value="${baseUrl}/c/maps/${mindmap.id}/public"
style="width:400px" readonly="readonly"/>
</li>
<li><strong><spring:message code="BLOG_SNIPPET"/></strong>
<pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${mindmap.id}&amp;amzoom=1"&gt;&lt;/iframe&gt;</pre>
<pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="${baseUrl}/c/maps/${mindmap.id}/embed?zoom=1"&gt;&lt;/iframe&gt;</pre>
</li>
<li><spring:message code="EMBEDDED_MAP_SIZE"/></li>
</ul>

6
wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
View File

@@ -64,9 +64,9 @@
<spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
href="c/maps/"><spring:message code="MY_WISEMAPS"/></a></span> |
<span><a id="settings" href="c/settings"
title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
| <span><a href="c/logout" title="<spring:message code="LOGOUT"/>">
<%--<span><a id="settings" href="c/settings"--%>
<%--title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message code="ACCOUNT"/></a></span> |--%>
<span><a href="c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>
</a></span>
</div>

20
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@@ -115,7 +115,7 @@
<div id="dialogsContainer">
<!-- New map dialog -->
<div id="new-dialog-modal" title="Add new map" class="modal fade" style="display:none">
<div id="new-dialog-modal" title="Add new map" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Create a new map</h3>
@@ -144,7 +144,7 @@
</div>
<!-- Duplicate map dialog -->
<div id="duplicate-dialog-modal" class="modal fade" style="display: none">
<div id="duplicate-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="dupDialogTitle"></h3>
@@ -175,7 +175,7 @@
</div>
<!-- Rename map dialog -->
<div id="rename-dialog-modal" class="modal fade" style="display: none">
<div id="rename-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="renameDialogTitle"></h3>
@@ -204,7 +204,7 @@
</div>
<!-- Delete map dialog -->
<div id="delete-dialog-modal" class="modal fade" style="display: none">
<div id="delete-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Delete MindMap</h3>
@@ -222,7 +222,7 @@
</div>
<!-- Info map dialog -->
<div id="info-dialog-modal" class="modal fade" style="display: none">
<div id="info-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Info</h3>
@@ -236,7 +236,7 @@
</div>
<!-- Publish Dialog Config -->
<div id="publish-dialog-modal" class="modal fade" style="display: none">
<div id="publish-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Publish</h3>
@@ -251,7 +251,7 @@
</div>
<!-- Export Dialog Config -->
<div id="export-dialog-modal" class="modal fade" style="display: none">
<div id="export-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Export</h3>
@@ -266,7 +266,7 @@
</div>
<!-- Import Dialog Config -->
<div id="import-dialog-modal" class="modal fade" style="display: none">
<div id="import-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Import</h3>
@@ -281,7 +281,7 @@
</div>
<!-- Share Dialog Config -->
<div id="share-dialog-modal" class="modal fade" style="display: none">
<div id="share-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>Share</h3>
@@ -296,7 +296,7 @@
</div>
<!-- History Dialog Config -->
<div id="history-dialog-modal" class="modal fade" style="display: none">
<div id="history-dialog-modal" class="modal fade" >
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3>History</h3>

1
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@@ -1,4 +1,5 @@
<!DOCTYPE HTML>
<%@page pageEncoding="UTF-8" %>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %>

2
wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
View File

@@ -20,7 +20,7 @@
<label for="email"><spring:message code="EMAIL"/></label>
<input id="email" type="email" required="required" name="email"/>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary" data-loading-text="Saving ..."/>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary" data-loading-text="Seding ..."/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>

17
wise-webapp/src/main/webapp/jsp/userSetting.jsp
View File

@@ -1,17 +0,0 @@
<%@ include file="/jsp/init.jsp" %>
<div>
<ul>
<li><a rel="moodalbox 400px 200px wizard"
href="<c:out value="${pageContext.request.contextPath}/c/changePassword"/>"
title="<spring:message code="CHANGE_PASSWORD"/>">
<spring:message code="CHANGE_PASSWORD"/>
</a>
</li>
<li><a rel="moodalbox 400px 250px wizard"
href="<c:out value="${pageContext.request.contextPath}/c/editProfile"/>"
title="<spring:message code="EDIT_PROFILE"/>">
<spring:message code="EDIT_PROFILE"/>
</a>
</li>
</ul>
</div>