diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index ab55add0..d3b0dd8a 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -454,7 +454,7 @@ org.mortbay.jetty jetty-maven-plugin - 8.1.0.v20120127 + 8.1.4.v20120524 foo 9999 diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java new file mode 100644 index 00000000..ebf33a27 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java @@ -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; + } +} diff --git a/wise-webapp/src/main/java/com/wisemapping/model/User.java b/wise-webapp/src/main/java/com/wisemapping/model/User.java index 13e6b97a..c0b82b98 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/User.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/User.java @@ -18,6 +18,8 @@ package com.wisemapping.model; +import org.jetbrains.annotations.NotNull; + import java.io.Serializable; import java.util.*; @@ -33,6 +35,8 @@ public class User private String username; private Set tags = new HashSet(); private boolean allowSendEmail = false; + private String locale; + public User() { } @@ -119,6 +123,7 @@ public class User } + public int hashCode() { int result; result = (firstname != null ? firstname.hashCode() : 0); @@ -136,4 +141,11 @@ public class User this.username = username; } + public String getLocale() { + return locale; + } + + public void setLocale(@NotNull String locale) { + this.locale = locale; + } } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java index 69c6a5ac..c6de33e3 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java @@ -80,6 +80,21 @@ public class AccountController extends BaseController { 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"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void changePassword(@RequestBody RestLogItem item) { diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml index 932df665..163b773a 100755 --- a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml +++ b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml @@ -28,6 +28,7 @@ + diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties index 36b7dedd..2e9aeb7e 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties @@ -2,7 +2,6 @@ NAME=Name DESCRIPTION=Description FILE_FORMAT=File Format OK=Ok -WISEMAPPING=WiseMapping ADD=Add ACTIONS=Actions ADD_COLLABORATORS=Add Collaborators @@ -31,18 +30,17 @@ SIGN_IN=Sign In SIGN_UP=Sign Up ACCOUNT=Account USERNAME=Username -BACK=Back CLOSE=Close NOT_READY_A_USER=Not a member yet? NOT_READY_A_USER_MESSAGE=Registration is free and takes just a moment. JOIN_NOW=Join Now! -REMOVE=Remove MINDMAP=Mindmap ROLE=Role YOUR_ROLE=Your Role CAPTCHA= Word Verification FORGOT_PASSWORD=Forgot Password ? CHANGE_PASSWORD=Change Password +CHANGE_LANGUAGE=Change Language FAQ=Frequent Asked Questions SHORT_FAQ=FAQ LOGIN=Login @@ -95,8 +93,6 @@ ALREADY_A_MEMBER=Already a member? WORD_VERIFICATION=Word Verification TERM_OF_THE_SERVICE=Terms of Service: 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 EMAIL_ALREADY_EXIST=Email already exists NO_VALID_EMAIL_ADDRESS=Invalid email address @@ -128,7 +124,7 @@ CURRENT_CONTACTS = Current Contacts MESSAGE=Message COLLABORATION= Collaboration 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 PUBLISH=Publish @@ -153,7 +149,6 @@ TAG_IT=Tag It PUBLISH_IT=Publish It UNSUPPORTED_BROWSER=Unsupported Browser FIELD_REQUIRED_MSG=Fields marked with an asterisk * 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 INVITE_USERS=Invite Users 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_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!
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_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_MESSAGE= The toolbar has been redesign to improve its usability. COLLABORATE=Collaborate 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 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. -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_SHORT=Add links to the topics #####FOOTER @@ -277,4 +264,17 @@ IMPORT=Import 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. EXPORT_FORMAT_RESTRICTIONS=Exporting to Image, PDF or SVG is available only in the editor toolbar. STARRED=Starred -LOADING_MSG=Loading ... \ No newline at end of file +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 \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties index 53347cf5..397b5437 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties @@ -1,7 +1,6 @@ NAME=Nombre DESCRIPTION=Descripción OK=Ok -WISEMAPPING=WiseMapping SITE.TITLE=WiseMapping SITE.SLOGAN=COMPLETE ADD=Agregar @@ -25,7 +24,7 @@ SAVE_AND_CLOSE=Grabar y Salir RETYPE_PASSWORD=Reingresar contraseña REGISTER=Registración REMEMBER_ME=Recordar mi sesión -SIGN_IN=Entrar +SIGN_IN=Ingresar SIGN_UP=Registrate ACCOUNT=Configuración USERNAME=Nombre de usuario @@ -83,7 +82,6 @@ WORD_VERIFICATION=Verificación de palabra 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. LOADING_MSG=Cargando... -SEARCH_FIELD=Título o etiqueta del mapa TRYNOW= Prueba la Demo! FIELD_REQUIRED=Campo requerido EMAIL_ALREADY_EXIST=e-mail ya existente @@ -115,7 +113,7 @@ CURRENT_CONTACTS = Contactos actuales MESSAGE=Mensaje COLLABORATION=Colaboración 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 PUBLISH=Publicar @@ -140,7 +138,6 @@ TAG_IT=Etiquetalo! PUBLISH_IT=Publicalo! UNSUPPORTED_BROWSER=Navegador no soportado FIELD_REQUIRED_MSG=Fields marked with an asterisk * 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 INVITE_USERS=Invitar usuarios 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_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado. SHARING=Colaboración -IMPORT_MINDMAP=Importar mapa -IMPORT_MINDMAP_DETAILS= +IMPORT_MINDMAP=Importar Mapa PRINT=Imprimir IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind válido 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_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!
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_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 -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. -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 IT_IS_FREE=Es gratis! @@ -252,4 +236,28 @@ COPYRIGHT=Impulsado por WiseMapping UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible procesar su pedido. Recargue la pagina y intentolo nuevamente. Si el problema persiste, contactenos a support@wisemapping.com UNDO=Rehacer TYPE=Tipo -NOTE=Nota \ No newline at end of file +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�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 diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.review similarity index 98% rename from wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties rename to wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.review index 4f264570..316d05cb 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.review @@ -119,7 +119,7 @@ CURRENT_CONTACTS = Contacts actuels MESSAGE = Message 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. -NEW_MAP_MSG = Renseignez tous les champs pour cr�er une nouvelle carte. +NEW_MAP_MSG = TAG = Mot-cl\u00e9 PUBLISH = Publier PUBLISH_MSG = Il est possible d\'utiliser vos cartes dans votre site internet et votre blog! @@ -237,4 +237,12 @@ CHANGE_PASSWORD_SUCCESS=COMPLETE CONTACT=COMPLETE COPYRIGHT=COMPLETE CONFIRM_NEW_PASSWORD=COMPLETE -UNEXPECTED_ERROR_SERVER_ERROR=COMPLETE \ No newline at end of file +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 \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index 54d2a1c7..dfa371cc 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -35,8 +35,7 @@ - - + diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index cc861333..d234fb3a 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -2,11 +2,20 @@ @import "bootstrap/css/bootstrap-responsive.min.css"; @import "css/pageHeaders.css"; +@html-background: #dedederepeat-x scroll -@html-background: #dedede repeat-x scroll; +; @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-margin: 10px; @@ -23,22 +32,21 @@ padding: @base-padding; } -.rounded-corners (@radius: 5px) { - border-radius: @radius; - -webkit-border-radius: @radius; - -moz-border-radius: @radius; +.rounded-corners(@radius: 5px){ + border-radius: @radius; + -webkit-border-radius: @radius; + -moz-border-radius: @radius; } - /* ------------------------------ Table --------------------------------- */ @table-gap: 2%; @table-width: 100%; #map-table { - width: 100% !important; + width: 100% !important; display: inline-block; - float:right; + float: right; border-top: 1px solid black } @@ -59,31 +67,30 @@ input#selectAll { @th-background-color: #FFFFFF; -.rounded-corners (@radius: 5px) { - border-radius: @radius; - -webkit-border-radius: @radius; - -moz-border-radius: @radius; +.rounded-corners(@radius: 5px){ + border-radius: @radius; + -webkit-border-radius: @radius; + -moz-border-radius: @radius; } .dataTables_processing { - position: absolute; - top: 50%; - left: 50%; - width: 250px; - height: 30px; - margin-left: -125px; - margin-top: -15px; - padding: 14px 0 2px 0; - border: 1px solid #ddd; - text-align: center; - color: #999; - font-size: 14px; - background-color: white; + position: absolute; + top: 50%; + left: 50%; + width: 250px; + height: 30px; + margin-left: -125px; + margin-top: -15px; + padding: 14px 0 2px 0; + border: 1px solid #ddd; + text-align: center; + color: #999; + font-size: 14px; + background-color: white; } - .dataTables_filter { - float:right; + float: right; } #mindmapListTable th { @@ -92,12 +99,12 @@ input#selectAll { /* Pagination Styles */ #paginateContainer { - height:40px; - width:100%; + height: 40px; + width: 100%; } .dataTables_length { - float: right; + float: right; } .dataTables_paginate { @@ -107,27 +114,27 @@ input#selectAll { /* ---------------------------- Sorting --------------------------------- */ .sorting_asc { - background: @th-background-color url('../images/sort_asc.png') no-repeat center right; + background: @th-background-color url('../images/sort_asc.png') no-repeat center right; } .sorting_desc { - background: @th-background-color url('../images/sort_desc.png') no-repeat center right; + background: @th-background-color url('../images/sort_desc.png') no-repeat center right; } .sorting { - background: @th-background-color url('../images/sort_both.png') no-repeat center right; + background: @th-background-color url('../images/sort_both.png') no-repeat center right; } .sorting_disabled { - background: @th-background-color; + background: @th-background-color; } .sorting_asc_disabled { - background: @th-background-color url('../images/sort_asc_disabled.png') no-repeat center right; + background: @th-background-color url('../images/sort_asc_disabled.png') no-repeat center right; } .sorting_desc_disabled { - background: @th-background-color url('../images/sort_desc_disabled.png') no-repeat center right; + background: @th-background-color url('../images/sort_desc_disabled.png') no-repeat center right; } /* ----------------------------- Misc ----------------------------------- */ @@ -137,10 +144,10 @@ input#selectAll { } .dataTables_empty { - text-align: center; + text-align: center; } -.row-selected { +.row-selected { background-color: #f5f5f5; } @@ -151,24 +158,24 @@ input#selectAll { #tableActions { float: right; width: 350px; - white-space:nowrap; + white-space: nowrap; } #tableActions > div { float: right; - margin-left:5px; + margin-left: 5px; } #pageInfo { - padding-top:5px; - padding-left:8px; + padding-top: 5px; + padding-left: 8px; font-weight: bold; } #tableFooter { - width:100%; - height:50px; - white-space:nowrap; + width: 100%; + height: 50px; + white-space: nowrap; } #foldersContainer { @@ -178,26 +185,26 @@ input#selectAll { margin-top: 80px } -span.starredOff{ +span.starredOff { background: url('../images/star-off.png') no-repeat center left; padding: 10px; margin: 0 0px 0 15px; } -span.starredOff:hover{ +span.starredOff:hover { background: url('../images/star-off-hover.png') no-repeat center left; } -span.starredOn{ +span.starredOn { background: url('../images/star-on.png') no-repeat center left; padding: 10px; margin: 0 0px 0 15px; } -span.starredOn:hover{ +span.starredOn:hover { background: url('../images/star-on-hover.png') no-repeat center left; } abbr[title] { - cursor:default; + cursor: default; } \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/skin.less b/wise-webapp/src/main/webapp/css/skin.less index 57e8771a..ff43407e 100644 --- a/wise-webapp/src/main/webapp/css/skin.less +++ b/wise-webapp/src/main/webapp/css/skin.less @@ -1,3 +1,3 @@ -@header-height : 75px; -@header-toolbar-height : 35px; -@header-info-height : @header-height - @header-toolbar-height; \ No newline at end of file +@header-height: 75px; +@header-toolbar-height: 35px; +@header-info-height: @header-height - @header-toolbar-height; \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/GCFInstall.jsp b/wise-webapp/src/main/webapp/jsp/GCFInstall.jsp index a271aee2..13c211e9 100644 --- a/wise-webapp/src/main/webapp/jsp/GCFInstall.jsp +++ b/wise-webapp/src/main/webapp/jsp/GCFInstall.jsp @@ -1,5 +1,6 @@ -<%@ page autoFlush="true" buffer="none" %> -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %> +
diff --git a/wise-webapp/src/main/webapp/jsp/GCFPluginRequired.jsp b/wise-webapp/src/main/webapp/jsp/GCFPluginRequired.jsp index 0ce893bc..0321a260 100644 --- a/wise-webapp/src/main/webapp/jsp/GCFPluginRequired.jsp +++ b/wise-webapp/src/main/webapp/jsp/GCFPluginRequired.jsp @@ -1,5 +1,5 @@ -<%@ page autoFlush="true" buffer="none" %> -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %>

diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index 6e7f815f..3e996c7a 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -1,9 +1,11 @@ -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %>
@@ -25,7 +27,6 @@ -
@@ -48,33 +49,51 @@
+
+
+
+
+
+ + +
+ "/> +
+
+
diff --git a/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp b/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp index 58571af4..46ae2bde 100755 --- a/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp +++ b/wise-webapp/src/main/webapp/jsp/activationAccountConfirmation.jsp @@ -1,4 +1,5 @@ -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %>
diff --git a/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp b/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp index 7ea5e3c0..af455959 100755 --- a/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp +++ b/wise-webapp/src/main/webapp/jsp/activationAccountConfirmationFail.jsp @@ -1,4 +1,5 @@ -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %>
diff --git a/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp b/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp index 569e27f9..3c9a1bde 100644 --- a/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp +++ b/wise-webapp/src/main/webapp/jsp/browserNotSupported.jsp @@ -1,6 +1,7 @@ -<%@ include file="/jsp/init.jsp" %> +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %> -

Opps!!!. Your browser is not currently supported

+

Ups!!!. Your browser is not currently supported

Your browser has not been fully tested and it might not be completely functional. WiseMapping has been optimized for:

diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp index 5279ba38..03576d20 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp @@ -1,7 +1,9 @@ +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %> + <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> -<%@ include file="/jsp/init.jsp" %> @@ -9,7 +11,6 @@ - diff --git a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp index 6fa10405..7b970028 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp @@ -1,12 +1,17 @@ - - +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> -<%@ include file="/jsp/init.jsp" %> + - + + + +
-
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/editProfile.jsp b/wise-webapp/src/main/webapp/jsp/editProfile.jsp deleted file mode 100755 index ba55105e..00000000 --- a/wise-webapp/src/main/webapp/jsp/editProfile.jsp +++ /dev/null @@ -1,58 +0,0 @@ -<%@ include file="/jsp/init.jsp" %> -
- - - - - - - - - - - - - - - - - - - - - - -
- * - - : - - - -
- * - - : - - - -
- * - - : - - - -
- - : - - - -
  - " class="btn-primary"> - " class="btn-primary" - onclick="MOOdalBox.close();"> -
- -
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp index e226a76a..2e8c87fa 100644 --- a/wise-webapp/src/main/webapp/jsp/header.jsp +++ b/wise-webapp/src/main/webapp/jsp/header.jsp @@ -1,8 +1,18 @@ <%@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="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<% + User user = Utils.getUser(false); + if (user != null) { + request.setAttribute("principal", user); + } +%> + -
-
- English -
-
- Frances -
-
- Español -
-
@@ -67,12 +66,15 @@