diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java index db73e850..58a9f4e5 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java @@ -289,15 +289,19 @@ public class FreemindExporter // Font size if (idx < countParts && part[idx].length() != 0) { - String size = part[idx]; - font.setSIZE(new BigInteger(size)); - updated = true; + final String size = part[idx]; + if (size != null && !size.isEmpty()) { + int freeSize = Integer.parseInt(size); + font.setSIZE(BigInteger.valueOf(wiseToFreeFontSize.get(freeSize))); + updated = true; + } } idx++; // Font Color if (idx < countParts && part[idx].length() != 0) { freemindNode.setCOLOR(part[idx]); + updated = true; } idx++; @@ -319,4 +323,21 @@ public class FreemindExporter } } } + + // Freemind size goes from 10 to 28 + // WiseMapping: + // 6 Small + // 8 Normal + // 10 Large + // 15 Huge + static private Map wiseToFreeFontSize = new HashMap(); + + static { + wiseToFreeFontSize.put(6, 10); + wiseToFreeFontSize.put(8, 12); + wiseToFreeFontSize.put(10, 18); + wiseToFreeFontSize.put(15, 24); + } + + } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java index ec250742..fb3865e7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java @@ -131,7 +131,10 @@ public class TransformerController extends BaseController { throw new IllegalArgumentException("Unsupported export format"); } - result.getModelMap().put("filename", filename); + // IE does not support spaces in the name... As usual ... + if(filename!=null){ + result.getModelMap().put("filename", filename.replaceAll(" ","_")); + } return result; } } diff --git a/wise-webapp/src/main/resources/messages_ca.properties b/wise-webapp/src/main/resources/messages_ca.properties index be91a123..bdba622f 100644 --- a/wise-webapp/src/main/resources/messages_ca.properties +++ b/wise-webapp/src/main/resources/messages_ca.properties @@ -19,7 +19,7 @@ REGISTER=Registre REMEMBER_ME=Recordar la meva sessiĆ³ SIGN_IN=Entrar SIGN_UP=Registra't -ACCOUNT=El jeu compte +ACCOUNT=El seu compte USERNAME=Nom d'usuari CLOSE=Tancar NOT_READY_A_USER=Encara no utilitza WiseMapping? diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index b631cbca..a9af7e54 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties @@ -12,6 +12,17 @@ #database.validation.enabled=true #database.validation.query=SELECT 1 +## PostgreSQL configuration properties +#database.url=jdbc:postgresql:///wisemapping +#database.driver=org.postgresql.Driver +#database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +#database.username= +#database.password= +#database.validation.enabled=true +#database.validation.query= +#database.validation.enabled=false + + # HSQL Configuration properties database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping database.driver=org.hsqldb.jdbc.JDBCDriver diff --git a/wise-webapp/src/main/webapp/js/jquery.timeago.ca.js b/wise-webapp/src/main/webapp/js/jquery.timeago.ca.js new file mode 100644 index 00000000..ac82e1d4 --- /dev/null +++ b/wise-webapp/src/main/webapp/js/jquery.timeago.ca.js @@ -0,0 +1,18 @@ +// Catalan +jQuery.timeago.settings.strings = { + prefixAgo: "fa", + prefixFromNow: "d'aqui a", + suffixAgo: null, + suffixFromNow: null, + seconds: "menys d'1 minut", + minute: "1 minut", + minutes: "uns %d minuts", + hour: "1 hora", + hours: "unes %d hores", + day: "1 dia", + days: "%d dies", + month: "aproximadament un mes", + months: "%d mesos", + year: "aproximadament un any", + years: "%d anys" +}; diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index 11e461b9..3785db23 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -124,7 +124,7 @@ $('#changePasswordMsg').removeClass('alert-info').addClass('alert-error').show(); $('#changePasswordMsg').text(''); } else { - postChange("c/restful/account/password", inputVal, 'changePasswordMsg', ''); + postChange("c/restful/account/password", inputVal, 'changePasswordMsg', ""); } event.preventDefault(); }); @@ -133,15 +133,15 @@ var fistname = $('#changeUserForm #firstname').val(); var lastname = $('#changeUserForm #lastname').val(); - postChange("c/restful/account/firstname", fistname, 'changeInfoMsg', ''); - postChange("c/restful/account/lastname", lastname, 'changeInfoMsg', ''); + postChange("c/restful/account/firstname", fistname, 'changeInfoMsg', ""); + postChange("c/restful/account/lastname", lastname, 'changeInfoMsg', ""); event.preventDefault(); }); $('#languageForm').submit(function (event) { var locale = $('#languageForm option:selected').val(); - postChange("c/restful/account/locale", locale, 'languageMsg', ''); + postChange("c/restful/account/locale", locale, 'languageMsg', ""); event.preventDefault(); }); diff --git a/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.png b/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/bug1-exp.png b/wise-webapp/src/test/resources/data/svg/bug1-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/bug2-exp.png b/wise-webapp/src/test/resources/data/svg/bug2-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/bug3-exp.png b/wise-webapp/src/test/resources/data/svg/bug3-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0-exp.png b/wise-webapp/src/test/resources/data/svg/map-3.0-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map1-exp.png b/wise-webapp/src/test/resources/data/svg/map1-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map2-exp.png b/wise-webapp/src/test/resources/data/svg/map2-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map3-exp.png b/wise-webapp/src/test/resources/data/svg/map3-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map4-exp.png b/wise-webapp/src/test/resources/data/svg/map4-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map5-exp.png b/wise-webapp/src/test/resources/data/svg/map5-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/resources/data/svg/map6-exp.png b/wise-webapp/src/test/resources/data/svg/map6-exp.png new file mode 100644 index 00000000..e69de29b diff --git a/wise-webapp/src/test/sql/postgres/create-database.sql b/wise-webapp/src/test/sql/postgres/create-database.sql new file mode 100644 index 00000000..7000f0e2 --- /dev/null +++ b/wise-webapp/src/test/sql/postgres/create-database.sql @@ -0,0 +1,3 @@ +CREATE DATABASE wisemapping; +CREATE USER wisemapping WITH PASSWORD 'password'; +GRANT ALL PRIVILEGES ON DATABASE wisemapping TO wisemapping; diff --git a/wise-webapp/src/test/sql/postgres/create-schemas.sql b/wise-webapp/src/test/sql/postgres/create-schemas.sql new file mode 100644 index 00000000..df02023f --- /dev/null +++ b/wise-webapp/src/test/sql/postgres/create-schemas.sql @@ -0,0 +1,78 @@ +CREATE TABLE COLLABORATOR ( +id SERIAL NOT NULL PRIMARY KEY, +email varchar(255) NOT NULL UNIQUE, +creation_date date +); + +CREATE TABLE "user" ( +id SERIAL NOT NULL PRIMARY KEY, +colaborator_id INTEGER NOT NULL, +firstname varchar(255) NOT NULL, +lastname varchar(255) NOT NULL, +password varchar(255) NOT NULL, +activation_code BIGINT NOT NULL, +activation_date date, +allow_send_email text NOT NULL default 0, +locale varchar(5), +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ON DELETE CASCADE ON UPDATE NO ACTION +) ; + + +CREATE TABLE MINDMAP ( +id SERIAL NOT NULL PRIMARY KEY, +title varchar(255) NOT NULL, +description varchar(255) NOT NULL, +xml bytea NOT NULL, +public BOOL not null default FALSE, +creation_date timestamp, +edition_date timestamp, +creator_id INTEGER not null, +tags varchar(1014) , +last_editor_id INTEGER NOT NULL --, +--FOREIGN KEY(creator_id) REFERENCES "USER"(colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION +) ; + + +CREATE TABLE MINDMAP_HISTORY +(id SERIAL NOT NULL PRIMARY KEY, +xml bytea NOT NULL, +mindmap_id INTEGER NOT NULL, +creation_date timestamp, +editor_id INTEGER NOT NULL, +FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id) ON DELETE CASCADE ON UPDATE NO ACTION +) ; + + +CREATE TABLE COLLABORATION_PROPERTIES( +id SERIAL NOT NULL PRIMARY KEY, +starred BOOL NOT NULL default FALSE, +mindmap_properties varchar(512) +); + +CREATE TABLE COLLABORATION ( +id SERIAL NOT NULL PRIMARY KEY, +colaborator_id INTEGER NOT NULL, +properties_id INTEGER NOT NULL, +mindmap_id INTEGER NOT NULL, +role_id INTEGER NOT NULL, +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id), +FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id) ON DELETE CASCADE ON UPDATE NO ACTION, +FOREIGN KEY(properties_id) REFERENCES COLLABORATION_PROPERTIES(id) ON DELETE CASCADE ON UPDATE NO ACTION +) ; + +CREATE TABLE TAG( +id SERIAL NOT NULL PRIMARY KEY, +name varchar(255) NOT NULL, +user_id INTEGER NOT NULL --, +--FOREIGN KEY(user_id) REFERENCES "USER"(colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION +) ; + + +CREATE TABLE ACCESS_AUDITORY ( +id SERIAL NOT NULL PRIMARY KEY, +login_date date, +user_id INTEGER NOT NULL +) ; + + +COMMIT; diff --git a/wise-webapp/src/test/sql/postgres/drop-schemas.sql b/wise-webapp/src/test/sql/postgres/drop-schemas.sql new file mode 100644 index 00000000..ea2ddf18 --- /dev/null +++ b/wise-webapp/src/test/sql/postgres/drop-schemas.sql @@ -0,0 +1,9 @@ +DROP TABLE TAG; +DROP TABLE ACCESS_AUDITORY; +DROP TABLE COLLABORATION; +DROP TABLE COLLABORATION_PROPERTIES; +DROP TABLE MINDMAP_HISTORY; +DROP TABLE MINDMAP; +DROP TABLE "user"; +DROP TABLE COLLABORATOR; +COMMIT; \ No newline at end of file