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 3e1201c8..ce70713b 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,10 +2,7 @@ NAME=Name DESCRIPTION=Description FILE_FORMAT=File Format ADD=Add -ADD_COLLABORATORS=Add Collaborators -CURRENT_COLLABORATORS=Current collaborators VIEWERS=Viewers -ADD_VIEWERS=Add Viewers USER_REGISTRATION=User Registration SEND_ME_A_NEW_PASSWORD=Send Me A New Password CANCEL=Cancel @@ -53,20 +50,13 @@ 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 - FILE=File FILE_URL=File URL STATUS=Status LAST_EDITOR=Last Edition LAST_UPDATE=Last Update LAST_UPDATE_BY=Last Update By -DELETE_SELECTED_CONFIRMATION=All selected Maps will be deleted. Do you want to continue? -DELETE_CONFIRMATION=Are you sure that you want to delete this map? -DELETE_SELECTED=Delete selected -DELETE_NO_MAPS_SELECTED=No maps were selected DELETE=Delete -YES=yes -NO=no EDITOR.LOADING=Loading ... 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. @@ -78,8 +68,6 @@ ABOUT=About ABOUT_TITLE=What is WiseMapping? KEYBOARD=Keyboard Shortcuts KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor! -FIRST_STEPS=Editor First Steps -FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5! HOME=Home 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!. @@ -97,13 +85,10 @@ WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you 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. CAPTCHA_ERROR=Enter the letters as they are shown in the image above. -DETAIL_INFORMATION=Detail Information CREATOR=Creator CREATION_TIME=Creation Time VIEWS=Views STATE=State -COLLABORATORS=Collaborators -ADD_COLLABORATOR=Add Collaborator EDITORS=Editors VIEWER=Viewer PRIVATE=Private @@ -111,12 +96,6 @@ PUBLIC=Public SHARED=Shared ONLY_VIEW_PRIVATE = This mindmap can be viewed by you only. ALL_VIEW_PUBLIC = This mindmap can be viewed by any user. - -EMAILS_ADRESSES = E-mails Addresses -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=Create a new map TAG=Tag @@ -125,25 +104,11 @@ PUBLISH_MSG = What about using your maps in sites and blogs? PUBLISH_DETAILS=By publishing the map you make it visible to everyone on the Internet. DETAIL=Detail RECENT_FILES=Recent Maps -MINDMAP_DETAIL = Mind Map Detail -EDIT=Edit 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. -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 -PUBLISH_IT=Publish It UNSUPPORTED_BROWSER=Unsupported Browser FIELD_REQUIRED_MSG=Fields marked with an asterisk * are required. -COMMA_SEPARATED_EMAILS=Comma separated emails -INVITE_USERS=Invite Users -AS_COLLABORATOR=as Collaborators AS_VIEWER=as Viewers -CUSTOMIZE_INVITATION=Customize Invitation 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 @@ -169,8 +134,6 @@ URL=URL DIRECT_LINK=Direct Link BLOG_INCLUSION=You can customize the code snippet to embed this map on your blog or website. Make sure you enter the correct dimensions of the content area of your blog so that the map fits nicely BLOG_SNIPPET=Copy this snippet of code to embed in your blog or page -OPEN=Open -OPEN_MSG=Open map for edition ZOOM=Zoom ZOOM_IN=Zoom In ZOOM_OUT=Zoom Out @@ -209,7 +172,6 @@ UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, contactenos a support@wisemapping.com NO_ENOUGH_PERMISSIONS=Outch!!. This map is not available anymore. NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted. -SHARING=Sharing IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import. PRINT=Print IMPORT_MAP_ERROR=FreeMind file could not be imported. {0} @@ -238,7 +200,7 @@ UNDO_EDITION=Undo Edition UNDO=Undo REDO_EDITION=Redo Edition REDO=Redo -NO_HISTORY_RESULTS= No History Information was found. +NO_HISTORY_RESULTS= No history information available. REVERT=revert 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. @@ -269,6 +231,7 @@ MORE=More ADD_NEW_MAP=Add New Map IMPORTING=Importing ... NEW=New +MIND_FILE=File NO_SEARCH_RESULT=No mindmap available for the selected filter criteria SEARCH=Search GENERAL=General @@ -284,4 +247,19 @@ SIGN_UP_CONFIRMATION_EMAIL=\ You will receive a confirmation message shortly f 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 +SENDING=Sending ... +SIGN_ING=Singing in ... +ENABLE_PUBLISHING=Enable Sharing +FRAME_HEIGHT=Frame height +FRAME_WIDTH=Frame width +EMBED=Embebber +PUBLIC_URL=Public URLs +ADD_PEOPLE=Add People +COLLABORATORS_SEPARATED_BY_COMA=Enter collaborators emails separared by comas +CAN_EDIT=Can Edit +CAN_VIEW=Can View +EMAIL_NOTIFICATION_MESSAGE=Customize Email Notification +ADD_MESSAGE=Add message +WHO_CAN_ACCESS=Who has access +IS_OWNER=Is Owner +OPTIONAL_CUSTOM_MESSAGE=Optional\: Include a personal message \ 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 25efbd98..9d3e45ff 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 @@ -2,16 +2,14 @@ NAME=Nombre DESCRIPTION=Descripción SITE.TITLE=WiseMapping SITE.SLOGAN=La Evoluci\u00f3n En Inteligencia Visual -ADD_COLLABORATORS=Agregar Colaboradores -CURRENT_COLLABORATORS=Colaboradores Actuales VIEWERS=Lectores -ADD_VIEWERS=Agregar Lector USER_REGISTRATION=Registración de Usuarios CANCEL=Cancelar FIRSTNAME=Nombre LASTNAME=Apellido EMAIL=E-mail HELP=Ayuda +ADD=Agregar LOGOUT=Salir PASSWORD=Contrase\u00f1a MY_WISEMAPS=Mis mapas @@ -36,27 +34,18 @@ SHORT_FAQ=FAQ LOGIN=Entrar MSG=Mensaje PROBLEM_DETAIL=Descripción +MIND_FILE=Archivo EXPORT=Exportar -EXPORT_MSG=Exportar -EXPORT_FORMAT=Exportar a formato: EDIT_PROFILE= Editar perfil 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 = COMPLETE - FILE=Archivo FILE_URL=URL del archivo STATUS=Estado -LAST_EDITOR=Última Edicion - -DELETE_SELECTED_CONFIRMATION=Todos los mapas seleccionados serán borrados. Desea continuar? -DELETE_CONFIRMATION=Esta seguro de que quiere borrar este mapa? -DELETE_SELECTED=Borrado seleccionado DELETE=Borrar - -EDITOR.LOADING=Cargando... SAVE=Guardar DISCARD_CHANGES=Descartar cambios ABOUT=Acerca @@ -82,21 +71,11 @@ CREATOR=Creador CREATION_TIME=Fecha de creación VIEWS=Vistas STATE=Estado -COLLABORATORS=Colaboradores -ADD_COLLABORATOR=Agregar Colaborador EDITORS=Editores -VIEWER=Lector -PRIVATE=Privado PUBLIC=Público SHARED=Compartido ONLY_VIEW_PRIVATE = Este documento solo puede ser visualizado por usted. ALL_VIEW_PUBLIC = Este documento puede ser visualizado por cualquier usuario. - -EMAILS_ADRESSES = Direcciones de e-mail -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=Crear un nuevo mapa TAG=Etiqueta @@ -111,16 +90,8 @@ INSERT=Insertar EDITOR.LAST_SAVED=ultima modificaci\u00f3n hecha por {0} SHARE_IT=Compartilo ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar. -AVAILABLE_TAGS = Etiquetas disponibles - -EMPTY_MINDMAP_TABLE=Mapear sus ideas es muy simple. Cree un mapa y haga la prueba! -EMPTY_RECENT_MINDMAP_TABLE=No hay mapas recientes -TAGS_DETAILS=Agregar etiquetas a sus mapas en muy facil! Intentelo! -TAG_IT=Etiquetalo! -PUBLISH_IT=Publicalo! UNSUPPORTED_BROWSER=Navegador no soportado FIELD_REQUIRED_MSG=Fields marked with an asterisk * are required. -COMMA_SEPARATED_EMAILS=E-mails separados por comas INVITE_USERS=Invitar usuarios AS_COLLABORATOR=como Colaborador AS_VIEWER=como Lector @@ -131,30 +102,24 @@ SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) es un XML markup langua PDF_EXPORT_FORMAT_DETAILS=Obtenga su mapa como un documento (PDF) para compartirlo y usarlo en sus presentaciones. IMG_EXPORT_FORMAT_DETAILS=Obtenga una representación grafica de su mapa incluyendo todo los colores y formas para reusarlo en documentos o para ser archivado FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind un aplicación de escritorio gratuita de diseno de mapas mentales -DELETE_MAP=Confirmación de borrado - 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 -PUBLIC_MAP_VIEW=Información del mapa publico HERE=aqui DETAILS=Detalles -PUBLIC_VIEW_TITLE={0} vista de mapa WHO_ARE_WE=Quienes somos? MEMBERS=Miembros WELCOME=Bienvenido - +NO_HISTORY_RESULTS=No existen cambios registrados para el mapa seleccionado RENAME=Renombrar +BLOG_SNIPPET=Copie el pedazo de c\u00f3digo para embeber el map en un blog o en una p\u00e1gina. RENAME_DETAILS=Cambiar el nombre y descripción del mapa MAX_CHARACTER_SIZE= El máximo mensaje permitido puede contener 512 caracteres. -PUBLISH_MAP_TO_INTERNET=Publicar el mapa en internet URL=URL DIRECT_LINK=Enlace directo BLOG_INCLUSION=Para incluirlo en blogs y web pages -OPEN=Abrir -OPEN_MSG=Abrir el mapa para su edición -ZOOM=Lupa +ZOOM=Zoom ZOOM_IN=Acercar ZOOM_OUT=Alejar @@ -178,14 +143,9 @@ UNEXPECTED_ERROR=Outch!!. Un error inesperado ha ocurrido UNEXPECTED_ERROR_DETAILS=Disculpas, un error ha ocurrido y no podremos procesar su pedido. Por favor intente nuevamente o vaya a la pagina de inico. 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 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 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. @@ -246,7 +206,7 @@ MORE=Mas ADD_NEW_MAP=Nuevo Mapa IMPORTING=Importando ... NEW=Nuevo -NO_SEARCH_RESULT=No hay mapas disponibles para el criterio de busqueda seleccionados +NO_SEARCH_RESULT=No existen mapas disponibles para el criterio de busqueda seleccionado GENERAL=General SECURITY=Seguridad MAP_NAME_HINT=Name of the new map to create @@ -261,3 +221,20 @@ SIGN_UP_SUCCESS=Su cuenta a sido creada exitosamente,haga click support@wisemapping.com SENDING=Enviando ... +SIGN_ING=Ingresando ... +ENABLE_PUBLISHING=Habilitar publicaci\u00f3n +FRAME_HEIGHT=Frame height +FRAME_WIDTH=Frame width +EMBED=Embed +PUBLIC_URL=Direcci\u00f3n URL +ADD_PEOPLE=Agregar Colaboradores +COLLABORATORS_SEPARATED_BY_COMA=Ingrese una lista de e-mails de colaboradores separada por comas +CAN_EDIT=Puede Editar +CAN_VIEW=Puede Ver +EMAIL_NOTIFICATION_MESSAGE=Personalizar e-mail +ADD_MESSAGE=Agregar un mensaje +WHO_CAN_ACCESS=Quienes pueden acceder +IS_OWNER=Es due\u00f1o +OPTIONAL_CUSTOM_MESSAGE=Optional\: Include a personal message +IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 0.9 and WiseMapping. Seleccione el file a importar + diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index 21f106a7..5c9b8baf 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -42,7 +42,7 @@
-     diff --git a/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp b/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp index c30e81c9..e0253589 100755 --- a/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp @@ -28,30 +28,34 @@ var tableElem = $('#historyTable'); jQuery.ajax("service/maps/${mindmapId}/history", { async:false, - dataType: 'json', - type: 'GET', + dataType:'json', + type:'GET', contentType:"text/plain", - success : function(data, textStatus, jqXHR) { - $(data.changes).each(function() { - tableElem.append('\ + success:function (data, textStatus, jqXHR) { + if (data.changes.length > 0) { + $(data.changes).each(function () { + tableElem.append('\ \ ' + this.creator + '\ ' + jQuery.timeago(this.creationTime) + '\ view\ revert\ '); - }); + }); + } else { + $('#historyContainer').text(""); + } - tableElem.find('tr a.view').each(function() { - $(this).click(function(event) { + tableElem.find('tr a.view').each(function () { + $(this).click(function (event) { window.open("/c/maps/${mindmapId}/" + $(this).closest("tr").attr("data-history-id") + "/view"); event.preventDefault(); }); }); - tableElem.find('tr a.revert').each(function() { - $(this).click(function(event) { + tableElem.find('tr a.revert').each(function () { + $(this).click(function (event) { var url = "service/maps/${mindmapId}/history/" + $(this).closest("tr").attr("data-history-id"); - jQuery.post(url, function(data) { + jQuery.post(url, function (data) { window.parent.location = "c/maps/${mindmapId}/edit"; }); event.preventDefault(); @@ -59,8 +63,8 @@ }); }, - error:function(jqXHR, textStatus, errorThrown) { - alert(textStatus); + error:function (jqXHR, textStatus, errorThrown) { + console.log(textStatus); } }); diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp index 07a96cf2..432ba525 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp @@ -35,11 +35,11 @@ var contentType = null; var fileContent = null; - $('#cancelButton').click(function() { + $('#cancelButton').click(function () { window.location = '/c/maps/'; }); - $('#dialogMainForm').submit(function(event) { + $('#dialogMainForm').submit(function (event) { // Load form parameters ... var title = $('#dialogMainForm #title').attr('value'); title = title == undefined ? "" : title; @@ -51,15 +51,15 @@ jQuery.ajax("service/maps?title=" + encodeURI(title) + "&description=" + encodeURI(description), { async:false, - data: fileContent, - type: 'POST', - dataType: 'json', + data:fileContent, + type:'POST', + dataType:'json', contentType:contentType, - success : function(data, textStatus, jqXHR) { + success:function (data, textStatus, jqXHR) { var resourceId = jqXHR.getResponseHeader("ResourceId"); window.location = "c/maps/" + resourceId + "/edit"; }, - error: function(jqXHR, textStatus, errorThrown) { + error:function (jqXHR, textStatus, errorThrown) { if (jqXHR.status == 400) { var errors = JSON.parse(jqXHR.responseText); // Mark fields with errors ... @@ -91,7 +91,7 @@ event.preventDefault(); }); - $('#dialogMainForm #mapFile').change(function(event) { + $('#dialogMainForm #mapFile').change(function (event) { var file = event.target.files[0]; var reader = new FileReader(); @@ -100,7 +100,7 @@ $('#dialogMainForm #title').attr('value', jQuery.camelCase(title)); // Closure to capture the file information. - reader.onload = (function(event) { + reader.onload = (function (event) { fileContent = event.target.result; contentType = file.name.lastIndexOf(".wxml") != -1 ? "application/xml" : "application/freemind"; }); @@ -110,7 +110,7 @@ }); // Hook for interaction with the main parent window ... - var submitDialogForm = function() { + var submitDialogForm = function () { $('#dialogMainForm').submit(); } diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index c2b56cd8..22a2256d 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -61,7 +61,7 @@ } }, { - sTitle:"Creator", + sTitle:"", mDataProp:"creator" }, { @@ -181,8 +181,9 @@
    • -
  • +
  • +
    • @@ -278,8 +279,7 @@