Merge branch 'master' of repo.wisemapping.org:wisemapping/wiseorg

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<Integer, Integer> wiseToFreeFontSize = new HashMap<Integer, Integer>();
+
+    static {
+        wiseToFreeFontSize.put(6, 10);
+        wiseToFreeFontSize.put(8, 12);
+        wiseToFreeFontSize.put(10, 18);
+        wiseToFreeFontSize.put(15, 24);
+    }
+
+
 }

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;
     }
 }

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?

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://<hostname:port>/wisemapping
+#database.driver=org.postgresql.Driver
+#database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+#database.username=<username>
+#database.password=<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

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"
+};

wise-webapp/src/main/webapp/jsp/accountSettings.jsp

@@ -124,7 +124,7 @@
             $('#changePasswordMsg').removeClass('alert-info').addClass('alert-error').show();
             $('#changePasswordMsg').text('<spring:message code="PASSWORD_MISSMATCH"/>');
         } else {
-            postChange("c/restful/account/password", inputVal, 'changePasswordMsg', '<spring:message code="CHANGE_PASSWORD_SUCCESS"/>');
+            postChange("c/restful/account/password", inputVal, 'changePasswordMsg', "<spring:message code="CHANGE_PASSWORD_SUCCESS"/>");
         }
         event.preventDefault();
     });
@@ -133,15 +133,15 @@
 
         var fistname = $('#changeUserForm #firstname').val();
         var lastname = $('#changeUserForm #lastname').val();
-        postChange("c/restful/account/firstname", fistname, 'changeInfoMsg', '<spring:message code="INFO_UPDATE_SUCCESS"/>');
-        postChange("c/restful/account/lastname", lastname, 'changeInfoMsg', '<spring:message code="INFO_UPDATE_SUCCESS"/>');
+        postChange("c/restful/account/firstname", fistname, 'changeInfoMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>");
+        postChange("c/restful/account/lastname", lastname, 'changeInfoMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>");
         event.preventDefault();
     });
 
     $('#languageForm').submit(function (event) {
 
         var locale = $('#languageForm option:selected').val();
-        postChange("c/restful/account/locale", locale, 'languageMsg', '<spring:message code="INFO_UPDATE_SUCCESS"/>');
+        postChange("c/restful/account/locale", locale, 'languageMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>");
         event.preventDefault();
     });
 </script>

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;

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;

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;