mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Partial support for locale in spanish.
This commit is contained in:
parent
36c34b6962
commit
dd74a7a63d
@ -454,7 +454,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.mortbay.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
<version>8.1.0.v20120127</version>
|
<version>8.1.4.v20120524</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<stopKey>foo</stopKey>
|
<stopKey>foo</stopKey>
|
||||||
<stopPort>9999</stopPort>
|
<stopPort>9999</stopPort>
|
||||||
|
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2011] [wisemapping]
|
||||||
|
*
|
||||||
|
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
|
||||||
|
* It is basically the Apache License, Version 2.0 (the "License") plus the
|
||||||
|
* "powered by wisemapping" text requirement on every single page;
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the license at
|
||||||
|
*
|
||||||
|
* http://www.wisemapping.org/license
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.wisemapping.filter;
|
||||||
|
|
||||||
|
import com.wisemapping.model.User;
|
||||||
|
import com.wisemapping.security.Utils;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.springframework.beans.propertyeditors.LocaleEditor;
|
||||||
|
import org.springframework.web.servlet.LocaleResolver;
|
||||||
|
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
|
||||||
|
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
|
||||||
|
import org.springframework.web.servlet.support.RequestContextUtils;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import javax.servlet.http.HttpSession;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
public class UserLocaleInterceptor extends HandlerInterceptorAdapter {
|
||||||
|
|
||||||
|
public static final String USER_LOCALE = "user.locale";
|
||||||
|
|
||||||
|
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
|
||||||
|
|
||||||
|
final HttpSession session = request.getSession(false);
|
||||||
|
User user = Utils.getUser(false);
|
||||||
|
|
||||||
|
if (user != null && session != null) {
|
||||||
|
String userLocale = user.getLocale();
|
||||||
|
final String sessionLocale = (String) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
|
||||||
|
if (userLocale != null && !userLocale.equals(sessionLocale)) {
|
||||||
|
// LocaleResolver localeResolver = RequestContextUtils.getLocaleResolver(request);
|
||||||
|
// if (localeResolver == null) {
|
||||||
|
// throw new IllegalStateException("No LocaleResolver found: not in a DispatcherServlet request?");
|
||||||
|
// }
|
||||||
|
// LocaleEditor localeEditor = new LocaleEditor();
|
||||||
|
// localeEditor.setAsText(userLocale);
|
||||||
|
// localeResolver.setLocale(request, response, (Locale) localeEditor.getValue());
|
||||||
|
session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, userLocale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
package com.wisemapping.model;
|
package com.wisemapping.model;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@ -33,6 +35,8 @@ public class User
|
|||||||
private String username;
|
private String username;
|
||||||
private Set<String> tags = new HashSet<String>();
|
private Set<String> tags = new HashSet<String>();
|
||||||
private boolean allowSendEmail = false;
|
private boolean allowSendEmail = false;
|
||||||
|
private String locale;
|
||||||
|
|
||||||
|
|
||||||
public User() {
|
public User() {
|
||||||
}
|
}
|
||||||
@ -119,6 +123,7 @@ public class User
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
int result;
|
int result;
|
||||||
result = (firstname != null ? firstname.hashCode() : 0);
|
result = (firstname != null ? firstname.hashCode() : 0);
|
||||||
@ -136,4 +141,11 @@ public class User
|
|||||||
this.username = username;
|
this.username = username;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getLocale() {
|
||||||
|
return locale;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLocale(@NotNull String locale) {
|
||||||
|
this.locale = locale;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,6 +80,21 @@ public class AccountController extends BaseController {
|
|||||||
userService.updateUser(user);
|
userService.updateUser(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping(method = RequestMethod.PUT, value = "account/locale", consumes = {"text/plain"})
|
||||||
|
@ResponseStatus(value = HttpStatus.NO_CONTENT)
|
||||||
|
public void changeLanguage(@RequestBody String language) {
|
||||||
|
if (language == null) {
|
||||||
|
throw new IllegalArgumentException("language can not be null");
|
||||||
|
|
||||||
|
} if (!language.equals("en") && !language.equals("es") ){
|
||||||
|
throw new IllegalArgumentException("language not supported yet");
|
||||||
|
}
|
||||||
|
|
||||||
|
final User user = Utils.getUser();
|
||||||
|
user.setLocale(language);
|
||||||
|
userService.updateUser(user);
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping(method = RequestMethod.POST, value = "logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
|
@RequestMapping(method = RequestMethod.POST, value = "logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
|
||||||
@ResponseStatus(value = HttpStatus.NO_CONTENT)
|
@ResponseStatus(value = HttpStatus.NO_CONTENT)
|
||||||
public void changePassword(@RequestBody RestLogItem item) {
|
public void changePassword(@RequestBody RestLogItem item) {
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
<property name="activationDate" column="activation_date"/>
|
<property name="activationDate" column="activation_date"/>
|
||||||
<property name="activationCode"/>
|
<property name="activationCode"/>
|
||||||
<property name="allowSendEmail"/>
|
<property name="allowSendEmail"/>
|
||||||
|
<property name="locale"/>
|
||||||
<set name="tags" table="TAG">
|
<set name="tags" table="TAG">
|
||||||
<key column="user_id"/>
|
<key column="user_id"/>
|
||||||
<element column="name" type="string"/>
|
<element column="name" type="string"/>
|
||||||
|
@ -2,7 +2,6 @@ NAME=Name
|
|||||||
DESCRIPTION=Description
|
DESCRIPTION=Description
|
||||||
FILE_FORMAT=File Format
|
FILE_FORMAT=File Format
|
||||||
OK=Ok
|
OK=Ok
|
||||||
WISEMAPPING=WiseMapping
|
|
||||||
ADD=Add
|
ADD=Add
|
||||||
ACTIONS=Actions
|
ACTIONS=Actions
|
||||||
ADD_COLLABORATORS=Add Collaborators
|
ADD_COLLABORATORS=Add Collaborators
|
||||||
@ -31,18 +30,17 @@ SIGN_IN=Sign In
|
|||||||
SIGN_UP=Sign Up
|
SIGN_UP=Sign Up
|
||||||
ACCOUNT=Account
|
ACCOUNT=Account
|
||||||
USERNAME=Username
|
USERNAME=Username
|
||||||
BACK=Back
|
|
||||||
CLOSE=Close
|
CLOSE=Close
|
||||||
NOT_READY_A_USER=Not a member yet?
|
NOT_READY_A_USER=Not a member yet?
|
||||||
NOT_READY_A_USER_MESSAGE=Registration is free and takes just a moment.
|
NOT_READY_A_USER_MESSAGE=Registration is free and takes just a moment.
|
||||||
JOIN_NOW=Join Now!
|
JOIN_NOW=Join Now!
|
||||||
REMOVE=Remove
|
|
||||||
MINDMAP=Mindmap
|
MINDMAP=Mindmap
|
||||||
ROLE=Role
|
ROLE=Role
|
||||||
YOUR_ROLE=Your Role
|
YOUR_ROLE=Your Role
|
||||||
CAPTCHA= Word Verification
|
CAPTCHA= Word Verification
|
||||||
FORGOT_PASSWORD=Forgot Password ?
|
FORGOT_PASSWORD=Forgot Password ?
|
||||||
CHANGE_PASSWORD=Change Password
|
CHANGE_PASSWORD=Change Password
|
||||||
|
CHANGE_LANGUAGE=Change Language
|
||||||
FAQ=Frequent Asked Questions
|
FAQ=Frequent Asked Questions
|
||||||
SHORT_FAQ=FAQ
|
SHORT_FAQ=FAQ
|
||||||
LOGIN=Login
|
LOGIN=Login
|
||||||
@ -95,8 +93,6 @@ ALREADY_A_MEMBER=Already a member?
|
|||||||
WORD_VERIFICATION=Word Verification
|
WORD_VERIFICATION=Word Verification
|
||||||
TERM_OF_THE_SERVICE=Terms of Service:
|
TERM_OF_THE_SERVICE=Terms of Service:
|
||||||
FORGOT_PASSWORD_MESSAGE=Please enter an email address to help us locate your WiseMapping account.
|
FORGOT_PASSWORD_MESSAGE=Please enter an email address to help us locate your WiseMapping account.
|
||||||
SEARCH_FIELD=Map Title or Tag
|
|
||||||
|
|
||||||
FIELD_REQUIRED=Required field cannot be left blank
|
FIELD_REQUIRED=Required field cannot be left blank
|
||||||
EMAIL_ALREADY_EXIST=Email already exists
|
EMAIL_ALREADY_EXIST=Email already exists
|
||||||
NO_VALID_EMAIL_ADDRESS=Invalid email address
|
NO_VALID_EMAIL_ADDRESS=Invalid email address
|
||||||
@ -128,7 +124,7 @@ CURRENT_CONTACTS = Current Contacts
|
|||||||
MESSAGE=Message
|
MESSAGE=Message
|
||||||
COLLABORATION= Collaboration
|
COLLABORATION= Collaboration
|
||||||
SHARE_DETAILS=Share your maps with your colleagues. Invite them to collaborate with you.
|
SHARE_DETAILS=Share your maps with your colleagues. Invite them to collaborate with you.
|
||||||
NEW_MAP_MSG=Fill all the fields to create a new map
|
NEW_MAP_MSG=Create a new map
|
||||||
|
|
||||||
TAG=Tag
|
TAG=Tag
|
||||||
PUBLISH=Publish
|
PUBLISH=Publish
|
||||||
@ -153,7 +149,6 @@ TAG_IT=Tag It
|
|||||||
PUBLISH_IT=Publish It
|
PUBLISH_IT=Publish It
|
||||||
UNSUPPORTED_BROWSER=Unsupported Browser
|
UNSUPPORTED_BROWSER=Unsupported Browser
|
||||||
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
|
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
|
||||||
TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
|
|
||||||
COMMA_SEPARATED_EMAILS=Comma separated emails
|
COMMA_SEPARATED_EMAILS=Comma separated emails
|
||||||
INVITE_USERS=Invite Users
|
INVITE_USERS=Invite Users
|
||||||
AS_COLLABORATOR=as Collaborators
|
AS_COLLABORATOR=as Collaborators
|
||||||
@ -234,21 +229,13 @@ MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name
|
|||||||
EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post!
|
EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post!
|
||||||
EMBEDDED_VIEWER_MESSAGE=Once you make your map public, you will be able to embed a mind map viewer in your own web site, blog or post just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
|
EMBEDDED_VIEWER_MESSAGE=Once you make your map public, you will be able to embed a mind map viewer in your own web site, blog or post just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
|
||||||
FREEMIND_EXPORT_IMPORT=Import and Export maps from/to FreeMind
|
FREEMIND_EXPORT_IMPORT=Import and Export maps from/to FreeMind
|
||||||
FREEMIND_EXPORT_IMPORT_MESSAGE=You can now easily import and export mind maps from/to FreeMind.
|
|
||||||
EDITOR_TOOLBAR_IMPROVED=Usability Improvement: The editor toolbar has been redesign
|
EDITOR_TOOLBAR_IMPROVED=Usability Improvement: The editor toolbar has been redesign
|
||||||
EDITOR_TOOLBAR_IMPROVED_MESSAGE= The toolbar has been redesign to improve its usability.
|
EDITOR_TOOLBAR_IMPROVED_MESSAGE= The toolbar has been redesign to improve its usability.
|
||||||
COLLABORATE=Collaborate
|
COLLABORATE=Collaborate
|
||||||
GO_TO= Go to my maps
|
GO_TO= Go to my maps
|
||||||
NEWS_AND_ARTICLES=News & Articles
|
|
||||||
NEWS_TITLE_EMBEDDED_MAPS=Embed your maps in anyplace
|
|
||||||
NEWS_DESC_EMBEDDED_MAPS=With this new feature, you can embed your maps in blogs and web pages.
|
|
||||||
NEWS_TITLE_FREEMIND=FreeMind import and export
|
|
||||||
NEWS_DESC_FREEMIND=Now, you can import and export your FreeMind maps.
|
|
||||||
NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping let's you create the most powerfull mind maps using the keyboard
|
|
||||||
JOIN_WISEMAPPING=Join WiseMapping
|
JOIN_WISEMAPPING=Join WiseMapping
|
||||||
IT_IS_FREE=It's free!
|
IT_IS_FREE=It's free!
|
||||||
EDITOR_HELP=A Help button has been placed at the bottom-left corner of the editor. From there you can see all the editor keyboard shortcuts you can use while editing your maps, and a quick tutorial on how to use the editor.
|
EDITOR_HELP=A Help button has been placed at the bottom-left corner of the editor. From there you can see all the editor keyboard shortcuts you can use while editing your maps, and a quick tutorial on how to use the editor.
|
||||||
SHRINK_TEXT=You can now collapse and expand nodes by clicking on the node's dot, or by pressing the space bar button.
|
|
||||||
EDITOR_LINKS=Mind Map feature: Add links to the topics
|
EDITOR_LINKS=Mind Map feature: Add links to the topics
|
||||||
EDITOR_LINKS_SHORT=Add links to the topics
|
EDITOR_LINKS_SHORT=Add links to the topics
|
||||||
#####FOOTER
|
#####FOOTER
|
||||||
@ -278,3 +265,16 @@ EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' an
|
|||||||
EXPORT_FORMAT_RESTRICTIONS=Exporting to Image, PDF or SVG is available only in the editor toolbar.
|
EXPORT_FORMAT_RESTRICTIONS=Exporting to Image, PDF or SVG is available only in the editor toolbar.
|
||||||
STARRED=Starred
|
STARRED=Starred
|
||||||
LOADING_MSG=Loading ...
|
LOADING_MSG=Loading ...
|
||||||
|
ALL_MAPS=All
|
||||||
|
MY_MAPS=My Maps
|
||||||
|
SHARED_WITH_ME=Shared With Me
|
||||||
|
PUBLIC_MAPS=Public Maps
|
||||||
|
ACCEPT=Accept
|
||||||
|
SAVING=Saving
|
||||||
|
INFO=Info
|
||||||
|
DELETE_MINDMAP=Delete
|
||||||
|
DUPLICATE=Duplicate
|
||||||
|
CREATE=Create
|
||||||
|
LANGUAGE=Language
|
||||||
|
REMOVE=Borrar
|
||||||
|
IMPORT_MINDMAP=Import Map
|
@ -1,7 +1,6 @@
|
|||||||
NAME=Nombre
|
NAME=Nombre
|
||||||
DESCRIPTION=Descripción
|
DESCRIPTION=Descripción
|
||||||
OK=Ok
|
OK=Ok
|
||||||
WISEMAPPING=WiseMapping
|
|
||||||
SITE.TITLE=WiseMapping
|
SITE.TITLE=WiseMapping
|
||||||
SITE.SLOGAN=COMPLETE
|
SITE.SLOGAN=COMPLETE
|
||||||
ADD=Agregar
|
ADD=Agregar
|
||||||
@ -25,7 +24,7 @@ SAVE_AND_CLOSE=Grabar y Salir
|
|||||||
RETYPE_PASSWORD=Reingresar contraseña
|
RETYPE_PASSWORD=Reingresar contraseña
|
||||||
REGISTER=Registración
|
REGISTER=Registración
|
||||||
REMEMBER_ME=Recordar mi sesión
|
REMEMBER_ME=Recordar mi sesión
|
||||||
SIGN_IN=Entrar
|
SIGN_IN=Ingresar
|
||||||
SIGN_UP=Registrate
|
SIGN_UP=Registrate
|
||||||
ACCOUNT=Configuración
|
ACCOUNT=Configuración
|
||||||
USERNAME=Nombre de usuario
|
USERNAME=Nombre de usuario
|
||||||
@ -83,7 +82,6 @@ WORD_VERIFICATION=Verificación de palabra
|
|||||||
TERM_OF_THE_SERVICE=Términos de servicio:
|
TERM_OF_THE_SERVICE=Términos de servicio:
|
||||||
FORGOT_PASSWORD_MESSAGE=Ingrese su e-mail para iniciar el proceso de recuperación de su contraseña.
|
FORGOT_PASSWORD_MESSAGE=Ingrese su e-mail para iniciar el proceso de recuperación de su contraseña.
|
||||||
LOADING_MSG=Cargando...
|
LOADING_MSG=Cargando...
|
||||||
SEARCH_FIELD=Título o etiqueta del mapa
|
|
||||||
TRYNOW= Prueba la Demo!
|
TRYNOW= Prueba la Demo!
|
||||||
FIELD_REQUIRED=Campo requerido
|
FIELD_REQUIRED=Campo requerido
|
||||||
EMAIL_ALREADY_EXIST=e-mail ya existente
|
EMAIL_ALREADY_EXIST=e-mail ya existente
|
||||||
@ -115,7 +113,7 @@ CURRENT_CONTACTS = Contactos actuales
|
|||||||
MESSAGE=Mensaje
|
MESSAGE=Mensaje
|
||||||
COLLABORATION=Colaboración
|
COLLABORATION=Colaboración
|
||||||
SHARE_DETAILS=Comparta los mapas con sus colegas. Invitelos a colaborar con usted.
|
SHARE_DETAILS=Comparta los mapas con sus colegas. Invitelos a colaborar con usted.
|
||||||
NEW_MAP_MSG=Llene todos los campos para crear un mapa nuevo
|
NEW_MAP_MSG=Crear un nuevo mapa
|
||||||
|
|
||||||
TAG=Etiqueta
|
TAG=Etiqueta
|
||||||
PUBLISH=Publicar
|
PUBLISH=Publicar
|
||||||
@ -140,7 +138,6 @@ TAG_IT=Etiquetalo!
|
|||||||
PUBLISH_IT=Publicalo!
|
PUBLISH_IT=Publicalo!
|
||||||
UNSUPPORTED_BROWSER=Navegador no soportado
|
UNSUPPORTED_BROWSER=Navegador no soportado
|
||||||
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
|
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
|
||||||
TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
|
|
||||||
COMMA_SEPARATED_EMAILS=E-mails separados por comas
|
COMMA_SEPARATED_EMAILS=E-mails separados por comas
|
||||||
INVITE_USERS=Invitar usuarios
|
INVITE_USERS=Invitar usuarios
|
||||||
AS_COLLABORATOR=como Colaborador
|
AS_COLLABORATOR=como Colaborador
|
||||||
@ -200,29 +197,16 @@ UNEXPECTED_ERROR_DETAILS=Disculpas, un error ha ocurrido y no podremos procesar
|
|||||||
NO_ENOUGH_PERMISSIONS=Outch!!. EL mapa buscado no se encuentra disponible.
|
NO_ENOUGH_PERMISSIONS=Outch!!. EL mapa buscado no se encuentra disponible.
|
||||||
NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado.
|
NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado.
|
||||||
SHARING=Colaboración
|
SHARING=Colaboración
|
||||||
IMPORT_MINDMAP=Importar mapa
|
IMPORT_MINDMAP=Importar Mapa
|
||||||
IMPORT_MINDMAP_DETAILS=
|
|
||||||
PRINT=Imprimir
|
PRINT=Imprimir
|
||||||
IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind válido
|
IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind válido
|
||||||
MAP_TITLE_ALREADY_EXISTS=Nombre de mapa ya existente.
|
MAP_TITLE_ALREADY_EXISTS=Nombre de mapa ya existente.
|
||||||
EMBEDDED_VIEWER=Incluya un visor de mapa en su sitio web, blog o post.
|
EMBEDDED_VIEWER=Incluya un visor de mapa en su sitio web, blog o post.
|
||||||
EMBEDDED_VIEWER_MESSAGE=Una vez que su mapa es publico, usted podrá incorporar un visor de mapas mentales en su propio sitio web, blog o post tal como lo hicimos aquí! just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
|
EMBEDDED_VIEWER_MESSAGE=Una vez que su mapa es publico, usted podrá incorporar un visor de mapas mentales en su propio sitio web, blog o post tal como lo hicimos aquí! just as we did it here!<br/>Try it!!, you can drag nodes, pan the map, and zoom in and out.
|
||||||
FREEMIND_EXPORT_IMPORT=Importar y exportar mapas desde/hacia FreeMind
|
FREEMIND_EXPORT_IMPORT=Importar y exportar mapas desde/hacia FreeMind
|
||||||
FREEMIND_EXPORT_IMPORT_MESSAGE=Ahora puedes importar y exportar mapas mentales desde/hacia FreeMind.
|
|
||||||
EDITOR_TOOLBAR_IMPROVED=La barra de herramientas ha sido rediseñr;ada.
|
|
||||||
EDITOR_TOOLBAR_IMPROVED_MESSAGE=La barra de herramientas ha sido rediseñada para mejorar la usabilidad.
|
|
||||||
COLLABORATE=Colaborar
|
COLLABORATE=Colaborar
|
||||||
PRINT_FEATURE_IMPLEMENTED=Ahora puedes imprimir tus mapas
|
|
||||||
EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
|
EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
|
||||||
|
|
||||||
NEWS_AND_ARTICLES=Noticias y Articulos
|
|
||||||
NEWS_TITLE_EMBEDDED_MAPS=Incluya sus mapas en cualquier lugar
|
|
||||||
NEWS_DESC_EMBEDDED_MAPS=Con esta nueva funcionalidad puede incluir sus mapas en blogs y sitios web.
|
|
||||||
NEWS_TITLE_FREEMIND=Importar y exportar mapas de FreeMind
|
|
||||||
NEWS_DESC_FREEMIND=Ahora, puede importar y exportar sus mapas con formato de FreeMind.
|
|
||||||
NEWS_TITLE_KEYBOARD_NAVIGATION=
|
|
||||||
NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping lo deja crear sus mapas mentales utilzando solo el teclado.
|
|
||||||
|
|
||||||
JOIN_WISEMAPPING=Utilice WiseMapping
|
JOIN_WISEMAPPING=Utilice WiseMapping
|
||||||
IT_IS_FREE=Es gratis!
|
IT_IS_FREE=Es gratis!
|
||||||
|
|
||||||
@ -253,3 +237,27 @@ UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible
|
|||||||
UNDO=Rehacer
|
UNDO=Rehacer
|
||||||
TYPE=Tipo
|
TYPE=Tipo
|
||||||
NOTE=Nota
|
NOTE=Nota
|
||||||
|
SHARE=Compartir
|
||||||
|
SHAPE=Figura
|
||||||
|
SEND_ME_A_NEW_PASSWORD=Enviar Nuevo Password
|
||||||
|
ALL_MAPS=Todos
|
||||||
|
CREATE=Crear
|
||||||
|
DUPLICATE=Duplicar
|
||||||
|
DELETE_MINDMAP=Borrar
|
||||||
|
INFO=Infomaci<EFBFBD>n
|
||||||
|
SAVING=Grabando
|
||||||
|
PUBLIC_MAPS=Mapas Publicos
|
||||||
|
MY_MAPS=Mis Mapas
|
||||||
|
NEW_PASSWORD=Nuevo Password
|
||||||
|
LANGUAGE=Idioma
|
||||||
|
SHARED_WITH_ME=Compartidos
|
||||||
|
ACCEPT=Aceptar
|
||||||
|
IMPORT=Importar
|
||||||
|
HISTORY=Historia
|
||||||
|
ITALIC=Italica
|
||||||
|
INVALID_EMAIL_ERROR=El e-mail no fue verificado
|
||||||
|
ICON=Icono
|
||||||
|
LAST_UPDATE=Ultima Actualización
|
||||||
|
LAST_UPDATE_BY=Ultima Actualización Por
|
||||||
|
SIZE=Tamaño
|
||||||
|
NO_PRODUCTION_DATABASE_CONFIGURED=COMPLETE
|
||||||
|
@ -119,7 +119,7 @@ CURRENT_CONTACTS = Contacts actuels
|
|||||||
MESSAGE = Message
|
MESSAGE = Message
|
||||||
COLLABORATION = Contribution
|
COLLABORATION = Contribution
|
||||||
SHARE_DETAILS = Partagez vos cartes avec vos amis ou vos coll\u00e8gues. Donnez-leur acc\u00e8s \u00e0 vos cartes et invitez-les \u00e0 se joindre \u00e0 votre r\u00e9flexion.
|
SHARE_DETAILS = Partagez vos cartes avec vos amis ou vos coll\u00e8gues. Donnez-leur acc\u00e8s \u00e0 vos cartes et invitez-les \u00e0 se joindre \u00e0 votre r\u00e9flexion.
|
||||||
NEW_MAP_MSG = Renseignez tous les champs pour cr<63>er une nouvelle carte.
|
NEW_MAP_MSG =
|
||||||
TAG = Mot-cl\u00e9
|
TAG = Mot-cl\u00e9
|
||||||
PUBLISH = Publier
|
PUBLISH = Publier
|
||||||
PUBLISH_MSG = Il est possible d\'utiliser vos cartes dans votre site internet et votre blog!
|
PUBLISH_MSG = Il est possible d\'utiliser vos cartes dans votre site internet et votre blog!
|
||||||
@ -238,3 +238,11 @@ CONTACT=COMPLETE
|
|||||||
COPYRIGHT=COMPLETE
|
COPYRIGHT=COMPLETE
|
||||||
CONFIRM_NEW_PASSWORD=COMPLETE
|
CONFIRM_NEW_PASSWORD=COMPLETE
|
||||||
UNEXPECTED_ERROR_SERVER_ERROR=COMPLETE
|
UNEXPECTED_ERROR_SERVER_ERROR=COMPLETE
|
||||||
|
SEND_ME_A_NEW_PASSWORD=COMPLETE
|
||||||
|
ALL_MAPS=COMPLETE
|
||||||
|
CREATE=COMPLETE
|
||||||
|
DUPLICATE=COMPLETE
|
||||||
|
DELETE_MINDMAP=COMPLETE
|
||||||
|
INFO=COMPLETE
|
||||||
|
SAVING=COMPLETE
|
||||||
|
PUBLIC_MAPS=COMPLETE
|
@ -35,8 +35,7 @@
|
|||||||
</set>
|
</set>
|
||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
<bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
|
<bean id="userLocaleInterceptor" class="com.wisemapping.filter.UserLocaleInterceptor">
|
||||||
<property name="paramName" value="language"/>
|
|
||||||
</bean>
|
</bean>
|
||||||
</mvc:interceptors>
|
</mvc:interceptors>
|
||||||
|
|
||||||
|
@ -2,11 +2,20 @@
|
|||||||
@import "bootstrap/css/bootstrap-responsive.min.css";
|
@import "bootstrap/css/bootstrap-responsive.min.css";
|
||||||
@import "css/pageHeaders.css";
|
@import "css/pageHeaders.css";
|
||||||
|
|
||||||
|
@html-background: #dedederepeat-x scroll
|
||||||
|
|
||||||
@html-background: #dedede repeat-x scroll;
|
;
|
||||||
@body-width: 956px;
|
@body-width: 956px;
|
||||||
|
|
||||||
@font-family: "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif";
|
@font-family: "Lucida Grande",
|
||||||
|
"Arial"
|
||||||
|
,
|
||||||
|
"Helvetica"
|
||||||
|
,
|
||||||
|
"Verdana"
|
||||||
|
,
|
||||||
|
"sans-serif"
|
||||||
|
;
|
||||||
@base-font-size: 11px;
|
@base-font-size: 11px;
|
||||||
|
|
||||||
@base-margin: 10px;
|
@base-margin: 10px;
|
||||||
@ -29,7 +38,6 @@
|
|||||||
-moz-border-radius: @radius;
|
-moz-border-radius: @radius;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------ Table --------------------------------- */
|
/* ------------------------------ Table --------------------------------- */
|
||||||
|
|
||||||
@table-gap: 2%;
|
@table-gap: 2%;
|
||||||
@ -81,7 +89,6 @@ input#selectAll {
|
|||||||
background-color: white;
|
background-color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<%@ page autoFlush="true" buffer="none" %>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
|
||||||
<div style="position:relative;">
|
<div style="position:relative;">
|
||||||
<div id="prompt">
|
<div id="prompt">
|
||||||
<!-- if IE without GCF, prompt goes here -->
|
<!-- if IE without GCF, prompt goes here -->
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<%@ page autoFlush="true" buffer="none" %>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<h2><spring:message code="INSTALL_CFG"/></h2>
|
<h2><spring:message code="INSTALL_CFG"/></h2>
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li class="active"><a href="#changeUserPanel" data-toggle="pill">General</a></li>
|
<li class="active"><a href="#changeUserPanel" data-toggle="pill">General</a></li>
|
||||||
<li><a href="#changePasswordPanel" data-toggle="pill">Security</a></li>
|
<li><a href="#changePasswordPanel" data-toggle="pill">Security</a></li>
|
||||||
|
<li><a href="#languagePanel" data-toggle="pill">Language</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
@ -25,7 +27,6 @@
|
|||||||
|
|
||||||
<label for="lastname"><strong><spring:message code="LASTNAME"/>:</strong></label>
|
<label for="lastname"><strong><spring:message code="LASTNAME"/>:</strong></label>
|
||||||
<input type="text" name="lastname" id="lastname" required="required" value="${user.lastname}"/>
|
<input type="text" name="lastname" id="lastname" required="required" value="${user.lastname}"/>
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary" value="Save"/>
|
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary" value="Save"/>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
@ -48,12 +49,30 @@
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="tab-pane fade" id="languagePanel">
|
||||||
|
<div id="languageMsg" class="alert">
|
||||||
|
</div>
|
||||||
|
<form action="#" method="POST" id="languageForm">
|
||||||
|
<fieldset>
|
||||||
|
<label for="language"><strong><spring:message code="LANGUAGE"/>:</strong></label>
|
||||||
|
<select name="language" id="language">
|
||||||
|
<option value="en">English</option>
|
||||||
|
<option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Español
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<br/>
|
||||||
|
<input type="submit" id="changeLanguageBtn" class="btn btn-primary"
|
||||||
|
value="<spring:message code="CHANGE_LANGUAGE"/>"/>
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$('#changePasswordMsg').hide();
|
$('#changePasswordMsg').hide();
|
||||||
$('#changeInfoMsg').hide();
|
$('#changeInfoMsg').hide();
|
||||||
|
$('#languageMsg').hide();
|
||||||
|
|
||||||
function postChange(url, postBody, msgContainerId, successMsg) {
|
function postChange(url, postBody, msgContainerId, successMsg) {
|
||||||
// Change success message ...
|
// Change success message ...
|
||||||
@ -92,10 +111,15 @@
|
|||||||
|
|
||||||
var fistname = $('#changeUserForm #firstname').val();
|
var fistname = $('#changeUserForm #firstname').val();
|
||||||
var lastname = $('#changeUserForm #lastname').val();
|
var lastname = $('#changeUserForm #lastname').val();
|
||||||
|
|
||||||
postChange("service/account/firstname", fistname, 'changeInfoMsg', 'Your info has been changed successfully');
|
postChange("service/account/firstname", fistname, 'changeInfoMsg', 'Your info has been changed successfully');
|
||||||
postChange("service/account/lastname", lastname, 'changeInfoMsg', 'Your info has been changed successfully');
|
postChange("service/account/lastname", lastname, 'changeInfoMsg', 'Your info has been changed successfully');
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#languageForm').submit(function (event) {
|
||||||
|
|
||||||
|
var locale = $('#languageForm option:selected').val();
|
||||||
|
postChange("service/account/locale", locale, 'languageMsg', 'Your info has been changed successfully');
|
||||||
|
event.preventDefault();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div class="modalDialog">
|
<div class="modalDialog">
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div class="modalDialog">
|
<div class="modalDialog">
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<h2>Opps!!!. Your browser is not currently supported</h2>
|
<h2>Ups!!!. Your browser is not currently supported</h2>
|
||||||
|
|
||||||
<p>Your browser has not been fully tested and it might not be completely functional. WiseMapping has been optimized
|
<p>Your browser has not been fully tested and it might not be completely functional. WiseMapping has been optimized
|
||||||
for:</p>
|
for:</p>
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
|
|
||||||
<tiles:importAttribute name="title" scope="page"/>
|
<tiles:importAttribute name="title" scope="page"/>
|
||||||
<tiles:importAttribute name="details" scope="page"/>
|
<tiles:importAttribute name="details" scope="page"/>
|
||||||
@ -9,7 +11,6 @@
|
|||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}/">
|
<base href="${baseURL}/">
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
@ -1,12 +1,17 @@
|
|||||||
<!DOCTYPE HTML>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<tiles:importAttribute name="title" scope="page"/>
|
<tiles:importAttribute name="title" scope="page"/>
|
||||||
<tiles:importAttribute name="details" scope="page"/>
|
<tiles:importAttribute name="details" scope="page"/>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
<div>
|
<div>
|
||||||
<tiles:insertAttribute name="body"/>
|
<tiles:insertAttribute name="body"/>
|
||||||
</div>
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -1,58 +0,0 @@
|
|||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
<div>
|
|
||||||
<form:form method="post" commandName="editProfile">
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<spring:message code="FIRSTNAME"/>
|
|
||||||
:
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="firstname" id="firstname" tabindex="1"/>
|
|
||||||
<form:errors path="firstname" cssClass="errorMsg"/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<spring:message code="LASTNAME"/>
|
|
||||||
:
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="lastname" id="lastname" tabindex="2"/>
|
|
||||||
<form:errors path="lastname" cssClass="errorMsg"/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<spring:message code="EMAIL"/>
|
|
||||||
:
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="email" id="email" tabindex="3"/>
|
|
||||||
<form:errors path="email" cssClass="errorMsg"/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
<spring:message code="NEWSLETTER_DESC"/>
|
|
||||||
:
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:checkbox path="allowSendEmail" id="allowSendEmail" tabindex="4"/>
|
|
||||||
<form:errors path="allowSendEmail" cssClass="errorMsg"/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td> </td>
|
|
||||||
<td>
|
|
||||||
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
|
|
||||||
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
|
|
||||||
onclick="MOOdalBox.close();">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</form:form>
|
|
||||||
</div>
|
|
@ -1,8 +1,18 @@
|
|||||||
<%@page pageEncoding="UTF-8" %>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
|
||||||
|
<%@ page import="com.wisemapping.model.User" %>
|
||||||
|
<%@ page import="com.wisemapping.security.Utils" %>
|
||||||
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
|
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
|
||||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||||
|
|
||||||
|
<%
|
||||||
|
User user = Utils.getUser(false);
|
||||||
|
if (user != null) {
|
||||||
|
request.setAttribute("principal", user);
|
||||||
|
}
|
||||||
|
%>
|
||||||
|
|
||||||
<div id="settings-dialog-modal" class="modal fade">
|
<div id="settings-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
@ -12,7 +22,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
|
<button class="btn btn-cancel"><spring:message code="CLOSE"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="header">
|
<div id="header">
|
||||||
@ -39,17 +49,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</c:when>
|
</c:when>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
<div class="header_languages">
|
|
||||||
<div class="header_language_flag">
|
|
||||||
<a href="/c/login?language=en"><img src="/images/flag-uk.gif" alt="English"></a>
|
|
||||||
</div>
|
|
||||||
<div class="header_language_flag">
|
|
||||||
<a href="/c/login?language=fr"><img src="/images/flag-fr.gif" alt="Frances"></a>
|
|
||||||
</div>
|
|
||||||
<div class="header_language_flag">
|
|
||||||
<a href="/c/login?language=es"><img src="/images/flag-es.gif" alt="Español"></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<c:if test="${param.onlyActionHeader!=true}">
|
<c:if test="${param.onlyActionHeader!=true}">
|
||||||
@ -68,11 +67,14 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$('#userSettingsBtn').click(
|
$('#userSettingsBtn').click(
|
||||||
function (event) {
|
function (event) {
|
||||||
$('#settings-dialog-modal .modal-body').load("/c/account/settings"),function() {
|
$('#settings-dialog-modal .modal-body').load("/c/account/settings",
|
||||||
$('#settings-dialog-modal .btn-accept').unbind('click').click(function() {
|
function () {
|
||||||
// hacer lago ...
|
$('#settings-dialog-modal .btn-cancel').unbind('click').click(function () {
|
||||||
|
$('#settings-dialog-modal').modal("hide");
|
||||||
|
window.location.reload();
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
);
|
||||||
$('#settings-dialog-modal').modal();
|
$('#settings-dialog-modal').modal();
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<%
|
<%
|
||||||
response.sendRedirect(request.getContextPath() + "/c/maps/");
|
response.sendRedirect(request.getContextPath() + "/c/maps/");
|
||||||
%>
|
%>
|
@ -1,6 +1,8 @@
|
|||||||
<!DOCTYPE HTML>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<iframe src='${url}' style="border: 0;width: 100%;height:100%" id="dialogContentIframe"></iframe>
|
<iframe src='${url}' style="border: 0;width: 100%;height:100%" id="dialogContentIframe"></iframe>
|
||||||
<div style="float: right;margin-right: 25px">
|
<div style="float: right;margin-right: 25px">
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
<%@ page session="false" contentType="text/html;charset=UTF-8" %>
|
|
||||||
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
|
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
|
||||||
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||||
<%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
<%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
<%--@elvariable id="isHsql" type="boolean"--%>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
<%--@elvariable id="isHsql" type="boolean"--%>
|
||||||
|
|
||||||
<script type="text/javascript" language="javascript">
|
<script type="text/javascript" language="javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$('.btn-primary').click(function() {
|
$('.btn-primary').click(function() {
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
<%--@elvariable id="mindmap" type="com.wisemapping.view.MindMapBean"--%>
|
<%--@elvariable id="mindmap" type="com.wisemapping.view.MindMapBean"--%>
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||||
@ -5,12 +8,10 @@
|
|||||||
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
||||||
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}/">
|
<base href="${baseURL}/">
|
||||||
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
<!DOCTYPE HTML>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<div id="keyboardTable">
|
<div id="keyboardTable">
|
||||||
<table>
|
<table>
|
||||||
<colgroup>
|
<colgroup>
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||||
@ -5,18 +8,11 @@
|
|||||||
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
||||||
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||||
|
|
||||||
<%@ page import="java.text.DateFormat" %>
|
|
||||||
<%@ page import="java.text.SimpleDateFormat" %>
|
|
||||||
<%@ page import="java.util.Calendar" %>
|
|
||||||
|
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}/">
|
<base href="${baseURL}/">
|
||||||
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<p class="alert alert-info">
|
<p class="alert alert-info">
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}">
|
<base href="${baseURL}">
|
||||||
<title><spring:message code="SITE.TITLE"/></title>
|
<title><spring:message code="SITE.TITLE"/></title>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
@ -52,11 +53,16 @@
|
|||||||
<div id="foldersContainer">
|
<div id="foldersContainer">
|
||||||
<ul class="nav nav-list">
|
<ul class="nav nav-list">
|
||||||
<li class="nav-header">Filters</li>
|
<li class="nav-header">Filters</li>
|
||||||
<li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> All</a></li>
|
<li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> <spring:message
|
||||||
<li data-filter="my_maps"><a href="#"><i class="icon-user"></i> My Maps</a></li>
|
code="ALL_MAPS"/></a></li>
|
||||||
<li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> Shared With Me</a></li>
|
<li data-filter="my_maps"><a href="#"><i class="icon-user"></i> <spring:message code="MY_MAPS"/></a>
|
||||||
<li data-filter="starred"><a href="#"><i class="icon-star"></i> Starred</a></li>
|
</li>
|
||||||
<li data-filter="public"><a href="#"><i class="icon-globe"></i> Public Maps</a></li>
|
<li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> <spring:message
|
||||||
|
code="SHARED_WITH_ME"/></a></li>
|
||||||
|
<li data-filter="starred"><a href="#"><i class="icon-star"></i> <spring:message code="STARRED"/></a>
|
||||||
|
</li>
|
||||||
|
<li data-filter="public"><a href="#"><i class="icon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -121,7 +127,7 @@
|
|||||||
<div id="new-dialog-modal" title="Add new map" class="modal fade">
|
<div id="new-dialog-modal" title="Add new map" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Create a new map</h3>
|
<h3><spring:message code="NEW_MAP_MSG"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="errorMessage"></div>
|
<div class="errorMessage"></div>
|
||||||
@ -141,8 +147,9 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving ...">Create</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
code="CREATE"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -172,8 +179,9 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving ...">Duplicate</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/> ...">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
<spring:message code="DUPLICATE"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -201,8 +209,9 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving ...">Rename</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
code="RENAME"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -210,7 +219,7 @@
|
|||||||
<div id="delete-dialog-modal" class="modal fade">
|
<div id="delete-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Delete MindMap</h3>
|
<h3><spring:message code="DELETE_MINDMAP"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="alert alert-block">
|
<div class="alert alert-block">
|
||||||
@ -219,8 +228,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving ...">Delete</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
code="DELETE"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -228,13 +238,13 @@
|
|||||||
<div id="info-dialog-modal" class="modal fade">
|
<div id="info-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Info</h3>
|
<h3><spring:message code="INFO"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Close</button>
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -242,14 +252,15 @@
|
|||||||
<div id="publish-dialog-modal" class="modal fade">
|
<div id="publish-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Publish</h3>
|
<h3><spring:message code="PUBLISH"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving...">Accept</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>...">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
<spring:message code="ACCEPT"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -257,14 +268,15 @@
|
|||||||
<div id="export-dialog-modal" class="modal fade">
|
<div id="export-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Export</h3>
|
<h3><spring:message code="EXPORT"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Exporting...">Export</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="Exporting..."><spring:message
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
code="EXPORT"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -272,14 +284,15 @@
|
|||||||
<div id="import-dialog-modal" class="modal fade">
|
<div id="import-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Import</h3>
|
<h3><spring:message code="IMPORT"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Importing...">Import</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="Importing..."><spring:message
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
code="IMPORT"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -287,14 +300,15 @@
|
|||||||
<div id="share-dialog-modal" class="modal fade">
|
<div id="share-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>Share</h3>
|
<h3><spring:message code="SHARE"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-primary btn-accept" data-loading-text="Saving ..">Accept</button>
|
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/> ...">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
|
<spring:message code="ACCEPT"/></button>
|
||||||
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -302,13 +316,13 @@
|
|||||||
<div id="history-dialog-modal" class="modal fade">
|
<div id="history-dialog-modal" class="modal fade">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button class="close" data-dismiss="modal">x</button>
|
<button class="close" data-dismiss="modal">x</button>
|
||||||
<h3>History</h3>
|
<h3><spring:message code="HISTORY"/></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn btn-cancel" data-dismiss="modal">Close</button>
|
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
<!DOCTYPE HTML>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
|
||||||
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
|
||||||
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
|
||||||
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||||
|
|
||||||
|
<!DOCTYPE HTML>
|
||||||
<%@ include file="/jsp/init.jsp" %>
|
|
||||||
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}/">
|
<base href="${baseURL}/">
|
||||||
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
#wizardContainer input {
|
#wizardContainer input {
|
||||||
width: 50px;
|
width: 50px;
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
#sharingContainer {
|
#sharingContainer {
|
||||||
height: 180px;
|
height: 180px;
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
|
|
||||||
<%@page pageEncoding="UTF-8" %>
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
<!DOCTYPE HTML>
|
||||||
|
|
||||||
|
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
|
||||||
<tiles:importAttribute name="title" scope="request"/>
|
<tiles:importAttribute name="title" scope="request"/>
|
||||||
<tiles:importAttribute name="details" scope="request"/>
|
<tiles:importAttribute name="details" scope="request"/>
|
||||||
|
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<base href="${baseURL}/">
|
<base href="${baseURL}/">
|
||||||
<title>
|
<title>
|
||||||
<spring:message code="SITE.TITLE"/>
|
<spring:message code="SITE.TITLE"/>-
|
||||||
-
|
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${requestScope.viewTitle!=null}">
|
<c:when test="${requestScope.viewTitle!=null}">
|
||||||
${requestScope.viewTitle}
|
${requestScope.viewTitle}
|
||||||
@ -21,7 +21,6 @@
|
|||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</title>
|
</title>
|
||||||
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
|
<link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
|
||||||
|
|
||||||
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
|
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<form:form method="post" commandName="changePassword">
|
<form:form method="post" commandName="changePassword">
|
||||||
<table>
|
<table>
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<script type="text/javascript" language="javascript">
|
<script type="text/javascript" language="javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$('.btn-primary').click(function() {
|
$('.btn-primary').click(function() {
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<h2>The email is not register or you account is not active yet.</h2>
|
<h2>The email is not register or you account is not active yet.</h2>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<h2>
|
<h2>
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div class="fform">
|
<div class="fform">
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<%@page pageEncoding="UTF-8" %>
|
||||||
<%@include file="/jsp/init.jsp" %>
|
<%@include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
@ -13,6 +13,7 @@ password varchar(255) NOT NULL,
|
|||||||
activationCode BIGINT NOT NULL,
|
activationCode BIGINT NOT NULL,
|
||||||
activation_date DATE,
|
activation_date DATE,
|
||||||
allowSendEmail CHAR(1) NOT NULL,
|
allowSendEmail CHAR(1) NOT NULL,
|
||||||
|
locale varchar(5),
|
||||||
FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id)
|
FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ password varchar(255) CHARACTER SET utf8 NOT NULL,
|
|||||||
activationCode BIGINT(20) NOT NULL,
|
activationCode BIGINT(20) NOT NULL,
|
||||||
activation_date date,
|
activation_date date,
|
||||||
allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0,
|
allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0,
|
||||||
|
locale varchar(5),
|
||||||
FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ON DELETE CASCADE ON UPDATE NO ACTION
|
FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ON DELETE CASCADE ON UPDATE NO ACTION
|
||||||
) CHARACTER SET utf8 ;
|
) CHARACTER SET utf8 ;
|
||||||
|
|
||||||
|
@ -31,6 +31,8 @@ ALTER TABLE ACCESS_AUDITORY
|
|||||||
, ADD INDEX `user_id` () ;
|
, ADD INDEX `user_id` () ;
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE `wisemapping`.`user` ADD COLUMN `locale` VARCHAR(5) NULL AFTER `allowSendEmail` ;
|
||||||
|
|
||||||
# INSERT INTO `wisemapping`.`collaborator` (`id`, `email`, `creation_date`) VALUES (8081, 'fake@wisemapping.com', '2007-10-09');
|
# INSERT INTO `wisemapping`.`collaborator` (`id`, `email`, `creation_date`) VALUES (8081, 'fake@wisemapping.com', '2007-10-09');
|
||||||
# DELETE FROM `wisemapping`.`USER` where activation_date is null;
|
# DELETE FROM `wisemapping`.`USER` where activation_date is null;
|
||||||
# DROP TABLE FEEDBACK;
|
# DROP TABLE FEEDBACK;
|
||||||
|
Loading…
Reference in New Issue
Block a user