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 2e9aeb7e..3e1201c8 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 @@ -1,18 +1,14 @@ NAME=Name DESCRIPTION=Description FILE_FORMAT=File Format -OK=Ok ADD=Add -ACTIONS=Actions ADD_COLLABORATORS=Add Collaborators CURRENT_COLLABORATORS=Current collaborators VIEWERS=Viewers ADD_VIEWERS=Add Viewers -CURRENT_VIEWERS=Current Viewers USER_REGISTRATION=User Registration SEND_ME_A_NEW_PASSWORD=Send Me A New Password CANCEL=Cancel -SUBMIT=Submit FIRSTNAME=Firstname LASTNAME=Lastname EMAIL=Email @@ -22,7 +18,6 @@ PASSWORD=Password NEW_PASSWORD=New password CONFIRM_NEW_PASSWORD=Confirm new password MY_WISEMAPS=My Wisemaps -SAVE_AND_CLOSE=Save and Close RETYPE_PASSWORD=Retype Password REGISTER=Register REMEMBER_ME=Stay signed in @@ -90,7 +85,6 @@ 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 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. FIELD_REQUIRED=Required field cannot be left blank @@ -99,7 +93,6 @@ NO_VALID_EMAIL_ADDRESS=Invalid email address USERNAME_ALREADY_EXIST=Username already exists PASSWORD_MISSMATCH=Your password entries did not match CHANGE_PASSWORD_SUCCESS=Your password has been changed successfully. -TYPE_CHARACTER_BELOW=Type the characters you see in the picture below. WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy. REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.Registration is Free and takes just a moment. @@ -138,14 +131,11 @@ INSERT=Insert EDITOR.LAST_SAVED=last modification by {0} SHARE_IT=Share It ACCOUNT_DETAIL=Do you want to change you user options?. Here is the place. -SETTINGS_MSG=Please, select what option want to change from you profile: TAGS=Tags AVAILABLE_TAGS = Available tags EMPTY_MINDMAP_TABLE=Mapping your ideas is very simple. Create a map and try it! EMPTY_RECENT_MINDMAP_TABLE=No recent maps -TAGS_DETAILS=Add tags you maps is very simple. Try! -TAG_IT=Tag It PUBLISH_IT=Publish It UNSUPPORTED_BROWSER=Unsupported Browser FIELD_REQUIRED_MSG=Fields marked with an asterisk * are required. @@ -154,8 +144,6 @@ INVITE_USERS=Invite Users AS_COLLABORATOR=as Collaborators AS_VIEWER=as Viewers CUSTOMIZE_INVITATION=Customize Invitation -INVITATION=Invitation -INVITATION_MSG= I've just shared a mind map with you.\nLog in to www.wisemapping.com and you will see the shared map in your mind map list. SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) is an XML markup language for describing two-dimensional vector graphics. This format will enable you to print your maps without quality lost at any resolution. PDF_EXPORT_FORMAT_DETAILS=Get your map as Portable Document Format(PDF) to share use in your presentations. IMG_EXPORT_FORMAT_DETAILS=Get a graphic representation of your map including all colors and shapes to reuse in documents or for archiving @@ -244,7 +232,7 @@ TERMS_AND_CONDITIONS=Terms and Conditions CONTACT=Contact ACCOUNT_ACTIVED= Your account has been activated -ACCOUNT_ACTIVED_FAIL = Account Activation failed +ACCOUNT_ACTIVED_FAIL = Account Activation Failed BROWSE=Browse UNDO_EDITION=Undo Edition UNDO=Undo @@ -256,7 +244,7 @@ INSTALL_CFG=You need to install the Google Chrome Frame Plugin INSTALL_CFG_REASON = We used to support IE 7/8 by rendering VML instead of SVG. In a few words, VML was the SVG equivalent in the Microsoft world, and we have invested a lot of energy in VML during several years solving several performance and instability issues among others things. Since Internet Explorer 9 has support for HTML 5.0 (thus SVG support), we decided to deprecate the support of VML. The side effect of this is that all users using Internet Explorer 7/8 will have to install a plugin from Google that enables the display of HTML 5.0 web pages.
You might have to reopen the browser after you have installed the plugin.

We highly recommend using Firefox, Chrome or Internet Explorer 9 where this plugin is not required and the performance is much better. INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here INVALID_EMAIL_ERROR = The e-mail was not verified -BROWSER_NOT_SUPPOERTED= Current Browser is not supported. +BROWSER_NOT_SUPPORTED= Current Browser is not supported. CHECK_BROWSERS= You can check supported browser at NO_PRODUCTION_DATABASE_CONFIGURED=Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL IMPORT=Import @@ -264,17 +252,36 @@ 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 ... ALL_MAPS=All MY_MAPS=My Maps SHARED_WITH_ME=Shared With Me PUBLIC_MAPS=Public Maps ACCEPT=Accept -SAVING=Saving +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 +IMPORT_MINDMAP=Import Map +FILTERS=Filter +MORE=More +ADD_NEW_MAP=Add New Map +IMPORTING=Importing ... +NEW=New +NO_SEARCH_RESULT=No mindmap available for the selected filter criteria +SEARCH=Search +GENERAL=General +SECURITY=Security +MAP_NAME_HINT=Name of the new map to create +MAP_DESCRIPTION_HINT=Some description for your map +WARNING=Warning +DELETE_MAPS_WARNING=Deleted mindmap can not be recovered. Do you want to continue ?. +WHAT_IS_NEW=What is New +WHAT_IS_NEW_DETAILS= +THANKS_FOR_SIGN_UP=Thanks for signing up\! +SIGN_UP_CONFIRMATION_EMAIL=\ You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
Please select the link to activate and start creating and sharing maps. +SIGN_UP_SUCCESS=Your account has been created successfully, click here to sign in and start enjoying WiseMapping. +ACCOUNT_DOES_NOT_EXISTS=The email is not register or you account is not active yet. +ACCOUNT_DOES_NOT_EXISTS_SUPPORT=If the problem persist please send us an email to support@wisemapping.com +SENDING=Sending ... \ 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 f06e8880..25efbd98 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,60 +1,50 @@ NAME=Nombre DESCRIPTION=Descripción -OK=Ok SITE.TITLE=WiseMapping -SITE.SLOGAN=COMPLETE -ADD=Agregar -ACTIONS=Acciones +SITE.SLOGAN=La Evoluci\u00f3n En Inteligencia Visual ADD_COLLABORATORS=Agregar Colaboradores CURRENT_COLLABORATORS=Colaboradores Actuales VIEWERS=Lectores ADD_VIEWERS=Agregar Lector -CURRENT_VIEWERS=Lectores Actuales USER_REGISTRATION=Registración de Usuarios CANCEL=Cancelar -SUBMIT=Aceptar FIRSTNAME=Nombre LASTNAME=Apellido EMAIL=E-mail HELP=Ayuda -LOGOUT=Salida -PASSWORD=Contraseña +LOGOUT=Salir +PASSWORD=Contrase\u00f1a MY_WISEMAPS=Mis mapas -SAVE_AND_CLOSE=Grabar y Salir -RETYPE_PASSWORD=Reingresar contraseña +RETYPE_PASSWORD=Reingresar Contrase\u00f1a REGISTER=Registración REMEMBER_ME=Recordar mi sesión SIGN_IN=Ingresar SIGN_UP=Registrate -ACCOUNT=Configuración +ACCOUNT=Mi Cuenta USERNAME=Nombre de usuario BACK=Atrás CLOSE=Cerrar NOT_READY_A_USER=Todavía no usa WiseMapping? NOT_READY_A_USER_MESSAGE=La registración es rápida y gratuita. -JOIN_NOW=Inscribite! -REMOVE=Remover +JOIN_NOW=Inscribete Ahora ! MINDMAP=Mindmap ROLE=Rol -CAPTCHA=Verificación de palabra -FORGOT_PASSWORD=Se olvidó la contraseña? -CHANGE_PASSWORD=Cambiar la contraseña +FORGOT_PASSWORD=Se olvidó la contrase\u00f1a ? +CHANGE_PASSWORD=Cambiar la Contrase\u00f1a FAQ=Preguntas Frecuentes SHORT_FAQ=FAQ -LOGIN=Login -SUBJECT=Asunto +LOGIN=Entrar MSG=Mensaje PROBLEM_DETAIL=Descripción EXPORT=Exportar EXPORT_MSG=Exportar EXPORT_FORMAT=Exportar a formato: EDIT_PROFILE= Editar perfil -JPEG_EXPORT_FORMAT=JPEG PNG_EXPORT_FORMAT=Portable Network Graphics (PNG) SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=Imagen -FREEMIND_EXPORT_FORMAT = Freemind (version 0.8.0) +FREEMIND_EXPORT_FORMAT = COMPLETE FILE=Archivo FILE_URL=URL del archivo @@ -65,8 +55,6 @@ DELETE_SELECTED_CONFIRMATION=Todos los mapas seleccionados serán borrados DELETE_CONFIRMATION=Esta seguro de que quiere borrar este mapa? DELETE_SELECTED=Borrado seleccionado DELETE=Borrar -YES=si -NO=No EDITOR.LOADING=Cargando... SAVE=Guardar @@ -74,24 +62,20 @@ DISCARD_CHANGES=Descartar cambios ABOUT=Acerca ABOUT_TITLE=Que es WiseMapping? HOME=Inicio -LOGIN_ERROR=Usuario/contraseña no válido/a. +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. CREW=The Crew ALREADY_A_MEMBER=Ya un miembro ? -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... -TRYNOW= Prueba la Demo! FIELD_REQUIRED=Campo requerido EMAIL_ALREADY_EXIST=e-mail ya existente NO_VALID_EMAIL_ADDRESS=e-mail invalido USERNAME_ALREADY_EXIST=Nombre de usuario ya existente PASSWORD_MISSMATCH=La contraseña no concuerda -TYPE_CHARACTER_BELOW=Ingrese los caracteres de la imagen. WISEMAPPING_ACCOUNT_MESSAGE=Por favor, verifique la informacion que ha ingresado y lea las condiciones del servicio. REGISTRATION_CLICK_ADVICE= Seleccionando 'Registración' esta aceptando las condiciones de uso de arriba y la politica de privacidad. -REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.
Registration is Free and takes just a moment. +REGISTRATION_TITLE_MSG=Complete el siguiente formulario para convertirse en un miembro de la comunidad de WiseMapping.
La registraci\u00f3n es Gratis y solo toma un momento. CAPTCHA_ERROR=Enter the letters as they are shown in the image above. DETAIL_INFORMATION=Detalles CREATOR=Creador @@ -124,11 +108,9 @@ RECENT_FILES=Mapas Recientes MINDMAP_DETAIL = Detalle de Mind Map EDIT=Editar INSERT=Insertar -EDITOR.LAST_SAVED=ultima modificación hecha por {0} +EDITOR.LAST_SAVED=ultima modificaci\u00f3n hecha por {0} SHARE_IT=Compartilo ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar. -SETTINGS_MSG=Por favor, seleccione que opción desea modificar de su perfil: -TAGS=Etiquetas AVAILABLE_TAGS = Etiquetas disponibles EMPTY_MINDMAP_TABLE=Mapear sus ideas es muy simple. Cree un mapa y haga la prueba! @@ -200,16 +182,13 @@ SHARING=Colaboración 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. +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 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. -JOIN_WISEMAPPING=Utilice WiseMapping -IT_IS_FREE=Es gratis! - #FOOTER TERMS_AND_CONDITIONS=Términos and Condiciones CONTACT=Contacto @@ -223,32 +202,32 @@ UNDO_EDITION=Undo Edition REDO_EDITION=Redo Edition REVERT=revert EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar. -STARRED=Starred +STARRED=Importantes LINK=URL ACCOUNT_ACTIVED=Su cuenta ha sido activada -ACCOUNT_ACTIVED_FAIL=COMPLETE +ACCOUNT_ACTIVED_FAIL=Falla al Activar Cuenta WISEMAPPING_EXPORT_FORMAT=WiseMapping -WISEMAPPING_EXPORT_FORMAT_DETAILS=Expota tu mapa\\ en formato\\ WiseMapping.\\ +WISEMAPPING_EXPORT_FORMAT_DETAILS=Expota tu mapa en formato WiseMapping. YOUR_ROLE=Tu Role -CHANGE_PASSWORD_SUCCESS=Password fue cambiado exitosamente -CONFIRM_NEW_PASSWORD=Confirmar\\ password +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 pagina y intentolo nuevamente. Si el problema persiste, contactenos a support@wisemapping.com +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 UNDO=Rehacer TYPE=Tipo NOTE=Nota SHARE=Compartir SHAPE=Figura -SEND_ME_A_NEW_PASSWORD=Enviar Nuevo Password +SEND_ME_A_NEW_PASSWORD=Enviar Nueva Contrase\u00f1a ALL_MAPS=Todos CREATE=Crear DUPLICATE=Duplicar DELETE_MINDMAP=Borrar -INFO=Infomaci�n -SAVING=Grabando +INFO=Infomaci\u00f3n +SAVING=Grabando ... PUBLIC_MAPS=Mapas Publicos MY_MAPS=Mis Mapas -NEW_PASSWORD=Nuevo Password +NEW_PASSWORD=Nueva Contrase\u00f1a LANGUAGE=Idioma SHARED_WITH_ME=Compartidos ACCEPT=Aceptar @@ -257,8 +236,28 @@ 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 +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 +MORE=Mas +ADD_NEW_MAP=Nuevo Mapa +IMPORTING=Importando ... +NEW=Nuevo +NO_SEARCH_RESULT=No hay mapas disponibles para el criterio de busqueda seleccionados +GENERAL=General +SECURITY=Seguridad +MAP_NAME_HINT=Name of the new map to create +MAP_DESCRIPTION_HINT=Some description for your map +WARNING=Cuidado +DELETE_MAPS_WARNING=Una vez borrado de un mapa no puede ser recuperado. Desea continuar ? +WHAT_IS_NEW=Novedades +WHAT_IS_NEW_DETAILS= +THANKS_FOR_SIGN_UP=Graciar por registarse! +SIGN_UP_CONFIRMATION_EMAIL=You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
Please select the link to activate and start creating and sharing maps. +SIGN_UP_SUCCESS=Su cuenta a sido creada exitosamente,haga click ac\u00e1 para ingresar y empezar a disfrutar de WiseMapping. +ACCOUNT_DOES_NOT_EXISTS=El e-mail ingresado no pertenece a un usuario registrado o la cuenta no ha sido activada todav\u00eda. +ACCOUNT_DOES_NOT_EXISTS_SUPPORT=Si el problema persiste, env\u00ede un e-mail a support@wisemapping.com +SENDING=Enviando ... diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index c7f991e5..24d3cb21 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -258,87 +258,6 @@ function callbackOnTableInit() { updateStatusToolbar(); } -$(function() { - $('#mindmapListTable').dataTable({ - bProcessing : true, - sAjaxSource : "../service/maps/", - sAjaxDataProp: 'mindmapsInfo', - fnInitComplete: function() { - $('#mindmapListTable tbody').change(updateStatusToolbar); - callbackOnTableInit(); - }, - aoColumns: [ - { - sTitle : '', - sWidth : "60px", - sClass : "select", - bSortable : false, - bSearchable : false, - mDataProp: "starred", - bUseRendered : false, - fnRender : function(obj) { - return ''; - } - }, - { - sTitle : "Name", - sWidth:"270px", - bUseRendered : false, - mDataProp: "title", - fnRender : function(obj) { - return '' + obj.aData.title + ''; - } - }, - { - sTitle : "Creator", - mDataProp :"creator" - }, - { - bSearchable : false, - sTitle : "Last Modified", - bUseRendered: false, - sType: "date", - mDataProp: "lastModificationTime", - fnRender : function(obj) { - var time = obj.aData.lastModificationTime; - return '' + jQuery.timeago(time) + '' + ' ' + '' + obj.aData.lastModifierUser + ''; - } - } - ], - bAutoWidth : false, - oLanguage : { - "sSearch" : "", - "sInfo" : "_START_-_END_ of _TOTAL_", - "sEmptyTable": "No mindmap available for the selected filter criteria." - }, - bStateSave:true - }); - - // Customize search action ... - $('#mindmapListTable_filter').appendTo("#tableActions"); - $('#mindmapListTable_filter input').addClass('input-medium search-query'); - $('#mindmapListTable_filter input').attr('placeholder', 'Search'); - $("#mindmapListTable_info").appendTo("#pageInfo"); - - // Re-arrange pagination actions ... - $("#tableFooter").appendTo("#mindmapListTable_wrapper"); - $("#mindmapListTable_length").appendTo("#tableFooter"); - $('#mindmapListTable_length select').addClass('span1'); - - - $('input:checkbox[id="selectAll"]').click(function() { - $("#mindmapListTable").dataTableExt.selectAllMaps(); - }); - - // Hack for changing the pagination buttons ... - $('#nPageBtn').click(function() { - $('#mindmapListTable_next').click(); - }); - $('#pPageBtn').click(function() { - $('#mindmapListTable_previous').click(); - }); -}); - $(function() { // Creation buttons actions ... $("#newBtn").click( diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index 3e996c7a..0064723f 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -3,9 +3,9 @@
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index a41e97c6..21f106a7 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -13,13 +13,8 @@
-

What is New:

-
    -
  • New User Interface
    • -
  • FreeMind 0.9 Update
    • -
  • Improved HTML 5.0 Support
    • -
  • Firefox 12 officially supported
    • -
+

:

+
@@ -69,7 +64,7 @@
- Warning  here. +  .
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index d0ed8be3..8820be98 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -5,8 +5,8 @@
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index ef19fb4e..60f724df 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -1,3 +1,5 @@ +<%@ page import="com.wisemapping.security.Utils" %> +<%@ page import="com.wisemapping.model.User" %> <%@page pageEncoding="UTF-8" %> <%@ include file="/jsp/init.jsp" %> @@ -7,6 +9,12 @@ <%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%> <%--@elvariable id="editorTryMode" type="java.lang.String"--%> <%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%> +<% + User user = Utils.getUser(true); + if (user != null) { + request.setAttribute("principal", user); + } +%> diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 1ae57027..c2b56cd8 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -29,8 +29,86 @@ + $(function () { + $('#mindmapListTable').dataTable({ + bProcessing:true, + sAjaxSource:"../service/maps/", + sAjaxDataProp:'mindmapsInfo', + fnInitComplete:function () { + $('#mindmapListTable tbody').change(updateStatusToolbar); + callbackOnTableInit(); + }, + aoColumns:[ + { + sTitle:'', + sWidth:"60px", + sClass:"select", + bSortable:false, + bSearchable:false, + mDataProp:"starred", + bUseRendered:false, + fnRender:function (obj) { + return ''; + } + }, + { + sTitle:"", + sWidth:"270px", + bUseRendered:false, + mDataProp:"title", + fnRender:function (obj) { + return '' + obj.aData.title + ''; + } + }, + { + sTitle:"Creator", + mDataProp:"creator" + }, + { + bSearchable:false, + sTitle:"", + bUseRendered:false, + sType:"date", + mDataProp:"lastModificationTime", + fnRender:function (obj) { + var time = obj.aData.lastModificationTime; + return '' + jQuery.timeago(time) + '' + ' ' + '' + obj.aData.lastModifierUser + ''; + } + } + ], + bAutoWidth:false, + oLanguage:{ + "sSearch":"", + "sInfo":"_START_-_END_ of _TOTAL_", + "sEmptyTable":"" + }, + bStateSave:true + }); + + // Customize search action ... + $('#mindmapListTable_filter').appendTo("#tableActions"); + $('#mindmapListTable_filter input').addClass('input-medium search-query'); + $('#mindmapListTable_filter input').attr('placeholder', 'Search'); + $("#mindmapListTable_info").appendTo("#pageInfo"); + + // Re-arrange pagination actions ... + $("#tableFooter").appendTo("#mindmapListTable_wrapper"); + $("#mindmapListTable_length").appendTo("#tableFooter"); + $('#mindmapListTable_length select').addClass('span1'); + + + $('input:checkbox[id="selectAll"]').click(function () { + $("#mindmapListTable").dataTableExt.selectAllMaps(); + }); + + // Hack for changing the pagination buttons ... + $('#nPageBtn').click(function () { + $('#mindmapListTable_next').click(); + }); + $('#pPageBtn').click(function () { + $('#mindmapListTable_previous').click(); + }); + }); @@ -52,7 +130,7 @@
    -
  • Filters
    • +
  • @@ -70,36 +148,46 @@
    - - +
    @@ -123,208 +211,210 @@
    - -