diff --git a/Documentation.textile b/Documentation.textile deleted file mode 100644 index 28f5180a..00000000 --- a/Documentation.textile +++ /dev/null @@ -1,53 +0,0 @@ -h1. Documentation - -h2. Architecture - -WiseMapping has been development mainly in Java and JavaScript. The following diagram represents a high level overview of the product -[[http://www.wisemapping.org/_/rsrc/1257718018304/documentation/architecture/Wise%20Editor%20Architecture.png]] - -h2. Configuration - -h3. DataBase - -Wisemapping support a wide variety of databases, but we provide the Database’s script initialization for HSQL and MySQL Database. The initialization script are located within \trunk\wise-webapp\src\test\sql. - -This directory contains the following 3 scripts:: -create-schemas.sql: Contains all the SQL statement to create the Wisemapping’s tables. -drop-schemas.sql:Contains all the SQL statement to drop all the Wisemapping database. -test-data.sql: This script creates a sample data and the test user called test@wisemapping.com and password test. -MySQL - -h4. Create Database User - -Using the MySQL Databse Tools run the following command in order to create the database user. - -CREATE DATABASE wisemapping CHARACTER SET='utf8' COLLATE='utf8_unicode_ci'; -CREATE USER 'wisemapping'@'localhost' IDENTIFIED BY 'd0ndu3nd3'; -GRANT ALL ON wisemapping.* TO 'wisemapping'@'localhost'; - -h3. Configuration - -You can configure Wisemapping through the following file: - -wise-webapp\src\main\webapp\WEB-INF\app.properties. - -This property file contains all the properties to configure the database, mail and other resources used by Wisemapping. - -Property -> Description -* database.url -> The Database URL(Ex. dbc:hsqldb:file:target/db/wisemapping) -* database.driver-> The Database Driver.(Ex. org.hsqldb.jdbcDriver) -* database.hibernate.dialect -> The Database dialect. This value is used by Spring DB.(Ex. org.hibernate.dialect.HSQLDialect) -* database.username -> The database username -* database.password -> The database password -* mail.smtp.socketFactory.port -> The mail port to send email -* mail.host -> The email server host -* mail.user -> The mail username -* mail.password -> The mail password -* mail.registrationEmail -> The email used as FROM in the registration emails. -* mail.siteEmail -> The email used as FROM in the notification emails. - -h3. Logging Properties - -WiseMapping uses Log4J to log all the events. The configuration file is located in : - -\wise-webapp\src\main\webapp\WEB-INF\classes diff --git a/mindplot/pom.xml b/mindplot/pom.xml index 97985918..92ee3278 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -16,7 +16,7 @@ org.wisemapping web2d - 3.0-SNAPSHOT + ${com.wisemapping.version} runtime - - com.wisemapping.service.HibernateAppListener - - - - - charsetFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - - charsetFilter - /* - - - hibernate - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - - singleSession - true - - - sessionFactoryBeanName - mindmapSessionFactory - - - - Acegi Filter Chain Proxy - org.acegisecurity.util.FilterToBeanProxy - - targetClass - org.acegisecurity.util.FilterChainProxy - - - - - Acegi Filter Chain Proxy - /* - - - - hibernate - /* - - - - org.springframework.web.context.ContextLoaderListener - - - - wisemapping - org.springframework.web.servlet.DispatcherServlet - 1 - - - contextConfigLocation - - /WEB-INF/wisemapping-servlet.xml - /WEB-INF/wisemapping-captcha.xml - - - - - - - dwr-invoker - org.directwebremoting.servlet.DwrServlet - - debug - true - - - - - wisemapping - *.htm - - - - dwr-invoker - /dwr/* - - - - - index.jsp - - - - 180 - + + + + + + javax.servlet.jsp.jstl.fmt.localizationContext + messages + + + + contextConfigLocation + + /WEB-INF/wisemapping-aop.xml + /WEB-INF/wisemapping-dao.xml + /WEB-INF/wisemapping-service.xml + /WEB-INF/wisemapping-model.xml + /WEB-INF/wisemapping-security.xml + + + + + + + com.wisemapping.service.HibernateAppListener + + + + charsetFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + + charsetFilter + /* + + + hibernate + org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + + singleSession + true + + + sessionFactoryBeanName + mindmapSessionFactory + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + + springSecurityFilterChain + /* + + + + hibernate + /* + + + + org.springframework.web.context.ContextLoaderListener + + + + mvc-servlet + org.springframework.web.servlet.DispatcherServlet + 1 + + + contextConfigLocation + + /WEB-INF/wisemapping-servlet.xml + + + + + + + mvc-rest + org.springframework.web.servlet.DispatcherServlet + 1 + + + contextConfigLocation + + /WEB-INF/wisemapping-rest.xml + + + + + + + dwr-invoker + org.directwebremoting.servlet.DwrServlet + + debug + true + + + + + mvc-servlet + *.htm + + + + mvc-rest + /service/* + + + + dwr-invoker + /dwr/* + + + + + index.jsp + + + + 180 + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml index 02a1603a..351e84cb 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml @@ -1,167 +1,167 @@ - - - - - - - - - CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON - PATTERN_TYPE_APACHE_ANT - /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /c/login.htm?login_error=2 - /c/login.htm?login_error=3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON - PATTERN_TYPE_APACHE_ANT - /index.jsp=IS_AUTHENTICATED_ANONYMOUSLY - /c/login*=IS_AUTHENTICATED_ANONYMOUSLY - /c/userregistration*=IS_AUTHENTICATED_ANONYMOUSLY - /c/activation.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/forgotpassword*=IS_AUTHENTICATED_ANONYMOUSLY - /c/captcha*=IS_AUTHENTICATED_ANONYMOUSLY - /c/home.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/try.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/search.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/keyboard.htm=IS_AUTHENTICATED_ANONYMOUSLY - /css/*=IS_AUTHENTICATED_ANONYMOUSLY - /js/**=IS_AUTHENTICATED_ANONYMOUSLY - /ws/**=IS_AUTHENTICATED_ANONYMOUSLY - /images/*=IS_AUTHENTICATED_ANONYMOUSLY - /c/embeddedview.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/export.htm=IS_AUTHENTICATED_ANONYMOUSLY - /c/publicview.htm=IS_AUTHENTICATED_ANONYMOUSLY - /dwr/engine.js=IS_AUTHENTICATED_ANONYMOUSLY - /dwr/interface/loggerservice.js=IS_AUTHENTICATED_ANONYMOUSLY - /dwr/call/plaincall/loggerservice.logerror.dwr=IS_AUTHENTICATED_ANONYMOUSLY - /**=IS_AUTHENTICATED_REMEMBERED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /c/login.htm?login_error=2 + /c/login.htm?login_error=3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /index.jsp=IS_AUTHENTICATED_ANONYMOUSLY + /c/login*=IS_AUTHENTICATED_ANONYMOUSLY + /c/userregistration*=IS_AUTHENTICATED_ANONYMOUSLY + /c/activation.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/forgotpassword*=IS_AUTHENTICATED_ANONYMOUSLY + /c/captcha*=IS_AUTHENTICATED_ANONYMOUSLY + /c/home.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/try.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/search.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/keyboard.htm=IS_AUTHENTICATED_ANONYMOUSLY + /css/*=IS_AUTHENTICATED_ANONYMOUSLY + /js/**=IS_AUTHENTICATED_ANONYMOUSLY + /ws/**=IS_AUTHENTICATED_ANONYMOUSLY + /images/*=IS_AUTHENTICATED_ANONYMOUSLY + /c/embeddedview.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/export.htm=IS_AUTHENTICATED_ANONYMOUSLY + /c/publicview.htm=IS_AUTHENTICATED_ANONYMOUSLY + /dwr/engine.js=IS_AUTHENTICATED_ANONYMOUSLY + /dwr/interface/loggerservice.js=IS_AUTHENTICATED_ANONYMOUSLY + /dwr/call/plaincall/loggerservice.logerror.dwr=IS_AUTHENTICATED_ANONYMOUSLY + /**=IS_AUTHENTICATED_REMEMBERED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml new file mode 100755 index 00000000..270a65cf --- /dev/null +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + getMindmapUserBy + getMindmapById + + + + + + + + + + + update* + add* + remove* + remove* + + + + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml deleted file mode 100755 index d7ae09ab..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-captcha.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - 0 - 150 - - - - - 0 - 150 - - - - - 0 - 150 - - - - - 255 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml index 002aa249..640ebada 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml new file mode 100644 index 00000000..ea5db949 --- /dev/null +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + com.wisemapping.model.User + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml old mode 100755 new mode 100644 index 7bb920c8..26b75537 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml @@ -1,42 +1,61 @@ - - - - - - - - - - - - getMindmapUserBy - getMindmapById - - - - - - - - - - - update* - add* - remove* - remove* - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 0c91bc03..b19db494 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -1,347 +1,346 @@ - - - - - - - - - - - - / - /index.jsp - /c/home.htm - /c/login.htm - /c/userRegistration.htm - /c/captcha.htm - /c/publicView.htm - /c/export.htm - /c/search.htm - /c/keyboard.htm - /c/renameMap.htm - /c/embeddedView.htm - /c/forgotPassword.htm - - - - - - - - - - browserNotSupported - - securityError - emailNotExistsError - - - - - - - - - - - - - - - - - - - - - - messages - - - - - - - - - - tryEditor - installCFG - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - settings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mindmapController - userController - sharingController - homeController - loginController - captchaController - forgotPasswordController - activationController - changePasswordController - editorController - cookerController - settingsController - exportController - publishController - editProfileController - tagsController - searchController - keyboardController - publicView - embeddedView - renameMapController - importMapController - newMapController - historyController - homeController - - - - - - - - - - - - /WEB-INF/defs/definitions.xml - - - - - - - - - - - - - + + + + + + + + + + + + / + /index.jsp + /c/home.htm + /c/login.htm + /c/userRegistration.htm + /c/captcha.htm + /c/publicView.htm + /c/export.htm + /c/search.htm + /c/keyboard.htm + /c/renameMap.htm + /c/embeddedView.htm + /c/forgotPassword.htm + + + + + + + + + + browserNotSupported + + securityError + emailNotExistsError + + + + + + + + + + + + + + + + + + + + + + messages + + + + + + + + + + tryEditor + installCFG + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + settings + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mindmapController + userController + sharingController + homeController + loginController + forgotPasswordController + activationController + changePasswordController + editorController + cookerController + settingsController + exportController + publishController + editProfileController + tagsController + searchController + keyboardController + publicView + embeddedView + renameMapController + importMapController + newMapController + historyController + homeController + + + + + + + + + + + + /WEB-INF/defs/definitions.xml + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml deleted file mode 100644 index ddbea891..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-ws-servlet.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - com.wisemapping.ws.LoadMindmapRequest - com.wisemapping.ws.LoadMindmapResponse - com.wisemapping.ws.AddMindmapRequest - com.wisemapping.ws.AddMindmapResponse - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/accessDenied.jsp b/wise-webapp/src/main/webapp/jsp/accessDenied.jsp index 89d88ce3..d637607b 100644 --- a/wise-webapp/src/main/webapp/jsp/accessDenied.jsp +++ b/wise-webapp/src/main/webapp/jsp/accessDenied.jsp @@ -1,20 +1,20 @@ -<%@ page import="org.acegisecurity.context.SecurityContextHolder" %> -<%@ page import="org.acegisecurity.Authentication" %> -<%@ page import="org.acegisecurity.ui.AccessDeniedHandlerImpl" %> - -

Sorry, access is denied

- - -

- <%= request.getAttribute(AccessDeniedHandlerImpl.ACEGI_SECURITY_ACCESS_DENIED_EXCEPTION_KEY)%> - -

- - <% - - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { - - %> - Authentication object as a String: <%= auth.toString() %>

- <% } %> +<%--<%@ page import="org.acegisecurity.context.SecurityContextHolder" %>--%> +<%--<%@ page import="org.acegisecurity.Authentication" %>--%> +<%--<%@ page import="org.acegisecurity.ui.AccessDeniedHandlerImpl" %>--%> + +<%--

Sorry, access is denied

--%> + + +<%--

--%> + <%--<%= request.getAttribute(AccessDeniedHandlerImpl.ACEGI_SECURITY_ACCESS_DENIED_EXCEPTION_KEY)%>--%> + +<%--

--%> + + <%--<%--%> + + <%--Authentication auth = SecurityContextHolder.getContext().getAuthentication();--%> + <%--if (auth != null) {--%> + + <%--%>--%> + <%--Authentication object as a String: <%= auth.toString() %>

--%> + <%--<% } %>--%> diff --git a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp index 3e0598a2..741da0df 100644 --- a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp +++ b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp @@ -12,8 +12,8 @@ - - + + diff --git a/wise-webapp/src/main/webapp/jsp/homepage.jsp b/wise-webapp/src/main/webapp/jsp/homepage.jsp index 418686af..e412f9cc 100644 --- a/wise-webapp/src/main/webapp/jsp/homepage.jsp +++ b/wise-webapp/src/main/webapp/jsp/homepage.jsp @@ -1,3 +1,3 @@ -<% - response.sendRedirect(request.getContextPath() + "/c/login.htm"); +<% + response.sendRedirect(request.getContextPath() + "/c/mymaps.htm"); %> \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index 76f3b6de..8b7cefe5 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -1,106 +1,106 @@ -<%@ include file="/jsp/init.jsp" %> - - -

- -
-

What is New:

-
    -
  • Links Between Nodes
    • -
  • FreeMind 0.9 Update
    • -
  • Improved HTML 5.0 Support
    • -
  • Firefox 4.0 is officially supported
    • -
-
-
-

- -

- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
-   - - - - - - - - - -
- - : - - -
- - : - - -
- - - -
  - "> - - -
-
-
-
- -
- - - - - - - -
- - - - -
Note: 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 here.
- +<%@ include file="/jsp/init.jsp" %> + + +
+ +
+

What is New:

+
    +
  • Links Between Nodes
    • +
  • FreeMind 0.9 Update
    • +
  • Improved HTML 5.0 Support
    • +
  • Firefox 4.0 is officially supported
    • +
+
+
+

+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+   + + + + + + + + + +
+ + : + + +
+ + : + + +
+ + + +
  + "> + + +
+
+
+
+ +
+ + + + + + + +
+ + + + +
Note: 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 here.
+ diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 546b67a5..13ca74b1 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -1,454 +1,454 @@ - - -<%@ page import="com.wisemapping.view.MindMapBean" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Collections" %> -<%@ page import="java.util.ArrayList" %> -<%@ include file="/jsp/init.jsp" %> - - - - <spring:message code="SITE.TITLE"/> - - - - - - - - -
- - - - - - - - - - - - - - -
- -
- -
-
- -
-
-
- <% - int MAX_RECENT_MAPS = 6; - List list = (List) request.getAttribute("wisemapsList"); - if (list != null && !list.isEmpty()) { - List recentMaps = new ArrayList(); - recentMaps.addAll(list); - Collections.sort(recentMaps, new MindMapBean.MindMapBeanComparator()); - for (int i = recentMaps.size() - 1; i >= 0 && i >= recentMaps.size() - MAX_RECENT_MAPS; i--) { - %> - -
-
- - <%=recentMaps.get(i).getTitle()%> - -
- - <% - } - } else { - %> -
- -
- <% - } - %> -
-
-
- -
-
- - -
-
- "> - - -
-
', - { - 'window': {theme:Windoo.Themes.wise, - title:'' - }, - 'onConfirm':function(){ - $(document.toolbarForm.mindmapIds).value=$('selectedMapIds').value; - $(document.toolbarForm).action=''; - $(document.toolbarForm).submit(); - } - });"> - -
-
-
- "> - - -
-
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -   -
-
- 		-
- - -
- "> - - - - "> - - - - "> - - - -
', - { - window: {'theme':Windoo.Themes.wise, - title:'' - }, - 'onConfirm':function(){ - var form = new Element('form').setProperties({action: '&mapId=${mindmap.id}', method:'post'}).injectInside(document.body); - form.submit(); - } - });"> - -
- "> - - - - &mapId=${mindmap.id}" - rel="moodalbox 780px 530px wizard" - title=""> - - - "> - - - - <%--"> - - --%> - <%-- - - --%> -
-
- 		-
-
- - ${mindmap.title} - -
-
- ${mindmap.tags} -
-
- 		- ${mindmap.description} - - - - : " - alt=""/> - - - : " - alt="World" - - - - ${mindmap.creationUser}${mindmap.lastEditDate} by ${mindmap.lastEditor}&mapId=${mindmap.id}"> - - -
-
-
- - - - -
-
- - -
- - -
-
- -
-
" target="new"> - - -
-
- - - - - + + +<%@ page import="com.wisemapping.view.MindMapBean" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Collections" %> +<%@ page import="java.util.ArrayList" %> +<%@ include file="/jsp/init.jsp" %> + + + + <spring:message code="SITE.TITLE"/> + + + + + + + + +
+ + + + + + + + + + + + + + +
+ +
+ +
+
+ +
+
+
+ <% + int MAX_RECENT_MAPS = 6; + List list = (List) request.getAttribute("wisemapsList"); + if (list != null && !list.isEmpty()) { + List recentMaps = new ArrayList(); + recentMaps.addAll(list); + Collections.sort(recentMaps, new MindMapBean.MindMapBeanComparator()); + for (int i = recentMaps.size() - 1; i >= 0 && i >= recentMaps.size() - MAX_RECENT_MAPS; i--) { + %> + +
+
+ + <%=recentMaps.get(i).getTitle()%> + +
+ + <% + } + } else { + %> +
+ +
+ <% + } + %> +
+
+
+ +
+
+ + +
+
+ "> + + +
+
', + { + 'window': {theme:Windoo.Themes.wise, + title:'' + }, + 'onConfirm':function(){ + $(document.toolbarForm.mindmapIds).value=$('selectedMapIds').value; + $(document.toolbarForm).action=''; + $(document.toolbarForm).submit(); + } + });"> + +
+
+
+ "> + + +
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +   +
+
+ 		+
+ + +
+ "> + + + + "> + + + + "> + + + +
', + { + window: {'theme':Windoo.Themes.wise, + title:'' + }, + 'onConfirm':function(){ + var form = new Element('form').setProperties({action: '&mapId=${mindmap.id}', method:'post'}).injectInside(document.body); + form.submit(); + } + });"> + +
+ "> + + + + &mapId=${mindmap.id}" + rel="moodalbox 780px 530px wizard" + title=""> + + + "> + + + + <%--"> + + --%> + <%-- + + --%> +
+
+ 		+
+
+ + ${mindmap.title} + +
+
+ ${mindmap.tags} +
+
+ 		+ ${mindmap.description} + + + + : " + alt=""/> + + + : " + alt="World" + + + + ${mindmap.creationUser}${mindmap.lastEditDate} by ${mindmap.lastEditor}&mapId=${mindmap.id}"> + + +
+
+
+ + + + +
+
+ + +
+ + +
+
+ +
+
" target="new"> + + +
+
+ + + + + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp index 3db84a22..7bdf5e20 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp @@ -25,8 +25,8 @@ - - + + diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp index 48e123d5..8b54917c 100644 --- a/wise-webapp/src/main/webapp/jsp/template.jsp +++ b/wise-webapp/src/main/webapp/jsp/template.jsp @@ -1,44 +1,44 @@ - -<%@page pageEncoding="UTF-8" %> -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> -<%@ include file="/jsp/init.jsp" %> - - - - - - - <spring:message code="SITE.TITLE"/> - - - <c:choose> - <c:when test="${requestScope.viewTitle!=null}"> - ${requestScope.viewTitle} - </c:when> - <c:otherwise> - <spring:message code="${requestScope.title}"/> - </c:otherwise> - </c:choose> - - - - - - - - - - - - - -
- -
- -
-
- - - - + +<%@page pageEncoding="UTF-8" %> +<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> +<%@ include file="/jsp/init.jsp" %> + + + + + + + <spring:message code="SITE.TITLE"/> + - + <c:choose> + <c:when test="${requestScope.viewTitle!=null}"> + ${requestScope.viewTitle} + </c:when> + <c:otherwise> + <spring:message code="${requestScope.title}"/> + </c:otherwise> + </c:choose> + + + + + + + + + + + + + +
+ +
+ +
+
+ + + +