diff --git a/mindplot/src/main/javascript/Messages.js b/mindplot/src/main/javascript/Messages.js index 3f11f9ac..426509bd 100644 --- a/mindplot/src/main/javascript/Messages.js +++ b/mindplot/src/main/javascript/Messages.js @@ -78,8 +78,9 @@ mindplot.Messages.BUNDLES = { MAIN_TOPIC:'Main Topic', SUB_TOPIC:'Sub Topic', ISOLATED_TOPIC:'Isolated Topic', - CENTRAL_TOPIC: 'Central Topic', - ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE:'Children can not be collapsed. One topic must be selected.' + CENTRAL_TOPIC:'Central Topic', + ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE:'Children can not be collapsed. One topic must be selected.', + SHORTCUTS:'Keyboard Shortcuts' }, 'es':{ DISCARD_CHANGES:'Descartar Cambios', @@ -124,8 +125,9 @@ mindplot.Messages.BUNDLES = { MAIN_TOPIC:'Tópico Principal', SUB_TOPIC:'Tópico Secundario', ISOLATED_TOPIC:'Tópico Aislado', - CENTRAL_TOPIC: 'Tópico Central', - ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE:'Tópicos hijos no pueden ser colapsados. Solo un topic debe ser seleccionado.' + CENTRAL_TOPIC:'Tópico Central', + ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE:'Tópicos hijos no pueden ser colapsados. Solo un topic debe ser seleccionado.', + SHORTCUTS:'Accesos directos' } }; diff --git a/mindplot/src/main/resources/messages_en.properties b/mindplot/src/main/resources/messages_en.properties index 62c128ab..9c23210e 100644 --- a/mindplot/src/main/resources/messages_en.properties +++ b/mindplot/src/main/resources/messages_en.properties @@ -41,4 +41,5 @@ UNEXPECTED_ERROR_LOADING=We're sorry, an unexpected error has occurred.\nTry aga MAIN_TOPIC=Main Topic SUB_TOPIC=Sub Topic ISOLATED_TOPIC=Isolated Topic -CENTRAL_TOPIC=Central Topic \ No newline at end of file +CENTRAL_TOPIC=Central Topic +SHORTCUTS=Keyboard Shortcuts diff --git a/mindplot/src/main/resources/messages_es.properties b/mindplot/src/main/resources/messages_es.properties index ff981df3..0ad338e6 100644 --- a/mindplot/src/main/resources/messages_es.properties +++ b/mindplot/src/main/resources/messages_es.properties @@ -43,3 +43,4 @@ SUB_TOPIC=Tópico Secundario ISOLATED_TOPIC=Tópico Aislado CENTRAL_TOPIC=Tópico Central ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE=Tópicos hijos no pueden ser colapsados. Solo un topic debe ser seleccionado. +SHORTCUTS=Accesos directos diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java new file mode 100644 index 00000000..a187e920 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java @@ -0,0 +1,46 @@ +/* +* 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.exceptions.GoogleChromeFrameRequiredException; +import com.wisemapping.exceptions.UnsupportedBrowserException; +import org.jetbrains.annotations.NotNull; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter { + private Map attributes; + + public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception { + for (String key : attributes.keySet()) { + request.setAttribute(key, attributes.get(key)); + } + return true; + } + + public void setAttributes(Map attributes) { + this.attributes = attributes; + } +} diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java index d757d872..3891cb99 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java @@ -58,7 +58,7 @@ public class UsersController { @Autowired private ReCaptcha captchaService; - @Value("${registration.recaptcha.enabled}") + @Value("${google.recaptcha.enabled}") private boolean captchaEnabled; diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index 71ced63e..eb1907ec 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -68,12 +68,12 @@ mail.errorReporterEmail= registration.email.enabled = false # Enable captcha confirmation -registration.recaptcha.enabled = true +google.recaptcha.enabled = true # ReCaptcha is the default captcha. Public and private keys are required. # More Info: http://www.google.com/recaptcha . -registration.recaptcha.privateKey = 6LeQ4tISAAAAAMfHMPRKyHupTfA-KE4QeTCnLXhK -registration.recaptcha.publicKey = 6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr +google.recaptcha.privateKey = 6LeQ4tISAAAAAMfHMPRKyHupTfA-KE4QeTCnLXhK +google.recaptcha.publicKey = 6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr ################################################################################## # Site configuration @@ -85,3 +85,9 @@ admin.user = admin@wisemapping.org # Site URL. This url will be used during sharing emails and public views. site.baseurl = http://localhost:8080 + +################################################################################## +# Google Analytics Settings +################################################################################## +google.analytics.enabled=true +google.analytics.account=UA-XXXX \ No newline at end of file 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 4513c8a2..919132a6 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 @@ -203,4 +203,5 @@ CHANGE_TEXT_ITALIC=Change Text Italic DESELECT_ALL_TOPIC=Deselect All Topic SHORTCUTS=Shortcuts COLLAPSE_CHILDREN=Collapse Children +KEYBOARD_SHORTCUTS_MSG=Keyboard shortcuts can help you save time by allowing you to never take your hands off the keyboard to use the mouse. 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 52bae0d8..dc74bd6d 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 @@ -204,4 +204,5 @@ CHANGE_TEXT_ITALIC=Cambiar Texto a Italica DESELECT_ALL_TOPIC=Revertir Selecci\u00f3n de T\u00f3picos SHORTCUTS=Shortcuts COLLAPSE_CHILDREN=Colapsar Hijos +KEYBOARD_SHORTCUTS_MSG=Los accesos directos pueden ayudarte a salvar tiempo permitiendote no sacar las manos del teclado para usar el mouse. 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 f40ac797..9b55b5a3 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -15,6 +15,11 @@ + + + + + @@ -37,11 +42,16 @@ + + + + + + + + - - - @@ -73,8 +83,8 @@ class="org.springframework.web.servlet.i18n.SessionLocaleResolver"/> - - + + @@ -84,7 +94,7 @@ - + messages diff --git a/wise-webapp/src/main/webapp/favicon.ico b/wise-webapp/src/main/webapp/favicon.ico index e69de29b..f25eeaf4 100644 Binary files a/wise-webapp/src/main/webapp/favicon.ico and b/wise-webapp/src/main/webapp/favicon.ico differ diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index d8ab7606..65cb4037 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,4 +1,6 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp index 80dd67de..505e08b2 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp @@ -2,24 +2,27 @@ <%@ include file="/jsp/init.jsp" %> + +