diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index 6c8e5c6b..b46819a5 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -211,7 +211,7 @@ mindplot.widget.Menu = new Class({
{'class':'modalDialog exportModalDialog',
closeButton:true,
destroyOnClose:true,
- title:$msg('EXPORT')
+ title: $msg('EXPORT')
});
reqDialog.setRequestOptions({
onRequest:function () {
diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js
index e3aff480..6e7675c0 100644
--- a/wise-editor/src/main/webapp/js/editor.js
+++ b/wise-editor/src/main/webapp/js/editor.js
@@ -123,7 +123,7 @@ editor.WaitDialog = new Class({
destroyOnClose:true,
autoOpen:false,
useEscKey:false,
- title:'Loading ...',
+ title:'',
onInitialize:function (wrapper) {
wrapper.setStyle('opacity', 0);
this.wrapper.setStyle('display', 'none');
diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
index b79e8e22..34fdf94d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
@@ -23,6 +23,7 @@ import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.MindMapHistory;
+import com.wisemapping.model.User;
import com.wisemapping.security.Utils;
import com.wisemapping.service.MindmapService;
import com.wisemapping.view.MindMapBean;
@@ -67,6 +68,7 @@ public class MindmapController {
@RequestMapping(value = "maps/{id}/print")
public String showPrintPage(@PathVariable int id, @NotNull Model model) {
final MindMapBean mindmap = findMindmapBean(id);
+ model.addAttribute("principal", Utils.getUser());
model.addAttribute("mindmap", mindmap);
return "mindmapPrint";
}
@@ -124,7 +126,9 @@ public class MindmapController {
}
@RequestMapping(value = "maps/")
- public String showListPage() {
+ public String showListPage(@NotNull Model model) {
+ final Locale locale = LocaleContextHolder.getLocale();
+ model.addAttribute("locale", locale.getLanguage());
return "mindmapList";
}
@@ -140,6 +144,7 @@ public class MindmapController {
// Configure default locale for the editor ...
final Locale locale = LocaleContextHolder.getLocale();
model.addAttribute("locale", locale.getLanguage());
+ model.addAttribute("principal", Utils.getUser());
result = "mindmapEditor";
} else {
result = "redirect:view";
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 54eec456..3036f27b 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
@@ -32,26 +32,20 @@ CHANGE_LANGUAGE=Change Language
FAQ=Frequent Asked Questions
SHORT_FAQ=FAQ
LOGIN=Login
-MSG=Message
-PROBLEM_DETAIL=Description
EXPORT=Export
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Image File (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
-STATUS=Status
LAST_UPDATE=Last Update
LAST_UPDATE_BY=Last Update By
DELETE=Delete
-
-EDITOR.ERROR_LOADING=An unexpected error has occurred initializing this page. We'll solve this problem as soon as possible. Please, click here to return to your mindmap list.
SITE.TITLE=WiseMapping
SITE.SLOGAN=Visual Thinking Evolution
-DISCARD_CHANGES=Discard Changes
KEYBOARD=Keyboard Shortcuts
KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor!
-HOME=Home
+HOME=Homepage
LOGIN_ERROR=The email address or password you entered is incorrect.
USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!.
CREW=The Crew
@@ -89,7 +83,6 @@ PRIVACYPOLICY= Privacy Policy
EXPORT_DETAILS=Export this map in the format that you want and start using it in your presentations or sharing by email
HERE=here
WHO_ARE_WE=Who are we?
-MEMBERS=Members
WELCOME=Welcome
RENAME=Rename
MAX_CHARACTER_SIZE= Maximum allowed message length of 512 characters.
@@ -99,13 +92,6 @@ BLOG_INCLUSION=You can customize the code snippet to embed this map on your blog
BLOG_SNIPPET=Copy this snippet of code to embed in your blog or page
ZOOM=Zoom
HISTORY=History
-LINK=Link
-TYPE=Type
-SIZE=Size
-BOLD=Bold
-ITALIC=Italic
-FONT_COLOR=Font Color
-COLOR=Color
SHARE=Share
UNEXPECTED_ERROR=Outch!!. An unexpected error has occurred.
UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process your request. Please try again, or go to the home page.
@@ -192,5 +178,9 @@ BROWSER_NOT_SUPPORTED_MSG=Your browser has not been fully tested and it might no
BROWSER_NOT_SUPPORTED_TRY_AGAIN=Try again with one of the browsers previously listed.
INSTALL_CFG=Sorry, Microsoft Internet Explorer 8 is partially supported
-INSTALL_CFG_REASON = Microsoft Internet Explorer 8 does not support HTML 5 SVG. SVG is the tecgnology used be WiseMapping to render and edit mindmaps. We strongly encourage update to either Microsoft Internet Explorer 9 or use other browser such as Google Chrome, Firefox o Safari.
+INSTALL_CFG_REASON = Microsoft Internet Explorer 8 does not support HTML 5 SVG. SVG is the technology used be WiseMapping to render and edit mindmaps. We strongly encourage update to either Microsoft Internet Explorer 9 or use other browser such as Google Chrome, Firefox o Safari.
INSTALL_CFG_CLICK_HERE=If you still want to use Microsoft Internet Explorer 8, click here to install Google Chrome Frame Plugin. Google Chrome Frame Plugin extends Internet Explorer capabilities adding support for HTML 5.
+SHOW_REGISTERS=Show _MENU_ entries
+LOADING=Loading ...
+NO_MATCHING_FOUND=No matching records found
+TABLE_ROWS=\ _START_-_END_ of _TOTAL_
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 f11fc7c6..32bd5afa 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
@@ -35,7 +35,6 @@ SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Imagen (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
-STATUS=Estado
DELETE=Borrar
LOGIN_ERROR=El nombre de usuario o la contrase\u00f1a introducidos no son correctos.
USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibira una notificación por email tan pronto la activemos.
@@ -71,7 +70,6 @@ TERMSOFUSE=Términos de uso
PRIVACYPOLICY= Politica de privacidad
EXPORT_DETAILS=Exporte el mapa en el formato que desee y comience a utlizarlo en sus presentaciones
WHO_ARE_WE=Quienes somos?
-MEMBERS=Miembros
WELCOME=Bienvenido
NO_HISTORY_RESULTS=No existen cambios registrados para el mapa seleccionado
RENAME=Renombrar
@@ -89,7 +87,6 @@ NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver es
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
-COLLABORATE=Colaborar
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.
#FOOTER
@@ -102,7 +99,6 @@ KEYBOARD_MSG=Estos son los atajos de teclado que puede utilizar en el editor!
REVERT=revertir
EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar.
STARRED=Importantes
-LINK=URL
ACCOUNT_ACTIVED=Su cuenta ha sido activada
ACCOUNT_ACTIVED_FAIL=Falla al Activar Cuenta
WISEMAPPING_EXPORT_FORMAT=WiseMapping
@@ -112,7 +108,6 @@ CHANGE_PASSWORD_SUCCESS=Contrase\u00f1a cambiada exitosamente
CONFIRM_NEW_PASSWORD=Confirmar Contrase\u00f1a
COPYRIGHT=Impulsado por WiseMapping
UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible procesar su pedido. Recargue la p\u00e1gina y intentolo nuevamente. Si el problema persiste, contactenos a support@wisemapping.com
-TYPE=Tipo
SHARE=Compartir
SEND_ME_A_NEW_PASSWORD=Enviar Nueva Contrase\u00f1a
ALL_MAPS=Todos
@@ -129,12 +124,9 @@ 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\u00f3n
LAST_UPDATE_BY=Ultima Actualizaci\u00f3n Por
-SIZE=Tama\u221a\u00b1o
NO_PRODUCTION_DATABASE_CONFIGURED=A pesar que la base de datos HSQLDB es distribuida por defecto durante la instalaci\u00f3n, la misma no es recomendada para el uso en entornos productivos. Se recomienda fuertemente usar MySQL 5.5 o superior. Los pasos para configurar MySQL pueden ser encontrados
CHANGE_LANGUAGE=Cambiar Idioma
FILTERS=Filtros
@@ -187,4 +179,9 @@ INSTALL_CFG=Disculpe, Microsoft Internet Explorer 8 esta parcialmente soportado
INSTALL_CFG_REASON = Microsoft Internet Explorer 8 soporta parcialmente HTML 5 y SVG. SVG es la tecnolog\u00eda que WiseMapping usa para el editor de mapas. Le recomendamos que actualice a Microsoft Internet Explorer 9 o utilice otro navegador como ser Google Chrome, Firefox o Safari.
INSTALL_CFG_CLICK_HERE=Si desea seguir utilizando Internet Explorer 8, haga click ac\u00e1 para instalar Google Chrome Frame Plugin. Google Chrome Frame Plugin extiende las capaciadades de Internet Explorer con HTML 5.
HERE=aqu\u00ed
-BOLD=Negrita
+SEARCH=Buscar
+HOME=Homepage
+SHOW_REGISTERS=Mostrar _MENU_ registros
+LOADING=Cargando ...
+NO_MATCHING_FOUND=No se encontraron resultados
+TABLE_ROWS=\ _START_-_END_ de _TOTAL_
diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
index d234fb3a..e34c0ef8 100644
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ b/wise-webapp/src/main/webapp/css/mindmapList.less
@@ -2,10 +2,8 @@
@import "bootstrap/css/bootstrap-responsive.min.css";
@import "css/pageHeaders.css";
-@html-background: #dedederepeat-x scroll
-
-;
-@body-width: 956px;
+@html-background: #dedederepeat-xscroll;
+@body-width: 1050px;
@font-family: "Lucida Grande",
"Arial"
diff --git a/wise-webapp/src/main/webapp/js/jquery.timeago.de.js b/wise-webapp/src/main/webapp/js/jquery.timeago.de.js
new file mode 100644
index 00000000..f10b06ee
--- /dev/null
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.de.js
@@ -0,0 +1,18 @@
+// German
+jQuery.timeago.settings.strings = {
+ prefixAgo: "vor",
+ prefixFromNow: "in",
+ suffixAgo: "",
+ suffixFromNow: "",
+ seconds: "wenigen Sekunden",
+ minute: "etwa einer Minute",
+ minutes: "%d Minuten",
+ hour: "etwa einer Stunde",
+ hours: "%d Stunden",
+ day: "etwa einem Tag",
+ days: "%d Tagen",
+ month: "etwa einem Monat",
+ months: "%d Monaten",
+ year: "etwa einem Jahr",
+ years: "%d Jahren"
+};
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/js/jquery.timeago.en.js b/wise-webapp/src/main/webapp/js/jquery.timeago.en.js
new file mode 100644
index 00000000..3d6652c2
--- /dev/null
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.en.js
@@ -0,0 +1,20 @@
+// English (Template)
+jQuery.timeago.settings.strings = {
+ prefixAgo: null,
+ prefixFromNow: null,
+ suffixAgo: "ago",
+ suffixFromNow: "from now",
+ seconds: "less than a minute",
+ minute: "about a minute",
+ minutes: "%d minutes",
+ hour: "about an hour",
+ hours: "about %d hours",
+ day: "a day",
+ days: "%d days",
+ month: "about a month",
+ months: "%d months",
+ year: "about a year",
+ years: "%d years",
+ wordSeparator: " ",
+ numbers: []
+};
diff --git a/wise-webapp/src/main/webapp/js/jquery.timeago.es.js b/wise-webapp/src/main/webapp/js/jquery.timeago.es.js
new file mode 100644
index 00000000..00c6d0a6
--- /dev/null
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.es.js
@@ -0,0 +1,18 @@
+// Spanish
+jQuery.timeago.settings.strings = {
+ prefixAgo: "hace",
+ prefixFromNow: "dentro de",
+ suffixAgo: "",
+ suffixFromNow: "",
+ seconds: "menos de un minuto",
+ minute: "un minuto",
+ minutes: "unos %d minutos",
+ hour: "una hora",
+ hours: "%d horas",
+ day: "un día",
+ days: "%d días",
+ month: "un mes",
+ months: "%d meses",
+ year: "un año",
+ years: "%d años"
+};
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/js/jquery.timeago.fr.js b/wise-webapp/src/main/webapp/js/jquery.timeago.fr.js
new file mode 100644
index 00000000..50283423
--- /dev/null
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.fr.js
@@ -0,0 +1,17 @@
+// French
+jQuery.timeago.settings.strings = {
+ // environ ~= about, it's optional
+ prefixAgo: "il y a",
+ prefixFromNow: "d'ici",
+ seconds: "moins d'une minute",
+ minute: "environ une minute",
+ minutes: "environ %d minutes",
+ hour: "environ une heure",
+ hours: "environ %d heures",
+ day: "environ un jour",
+ days: "environ %d jours",
+ month: "environ un mois",
+ months: "environ %d mois",
+ year: "un an",
+ years: "%d ans"
+};
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
index f0cd4177..280937ae 100755
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -3,9 +3,9 @@