Fix release version on master.

This reverts commit fff27e1bb7.

config/database/hsql/apopulate-schemas.sql

@@ -6,22 +6,5 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemappin
 INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
   VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1,'D');
 
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURDATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURDATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURDATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURDATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURDATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURDATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURDATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURDATE(), 1, 'D');
-
-
 COMMIT;
-SHUTDOWN;
+SHUTDOWN;

config/database/hsql/create-schemas.sql

@@ -37,7 +37,8 @@ CREATE TABLE LABEL (
   title           VARCHAR(30),
   creator_id      INTEGER            NOT NULL,
   parent_label_id INTEGER,
-  color           VARCHAR(7)         NOT NULL
+  color           VARCHAR(7)         NOT NULL,
+  iconName        VARCHAR(50)       NOT NULL
   --FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id)
 );
 

config/database/mysql/apopulate-schemas.sql

@@ -10,20 +10,4 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemappin
 INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
   VALUES (2, 'Admin', 'User', 'admin', 1237, CURRENT_DATE(), 1,'D');
 
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURRENT_DATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURRENT_DATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURRENT_DATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURRENT_DATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURRENT_DATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURRENT_DATE(), 1, 'D');
-
-INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURRENT_DATE());
-INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
-  VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURRENT_DATE(), 1, 'D');
-
 COMMIT;

config/database/mysql/create-schemas.sql

@@ -58,6 +58,7 @@ CREATE TABLE LABEL (
   creator_id      INTEGER            NOT NULL,
   parent_label_id INTEGER,
   color           VARCHAR(7)         NOT NULL,
+  iconName        VARCHAR(50)       NOT NULL,
   FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id),
   FOREIGN KEY (parent_label_id) REFERENCES LABEL (id)
     ON DELETE CASCADE

config/database/mysql/v3.0.2-to-v3.0.3.sql

@@ -31,4 +31,7 @@ CREATE TABLE R_LABEL_MINDMAP (
 )
   CHARACTER SET utf8;
 
+ALTER TABLE `LABEL`
+    ADD COLUMN iconName VARCHAR(50) NOT NULL;
 
+UPDATE LABEL SET iconName = 'glyphicon glyphicon-tag';

core-js/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.0.4</version>
     </parent>
 
     <build>

distribution/package-bin.sh

@@ -53,6 +53,7 @@ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/
 # Distribute scripts
 cp -r $BASE_DIR/../config/ $TARGET_DIR/wisemapping-$WISE_VERSION/config
 cp ./start.sh ${JETTY_DIR}/
+cp -r $BASE_DIR/service $TARGET_DIR/wisemapping-$WISE_VERSION/service
 
 # Store version
 echo $1 > $WISE_WEBAPP_DIR/version

distribution/service/wisemapping

@@ -0,0 +1,72 @@
+#!/bin/bash
+### BEGIN INIT INFO
+# Provides:          wisemapping
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: wisemapping
+# Description:       www.wisemapping.com
+### END INIT INFO
+
+set -e
+set -u
+
+#environmental variables
+JAVA_HOME="/usr/lib/jvm/java7"
+JDK_HOME=$JAVA_HOME
+export PATH=$JAVA_HOME/bin:$PATH
+WISE_HOME="/opt/wisemapping"
+PID_FILE="$WISE_HOME/.pid"
+SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
+
+preInitChecks() {
+  MYSQL_STATUS=`pgrep mysql`
+  if [ -z $MYSQL_STATUS ]; then
+    service mysql start >/dev/null 2>&1
+  fi
+}
+
+wiseStatus() {
+  echo `pgrep -f "$WISE_HOME/start.jar"`
+}
+
+case "${1:-''}" in
+  'start')
+    #preInitChecks
+    cd $WISE_HOME
+    echo "Starting Wisemapping..."
+    java -Xmx256m -Dorg.apache.jasper.compiler.disablejsr199=true -jar $WISE_HOME/start.jar > $WISE_HOME/logs/start.log 2>&1 &
+    PID=$!
+    cd - >/dev/null 2>&1
+    echo "proccess id: $PID"
+    echo "$PID" > $PID_FILE
+	;;
+  'stop')
+    if [ ! -f $PID_FILE ]; then
+      PID=$(wiseStatus)
+    else 
+      PID=`cat $PID_FILE`
+      rm $PID_FILE >/dev/null 2>&1
+    fi
+    kill $PID
+    echo "Wisemapping stopped"
+	;;
+  'restart')
+	set +e; $SELF stop; set -e
+	$SELF start 
+	;;
+  'status')
+	STATUS=$(wiseStatus)
+        if [ -n "$STATUS" ]; then
+          echo "Wisemapping server is running, pid: $STATUS"
+        else
+          echo "Wisemapping is stopped"
+        fi
+        ;;
+
+  *)
+	echo "Usage: $SELF start|stop|restart|status"
+	exit 1
+	;;
+esac

mindplot/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.0.4</version>
     </parent>
 
     <dependencies>

mindplot/src/main/javascript/Designer.js

@@ -506,6 +506,11 @@ mindplot.Designer = new Class({
             if(borderColor){
                 targetModel.setBorderColor(borderColor)
             }
+
+            var backgroundColor = sourceModel.getBackgroundColor();
+            if(backgroundColor){
+                targetModel.setBackgroundColor(backgroundColor)
+            }
         },
 
         _createChildModel:function (topic, mousePos) {

mindplot/src/main/javascript/libraries/less/less-1.1.3.min.js

@@ -1,971 +0,0 @@
-//
-// LESS - Leaner CSS v1.1.3
-// http://lesscss.org
-// 
-// Copyright (c) 2009-2011, Alexis Sellier
-// Licensed under the Apache 2.0 License.
-//
-//
-// LESS - Leaner CSS v1.1.3
-// http://lesscss.org
-// 
-// Copyright (c) 2009-2011, Alexis Sellier
-// Licensed under the Apache 2.0 License.
-//
-(function(a, b) {
-    function v(a, b) {
-        var c = "less-error-message:" + p(b),e = ["<ul>",'<li><label>[-1]</label><pre class="ctx">{0}</pre></li>',"<li><label>[0]</label><pre>{current}</pre></li>",'<li><label>[1]</label><pre class="ctx">{2}</pre></li>',"</ul>"].join("\n"),f = document.createElement("div"),g,h;
-        f.id = c,f.className = "less-error-message",h = "<h3>" + (a.message || "There is an error in your .less file") + "</h3>" + '<p><a href="' + b + '">' + b + "</a> ",a.extract && (h += "on line " + a.line + ", column " + (a.column + 1) + ":</p>" + e.replace(/\[(-?\d)\]/g,
-            function(b, c) {
-                return parseInt(a.line) + parseInt(c) || ""
-            }).replace(/\{(\d)\}/g,
-            function(b, c) {
-                return a.extract[parseInt(c)] || ""
-            }).replace(/\{current\}/, a.extract[1].slice(0, a.column) + '<span class="error">' + a.extract[1].slice(a.column) + "</span>")),f.innerHTML = h,q([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #ee4444;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.ctx {","color: #dd4444;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"), {title:"error-message"}),f.style.cssText = ["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env == "development" && (g = setInterval(function() {
-            document.body && (document.getElementById(c) ? document.body.replaceChild(f, document.getElementById(c)) : document.body.insertBefore(f, document.body.firstChild),clearInterval(g))
-        }, 10))
-    }
-
-    function u(a) {
-        d.env == "development" && typeof console != "undefined" && console.log("less: " + a)
-    }
-
-    function t(a) {
-        return a && a.parentNode.removeChild(a)
-    }
-
-    function s() {
-        if (a.XMLHttpRequest)return new XMLHttpRequest;
-        try {
-            return new ActiveXObject("MSXML2.XMLHTTP.3.0")
-        } catch(b) {
-            u("browser doesn't support AJAX.");
-            return null
-        }
-    }
-
-    function r(a, b, c, e) {
-        function i(b, c, d) {
-            b.status >= 200 && b.status < 300 ? c(b.responseText, b.getResponseHeader("Last-Modified")) : typeof d == "function" && d(b.status, a)
-        }
-
-        var f = s(),h = g ? !1 : d.async;
-        typeof f.overrideMimeType == "function" && f.overrideMimeType("text/css"),f.open("GET", a, h),f.setRequestHeader("Accept", b || "text/x-less, text/css; q=0.9, */*; q=0.5"),f.send(null),g ? f.status === 0 ? c(f.responseText) : e(f.status, a) : h ? f.onreadystatechange = function() {
-            f.readyState == 4 && i(f, c, e)
-        } : i(f, c, e)
-    }
-
-    function q(a, b, c) {
-        var d,e = b.href ? b.href.replace(/\?.*$/, "") : "",f = "less:" + (b.title || p(e));
-        (d = document.getElementById(f)) === null && (d = document.createElement("style"),d.type = "text/css",d.media = b.media || "screen",d.id = f,document.getElementsByTagName("head")[0].appendChild(d));
-        if (d.styleSheet)try {
-            d.styleSheet.cssText = a
-        } catch(g) {
-            throw new Error("Couldn't reassign styleSheet.cssText.")
-        } else(function(a) {
-            d.childNodes.length > 0 ? d.firstChild.nodeValue !== a.nodeValue && d.replaceChild(a, d.firstChild) : d.appendChild(a)
-        })(document.createTextNode(a));
-        c && h && (u("saving " + e + " to cache."),h.setItem(e, a),h.setItem(e + ":timestamp", c))
-    }
-
-    function p(a) {
-        return a.replace(/^[a-z]+:\/\/?[^\/]+/, "").replace(/^\//, "").replace(/\?.*$/, "").replace(/\.[^\.\/]+$/, "").replace(/[^\.\w-]+/g, "-").replace(/\./g, ":")
-    }
-
-    function o(b, c, e, f) {
-        var g = a.location.href.replace(/[#?].*$/, ""),i = b.href.replace(/\?.*$/, ""),j = h && h.getItem(i),k = h && h.getItem(i + ":timestamp"),l = {css:j,timestamp:k};
-        /^(https?|file):/.test(i) || (i.charAt(0) == "/" ? i = a.location.protocol + "//" + a.location.host + i : i = g.slice(0, g.lastIndexOf("/") + 1) + i),r(b.href, b.type, function(a, g) {
-            if (!e && l && g && (new Date(g)).valueOf() === (new Date(l.timestamp)).valueOf())q(l.css, b),c(null, b, {local:!0,remaining:f}); else try {
-                (new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/, "")],mime:b.type})).parse(a, function(a, d) {
-                    if (a)return v(a, i);
-                    try {
-                        c(d, b, {local:!1,lastModified:g,remaining:f}),t(document.getElementById("less-error-message:" + p(i)))
-                    } catch(a) {
-                        v(a, i)
-                    }
-                })
-            } catch(h) {
-                v(h, i)
-            }
-        }, function(a, b) {
-            throw new Error("Couldn't load " + b + " (" + a + ")")
-        })
-    }
-
-    function n(a, b) {
-        for (var c = 0; c < d.sheets.length; c++)o(d.sheets[c], a, b, d.sheets.length - (c + 1))
-    }
-
-    function m() {
-        var a = document.getElementsByTagName("style");
-        for (var b = 0; b < a.length; b++)a[b].type.match(k) && (new d.Parser).parse(a[b].innerHTML || "", function(c, d) {
-            a[b].type = "text/css",a[b].innerHTML = d.toCSS()
-        })
-    }
-
-    function c(b) {
-        return a.less[b.split("/")[1]]
-    }
-
-    Array.isArray || (Array.isArray = function(a) {
-        return Object.prototype.toString.call(a) === "[object Array]" || a instanceof Array
-    }),Array.prototype.forEach || (Array.prototype.forEach = function(a, b) {
-        var c = this.length >>> 0;
-        for (var d = 0; d < c; d++)d in this && a.call(b, this[d], d, this)
-    }),Array.prototype.map || (Array.prototype.map = function(a) {
-        var b = this.length >>> 0,c = Array(b),d = arguments[1];
-        for (var e = 0; e < b; e++)e in this && (c[e] = a.call(d, this[e], e, this));
-        return c
-    }),Array.prototype.filter || (Array.prototype.filter = function(a) {
-        var b = [],c = arguments[1];
-        for (var d = 0; d < this.length; d++)a.call(c, this[d]) && b.push(this[d]);
-        return b
-    }),Array.prototype.reduce || (Array.prototype.reduce = function(a) {
-        var b = this.length >>> 0,c = 0;
-        if (b === 0 && arguments.length === 1)throw new TypeError;
-        if (arguments.length >= 2)var d = arguments[1]; else for (; ;) {
-            if (c in this) {
-                d = this[c++];
-                break
-            }
-            if (++c >= b)throw new TypeError
-        }
-        for (; c < b; c++)c in this && (d = a.call(null, d, this[c], c, this));
-        return d
-    }),Array.prototype.indexOf || (Array.prototype.indexOf = function(a) {
-        var b = this.length,c = arguments[1] || 0;
-        if (!b)return-1;
-        if (c >= b)return-1;
-        c < 0 && (c += b);
-        for (; c < b; c++) {
-            if (!Object.prototype.hasOwnProperty.call(this, c))continue;
-            if (a === this[c])return c
-        }
-        return-1
-    }),Object.keys || (Object.keys = function(a) {
-        var b = [];
-        for (var c in a)Object.prototype.hasOwnProperty.call(a, c) && b.push(c);
-        return b
-    }),String.prototype.trim || (String.prototype.trim = function() {
-        return String(this).replace(/^\s\s*/, "").replace(/\s\s*$/, "")
-    });
-    var d,e;
-    typeof a == "undefined" ? (d = exports,e = c("less/tree")) : (typeof a.less == "undefined" && (a.less = {}),d = a.less,e = a.less.tree = {}),d.Parser = function(a) {
-        function t(a) {
-            return typeof a == "string" ? b.charAt(c) === a : a.test(j[f]) ? !0 : !1
-        }
-
-        function s(a) {
-            var d,e,g,h,i,m,n,o;
-            if (a instanceof Function)return a.call(l.parsers);
-            if (typeof a == "string")d = b.charAt(c) === a ? a : null,g = 1,r(); else {
-                r();
-                if (d = a.exec(j[f]))g = d[0].length; else return null
-            }
-            if (d) {
-                o = c += g,m = c + j[f].length - g;
-                while (c < m) {
-                    h = b.charCodeAt(c);
-                    if (h !== 32 && h !== 10 && h !== 9)break;
-                    c++
-                }
-                j[f] = j[f].slice(g + (c - o)),k = c,j[f].length === 0 && f < j.length - 1 && f++;
-                return typeof d == "string" ? d : d.length === 1 ? d[0] : d
-            }
-        }
-
-        function r() {
-            c > k && (j[f] = j[f].slice(c - k),k = c)
-        }
-
-        function q() {
-            j[f] = g,c = h,k = c
-        }
-
-        function p() {
-            g = j[f],h = c,k = c
-        }
-
-        var b,c,f,g,h,i,j,k,l,m = this,n = function() {
-        },o = this.imports = {paths:a && a.paths || [],queue:[],files:{},mime:a && a.mime,push:function(b, c) {
-            var e = this;
-            this.queue.push(b),d.Parser.importer(b, this.paths, function(a) {
-                e.queue.splice(e.queue.indexOf(b), 1),e.files[b] = a,c(a),e.queue.length === 0 && n()
-            }, a)
-        }};
-        this.env = a = a || {},this.optimization = "optimization"in this.env ? this.env.optimization : 1,this.env.filename = this.env.filename || null;
-        return l = {imports:o,parse:function(d, g) {
-            var h,l,m,o,p,q,r = [],t,u = null;
-            c = f = k = i = 0,j = [],b = d.replace(/\r\n/g, "\n"),j = function(c) {
-                var d = 0,e = /[^"'`\{\}\/\(\)]+/g,f = /\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g = 0,h,i = c[0],j,k;
-                for (var l = 0,m,n; l < b.length; l++) {
-                    e.lastIndex = l,(h = e.exec(b)) && h.index === l && (l += h[0].length,i.push(h[0])),m = b.charAt(l),f.lastIndex = l,!k && !j && m === "/" && (n = b.charAt(l + 1),(n === "/" || n === "*") && (h = f.exec(b)) && h.index === l && (l += h[0].length,i.push(h[0]),m = b.charAt(l)));
-                    if (m === "{" && !k && !j)g++,i.push(m); else if (m === "}" && !k && !j)g--,i.push(m),c[++d] = i = []; else if (m === "(" && !k && !j)i.push(m),j = !0; else if (m === ")" && !k && j)i.push(m),j = !1; else {
-                        if (m === '"' || m === "'" || m === "`")k ? k = k === m ? !1 : k : k = m;
-                        i.push(m)
-                    }
-                }
-                if (g > 0)throw{type:"Syntax",message:"Missing closing `}`",filename:a.filename};
-                return c.map(function(a) {
-                    return a.join("")
-                })
-            }([
-                []
-            ]),h = new e.Ruleset([], s(this.parsers.primary)),h.root = !0,h.toCSS = function(c) {
-                var d,f,g;
-                return function(g, h) {
-                    function n(a) {
-                        return a ? (b.slice(0, a).match(/\n/g) || "").length : null
-                    }
-
-                    var i = [];
-                    g = g || {},typeof h == "object" && !Array.isArray(h) && (h = Object.keys(h).map(function(a) {
-                        var b = h[a];
-                        b instanceof e.Value || (b instanceof e.Expression || (b = new e.Expression([b])),b = new e.Value([b]));
-                        return new e.Rule("@" + a, b, !1, 0)
-                    }),i = [new e.Ruleset(null, h)]);
-                    try {
-                        var j = c.call(this, {frames:i}).toCSS([], {compress:g.compress || !1})
-                    } catch(k) {
-                        f = b.split("\n"),d = n(k.index);
-                        for (var l = k.index,m = -1; l >= 0 && b.charAt(l) !== "\n"; l--)m++;
-                        throw{type:k.type,message:k.message,filename:a.filename,index:k.index,line:typeof d == "number" ? d + 1 : null,callLine:k.call && n(k.call) + 1,callExtract:f[n(k.call)],stack:k.stack,column:m,extract:[f[d - 1],f[d],f[d + 1]]}
-                    }
-                    return g.compress ? j.replace(/(\s)+/g, "$1") : j
-                }
-            }(h.eval);
-            if (c < b.length - 1) {
-                c = i,q = b.split("\n"),p = (b.slice(0, c).match(/\n/g) || "").length + 1;
-                for (var v = c,w = -1; v >= 0 && b.charAt(v) !== "\n"; v--)w++;
-                u = {name:"ParseError",message:"Syntax Error on line " + p,index:c,filename:a.filename,line:p,column:w,extract:[q[p - 2],q[p - 1],q[p]]}
-            }
-            this.imports.queue.length > 0 ? n = function() {
-                g(u, h)
-            } : g(u, h)
-        },parsers:{primary:function() {
-            var a,b = [];
-            while ((a = s(this.mixin.definition) || s(this.rule) || s(this.ruleset) || s(this.mixin.call) || s(this.comment) || s(this.directive)) || s(/^[\s\n]+/))a && b.push(a);
-            return b
-        },comment:function() {
-            var a;
-            if (b.charAt(c) === "/") {
-                if (b.charAt(c + 1) === "/")return new e.Comment(s(/^\/\/.*/), !0);
-                if (a = s(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)
-            }
-        },entities:{quoted:function() {
-            var a,d = c,f;
-            b.charAt(d) === "~" && (d++,f = !0);
-            if (b.charAt(d) === '"' || b.charAt(d) === "'") {
-                f && s("~");
-                if (a = s(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0], a[1] || a[2], f)
-            }
-        },keyword:function() {
-            var a;
-            if (a = s(/^[A-Za-z-]+/))return new e.Keyword(a)
-        },call:function() {
-            var a,b,d = c;
-            if (!!(a = /^([\w-]+|%)\(/.exec(j[f]))) {
-                a = a[1].toLowerCase();
-                if (a === "url")return null;
-                c += a.length;
-                if (a === "alpha")return s(this.alpha);
-                s("("),b = s(this.entities.arguments);
-                if (!s(")"))return;
-                if (a)return new e.Call(a, b, d)
-            }
-        },arguments:function() {
-            var a = [],b;
-            while (b = s(this.expression)) {
-                a.push(b);
-                if (!s(","))break
-            }
-            return a
-        },literal:function() {
-            return s(this.entities.dimension) || s(this.entities.color) || s(this.entities.quoted)
-        },url:function() {
-            var a;
-            if (b.charAt(c) === "u" && !!s(/^url\(/)) {
-                a = s(this.entities.quoted) || s(this.entities.variable) || s(this.entities.dataURI) || s(/^[-\w%@$\/.&=:;#+?~]+/) || "";
-                if (!s(")"))throw new Error("missing closing ) for url()");
-                return new e.URL(a.value || a.data || a instanceof e.Variable ? a : new e.Anonymous(a), o.paths)
-            }
-        },dataURI:function() {
-            var a;
-            if (s(/^data:/)) {
-                a = {},a.mime = s(/^[^\/]+\/[^,;)]+/) || "",a.charset = s(/^;\s*charset=[^,;)]+/) || "",a.base64 = s(/^;\s*base64/) || "",a.data = s(/^,\s*[^)]+/);
-                if (a.data)return a
-            }
-        },variable:function() {
-            var a,d = c;
-            if (b.charAt(c) === "@" && (a = s(/^@@?[\w-]+/)))return new e.Variable(a, d)
-        },color:function() {
-            var a;
-            if (b.charAt(c) === "#" && (a = s(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])
-        },dimension:function() {
-            var a,d = b.charCodeAt(c);
-            if (!(d > 57 || d < 45 || d === 47))if (a = s(/^(-?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1], a[2])
-        },javascript:function() {
-            var a,d = c,f;
-            b.charAt(d) === "~" && (d++,f = !0);
-            if (b.charAt(d) === "`") {
-                f && s("~");
-                if (a = s(/^`([^`]*)`/))return new e.JavaScript(a[1], c, f)
-            }
-        }},variable:function() {
-            var a;
-            if (b.charAt(c) === "@" && (a = s(/^(@[\w-]+)\s*:/)))return a[1]
-        },shorthand:function() {
-            var a,b;
-            if (!!t(/^[@\w.%-]+\/[@\w.-]+/) && (a = s(this.entity)) && s("/") && (b = s(this.entity)))return new e.Shorthand(a, b)
-        },mixin:{call:function() {
-            var a = [],d,f,g,h = c,i = b.charAt(c);
-            if (i === "." || i === "#") {
-                while (d = s(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))a.push(new e.Element(f, d)),f = s(">");
-                s("(") && (g = s(this.entities.arguments)) && s(")");
-                if (a.length > 0 && (s(";") || t("}")))return new e.mixin.Call(a, g, h)
-            }
-        },definition:function() {
-            var a,d = [],f,g,h,i;
-            if (!(b.charAt(c) !== "." && b.charAt(c) !== "#" || t(/^[^{]*(;|})/)))if (f = s(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)) {
-                a = f[1];
-                while (h = s(this.entities.variable) || s(this.entities.literal) || s(this.entities.keyword)) {
-                    if (h instanceof e.Variable)if (s(":"))if (i = s(this.expression))d.push({name:h.name,value:i}); else throw new Error("Expected value"); else d.push({name:h.name}); else d.push({value:h});
-                    if (!s(","))break
-                }
-                if (!s(")"))throw new Error("Expected )");
-                g = s(this.block);
-                if (g)return new e.mixin.Definition(a, d, g)
-            }
-        }},entity:function() {
-            return s(this.entities.literal) || s(this.entities.variable) || s(this.entities.url) || s(this.entities.call) || s(this.entities.keyword) || s(this.entities.javascript) || s(this.comment)
-        },end:function() {
-            return s(";") || t("}")
-        },alpha:function() {
-            var a;
-            if (!!s(/^\(opacity=/i))if (a = s(/^\d+/) || s(this.entities.variable)) {
-                if (!s(")"))throw new Error("missing closing ) for alpha()");
-                return new e.Alpha(a)
-            }
-        },element:function() {
-            var a,b,c;
-            c = s(this.combinator),a = s(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/) || s("*") || s(this.attribute) || s(/^\([^)@]+\)/);
-            if (a)return new e.Element(c, a)
-        },combinator:function() {
-            var a,d = b.charAt(c);
-            if (d === ">" || d === "&" || d === "+" || d === "~") {
-                c++;
-                while (b.charAt(c) === " ")c++;
-                return new e.Combinator(d)
-            }
-            if (d === ":" && b.charAt(c + 1) === ":") {
-                c += 2;
-                while (b.charAt(c) === " ")c++;
-                return new e.Combinator("::")
-            }
-            return b.charAt(c - 1) === " " ? new e.Combinator(" ") : new e.Combinator(null)
-        },selector:function() {
-            var a,d,f = [],g,h;
-            while (d = s(this.element)) {
-                g = b.charAt(c),f.push(d);
-                if (g === "{" || g === "}" || g === ";" || g === ",")break
-            }
-            if (f.length > 0)return new e.Selector(f)
-        },tag:function() {
-            return s(/^[a-zA-Z][a-zA-Z-]*[0-9]?/) || s("*")
-        },attribute:function() {
-            var a = "",b,c,d;
-            if (!!s("[")) {
-                if (b = s(/^[a-zA-Z-]+/) || s(this.entities.quoted))(d = s(/^[|~*$^]?=/)) && (c = s(this.entities.quoted) || s(/^[\w-]+/)) ? a = [b,d,c.toCSS ? c.toCSS() : c].join("") : a = b;
-                if (!s("]"))return;
-                if (a)return"[" + a + "]"
-            }
-        },block:function() {
-            var a;
-            if (s("{") && (a = s(this.primary)) && s("}"))return a
-        },ruleset:function() {
-            var a = [],b,d,g;
-            p();
-            if (g = /^([.#: \w-]+)[\s\n]*\{/.exec(j[f]))c += g[0].length - 1,a = [new e.Selector([new e.Element(null, g[1])])]; else while (b = s(this.selector)) {
-                a.push(b),s(this.comment);
-                if (!s(","))break;
-                s(this.comment)
-            }
-            if (a.length > 0 && (d = s(this.block)))return new e.Ruleset(a, d);
-            i = c,q()
-        },rule:function() {
-            var a,d,g = b.charAt(c),k,l;
-            p();
-            if (g !== "." && g !== "#" && g !== "&")if (a = s(this.variable) || s(this.property)) {
-                a.charAt(0) != "@" && (l = /^([^@+\/'"*`(;{}-]*);/.exec(j[f])) ? (c += l[0].length - 1,d = new e.Anonymous(l[1])) : a === "font" ? d = s(this.font) : d = s(this.value),k = s(this.important);
-                if (d && s(this.end))return new e.Rule(a, d, k, h);
-                i = c,q()
-            }
-        },"import":function() {
-            var a;
-            if (s(/^@import\s+/) && (a = s(this.entities.quoted) || s(this.entities.url)) && s(";"))return new e.Import(a, o)
-        },directive:function() {
-            var a,d,f,g;
-            if (b.charAt(c) === "@") {
-                if (d = s(this["import"]))return d;
-                if (a = s(/^@media|@page|@-[-a-z]+/)) {
-                    g = (s(/^[^{]+/) || "").trim();
-                    if (f = s(this.block))return new e.Directive(a + " " + g, f)
-                } else if (a = s(/^@[-a-z]+/))if (a === "@font-face") {
-                    if (f = s(this.block))return new e.Directive(a, f)
-                } else if ((d = s(this.entity)) && s(";"))return new e.Directive(a, d)
-            }
-        },font:function() {
-            var a = [],b = [],c,d,f,g;
-            while (g = s(this.shorthand) || s(this.entity))b.push(g);
-            a.push(new e.Expression(b));
-            if (s(","))while (g = s(this.expression)) {
-                a.push(g);
-                if (!s(","))break
-            }
-            return new e.Value(a)
-        },value:function() {
-            var a,b = [],c;
-            while (a = s(this.expression)) {
-                b.push(a);
-                if (!s(","))break
-            }
-            if (b.length > 0)return new e.Value(b)
-        },important:function() {
-            if (b.charAt(c) === "!")return s(/^! *important/)
-        },sub:function() {
-            var a;
-            if (s("(") && (a = s(this.expression)) && s(")"))return a
-        },multiplication:function() {
-            var a,b,c,d;
-            if (a = s(this.operand)) {
-                while ((c = s("/") || s("*")) && (b = s(this.operand)))d = new e.Operation(c, [d || a,b]);
-                return d || a
-            }
-        },addition:function() {
-            var a,d,f,g;
-            if (a = s(this.multiplication)) {
-                while ((f = s(/^[-+]\s+/) || b.charAt(c - 1) != " " && (s("+") || s("-"))) && (d = s(this.multiplication)))g = new e.Operation(f, [g || a,d]);
-                return g || a
-            }
-        },operand:function() {
-            var a,d = b.charAt(c + 1);
-            b.charAt(c) === "-" && (d === "@" || d === "(") && (a = s("-"));
-            var f = s(this.sub) || s(this.entities.dimension) || s(this.entities.color) || s(this.entities.variable) || s(this.entities.call);
-            return a ? new e.Operation("*", [new e.Dimension(-1),f]) : f
-        },expression:function() {
-            var a,b,c = [],d;
-            while (a = s(this.addition) || s(this.entity))c.push(a);
-            if (c.length > 0)return new e.Expression(c)
-        },property:function() {
-            var a;
-            if (a = s(/^(\*?-?[-a-z_0-9]+)\s*:/))return a[1]
-        }}}
-    },typeof a != "undefined" && (d.Parser.importer = function(a, b, c, d) {
-        a.charAt(0) !== "/" && b.length > 0 && (a = b[0] + a),o({href:a,title:a,type:d.mime}, c, !0)
-    }),function(a) {
-        function d(a) {
-            return Math.min(1, Math.max(0, a))
-        }
-
-        function c(b) {
-            if (b instanceof a.Dimension)return parseFloat(b.unit == "%" ? b.value / 100 : b.value);
-            if (typeof b == "number")return b;
-            throw{error:"RuntimeError",message:"color functions take numbers as parameters"}
-        }
-
-        function b(b) {
-            return a.functions.hsla(b.h, b.s, b.l, b.a)
-        }
-
-        a.functions = {rgb:function(a, b, c) {
-            return this.rgba(a, b, c, 1)
-        },rgba:function(b, d, e, f) {
-            var g = [b,d,e].map(function(a) {
-                return c(a)
-            }),f = c(f);
-            return new a.Color(g, f)
-        },hsl:function(a, b, c) {
-            return this.hsla(a, b, c, 1)
-        },hsla:function(a, b, d, e) {
-            function h(a) {
-                a = a < 0 ? a + 1 : a > 1 ? a - 1 : a;
-                return a * 6 < 1 ? g + (f - g) * a * 6 : a * 2 < 1 ? f : a * 3 < 2 ? g + (f - g) * (2 / 3 - a) * 6 : g
-            }
-
-            a = c(a) % 360 / 360,b = c(b),d = c(d),e = c(e);
-            var f = d <= .5 ? d * (b + 1) : d + b - d * b,g = d * 2 - f;
-            return this.rgba(h(a + 1 / 3) * 255, h(a) * 255, h(a - 1 / 3) * 255, e)
-        },hue:function(b) {
-            return new a.Dimension(Math.round(b.toHSL().h))
-        },saturation:function(b) {
-            return new a.Dimension(Math.round(b.toHSL().s * 100), "%")
-        },lightness:function(b) {
-            return new a.Dimension(Math.round(b.toHSL().l * 100), "%")
-        },alpha:function(b) {
-            return new a.Dimension(b.toHSL().a)
-        },saturate:function(a, c) {
-            var e = a.toHSL();
-            e.s += c.value / 100,e.s = d(e.s);
-            return b(e)
-        },desaturate:function(a, c) {
-            var e = a.toHSL();
-            e.s -= c.value / 100,e.s = d(e.s);
-            return b(e)
-        },lighten:function(a, c) {
-            var e = a.toHSL();
-            e.l += c.value / 100,e.l = d(e.l);
-            return b(e)
-        },darken:function(a, c) {
-            var e = a.toHSL();
-            e.l -= c.value / 100,e.l = d(e.l);
-            return b(e)
-        },fadein:function(a, c) {
-            var e = a.toHSL();
-            e.a += c.value / 100,e.a = d(e.a);
-            return b(e)
-        },fadeout:function(a, c) {
-            var e = a.toHSL();
-            e.a -= c.value / 100,e.a = d(e.a);
-            return b(e)
-        },spin:function(a, c) {
-            var d = a.toHSL(),e = (d.h + c.value) % 360;
-            d.h = e < 0 ? 360 + e : e;
-            return b(d)
-        },mix:function(b, c, d) {
-            var e = d.value / 100,f = e * 2 - 1,g = b.toHSL().a - c.toHSL().a,h = ((f * g == -1 ? f : (f + g) / (1 + f * g)) + 1) / 2,i = 1 - h,j = [b.rgb[0] * h + c.rgb[0] * i,b.rgb[1] * h + c.rgb[1] * i,b.rgb[2] * h + c.rgb[2] * i],k = b.alpha * e + c.alpha * (1 - e);
-            return new a.Color(j, k)
-        },greyscale:function(b) {
-            return this.desaturate(b, new a.Dimension(100))
-        },e:function(b) {
-            return new a.Anonymous(b instanceof a.JavaScript ? b.evaluated : b)
-        },escape:function(b) {
-            return new a.Anonymous(encodeURI(b.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29"))
-        },"%":function(b) {
-            var c = Array.prototype.slice.call(arguments, 1),d = b.value;
-            for (var e = 0; e < c.length; e++)d = d.replace(/%[sda]/i, function(a) {
-                var b = a.match(/s/i) ? c[e].value : c[e].toCSS();
-                return a.match(/[A-Z]$/) ? encodeURIComponent(b) : b
-            });
-            d = d.replace(/%%/g, "%");
-            return new a.Quoted('"' + d + '"', d)
-        },round:function(b) {
-            if (b instanceof a.Dimension)return new a.Dimension(Math.round(c(b)), b.unit);
-            if (typeof b == "number")return Math.round(b);
-            throw{error:"RuntimeError",message:"math functions take numbers as parameters"}
-        }}
-    }(c("less/tree")),function(a) {
-        a.Alpha = function(a) {
-            this.value = a
-        },a.Alpha.prototype = {toCSS:function() {
-            return"alpha(opacity=" + (this.value.toCSS ? this.value.toCSS() : this.value) + ")"
-        },eval:function(a) {
-            this.value.eval && (this.value = this.value.eval(a));
-            return this
-        }}
-    }(c("less/tree")),function(a) {
-        a.Anonymous = function(a) {
-            this.value = a.value || a
-        },a.Anonymous.prototype = {toCSS:function() {
-            return this.value
-        },eval:function() {
-            return this
-        }}
-    }(c("less/tree")),function(a) {
-        a.Call = function(a, b, c) {
-            this.name = a,this.args = b,this.index = c
-        },a.Call.prototype = {eval:function(b) {
-            var c = this.args.map(function(a) {
-                return a.eval(b)
-            });
-            if (!(this.name in a.functions))return new a.Anonymous(this.name + "(" + c.map(
-                function(a) {
-                    return a.toCSS()
-                }).join(", ") + ")");
-            try {
-                return a.functions[this.name].apply(a.functions, c)
-            } catch(d) {
-                throw{message:"error evaluating function `" + this.name + "`",index:this.index}
-            }
-        },toCSS:function(a) {
-            return this.eval(a).toCSS()
-        }}
-    }(c("less/tree")),function(a) {
-        a.Color = function(a, b) {
-            Array.isArray(a) ? this.rgb = a : a.length == 6 ? this.rgb = a.match(/.{2}/g).map(function(a) {
-                return parseInt(a, 16)
-            }) : a.length == 8 ? (this.alpha = parseInt(a.substring(0, 2), 16) / 255,this.rgb = a.substr(2).match(/.{2}/g).map(function(a) {
-                return parseInt(a, 16)
-            })) : this.rgb = a.split("").map(function(a) {
-                return parseInt(a + a, 16)
-            }),this.alpha = typeof b == "number" ? b : 1
-        },a.Color.prototype = {eval:function() {
-            return this
-        },toCSS:function() {
-            return this.alpha < 1 ? "rgba(" + this.rgb.map(
-                function(a) {
-                    return Math.round(a)
-                }).concat(this.alpha).join(", ") + ")" : "#" + this.rgb.map(
-                function(a) {
-                    a = Math.round(a),a = (a > 255 ? 255 : a < 0 ? 0 : a).toString(16);
-                    return a.length === 1 ? "0" + a : a
-                }).join("")
-        },operate:function(b, c) {
-            var d = [];
-            c instanceof a.Color || (c = c.toColor());
-            for (var e = 0; e < 3; e++)d[e] = a.operate(b, this.rgb[e], c.rgb[e]);
-            return new a.Color(d, this.alpha + c.alpha)
-        },toHSL:function() {
-            var a = this.rgb[0] / 255,b = this.rgb[1] / 255,c = this.rgb[2] / 255,d = this.alpha,e = Math.max(a, b, c),f = Math.min(a, b, c),g,h,i = (e + f) / 2,j = e - f;
-            if (e === f)g = h = 0; else {
-                h = i > .5 ? j / (2 - e - f) : j / (e + f);
-                switch (e) {
-                    case a:
-                        g = (b - c) / j + (b < c ? 6 : 0);
-                        break;
-                    case b:
-                        g = (c - a) / j + 2;
-                        break;
-                    case c:
-                        g = (a - b) / j + 4
-                }
-                g /= 6
-            }
-            return{h:g * 360,s:h,l:i,a:d}
-        }}
-    }(c("less/tree")),function(a) {
-        a.Comment = function(a, b) {
-            this.value = a,this.silent = !!b
-        },a.Comment.prototype = {toCSS:function(a) {
-            return a.compress ? "" : this.value
-        },eval:function() {
-            return this
-        }}
-    }(c("less/tree")),function(a) {
-        a.Dimension = function(a, b) {
-            this.value = parseFloat(a),this.unit = b || null
-        },a.Dimension.prototype = {eval:function() {
-            return this
-        },toColor:function() {
-            return new a.Color([this.value,this.value,this.value])
-        },toCSS:function() {
-            var a = this.value + this.unit;
-            return a
-        },operate:function(b, c) {
-            return new a.Dimension(a.operate(b, this.value, c.value), this.unit || c.unit)
-        }}
-    }(c("less/tree")),function(a) {
-        a.Directive = function(b, c) {
-            this.name = b,Array.isArray(c) ? this.ruleset = new a.Ruleset([], c) : this.value = c
-        },a.Directive.prototype = {toCSS:function(a, b) {
-            if (this.ruleset) {
-                this.ruleset.root = !0;
-                return this.name + (b.compress ? "{" : " {\n  ") + this.ruleset.toCSS(a, b).trim().replace(/\n/g, "\n  ") + (b.compress ? "}" : "\n}\n")
-            }
-            return this.name + " " + this.value.toCSS() + ";\n"
-        },eval:function(a) {
-            a.frames.unshift(this),this.ruleset = this.ruleset && this.ruleset.eval(a),a.frames.shift();
-            return this
-        },variable:function(b) {
-            return a.Ruleset.prototype.variable.call(this.ruleset, b)
-        },find:function() {
-            return a.Ruleset.prototype.find.apply(this.ruleset, arguments)
-        },rulesets:function() {
-            return a.Ruleset.prototype.rulesets.apply(this.ruleset)
-        }}
-    }(c("less/tree")),function(a) {
-        a.Element = function(b, c) {
-            this.combinator = b instanceof a.Combinator ? b : new a.Combinator(b),this.value = c.trim()
-        },a.Element.prototype.toCSS = function(a) {
-            return this.combinator.toCSS(a || {}) + this.value
-        },a.Combinator = function(a) {
-            a === " " ? this.value = " " : this.value = a ? a.trim() : ""
-        },a.Combinator.prototype.toCSS = function(a) {
-            return{"":""," ":" ","&":"",":":" :","::":"::","+":a.compress ? "+" : " + ","~":a.compress ? "~" : " ~ ",">":a.compress ? ">" : " > "}[this.value]
-        }
-    }(c("less/tree")),function(a) {
-        a.Expression = function(a) {
-            this.value = a
-        },a.Expression.prototype = {eval:function(b) {
-            return this.value.length > 1 ? new a.Expression(this.value.map(function(a) {
-                return a.eval(b)
-            })) : this.value.length === 1 ? this.value[0].eval(b) : this
-        },toCSS:function(a) {
-            return this.value.map(
-                function(b) {
-                    return b.toCSS(a)
-                }).join(" ")
-        }}
-    }(c("less/tree")),function(a) {
-        a.Import = function(b, c) {
-            var d = this;
-            this._path = b,b instanceof a.Quoted ? this.path = /\.(le?|c)ss$/.test(b.value) ? b.value : b.value + ".less" : this.path = b.value.value || b.value,this.css = /css$/.test(this.path),this.css || c.push(this.path, function(a) {
-                if (!a)throw new Error("Error parsing " + d.path);
-                d.root = a
-            })
-        },a.Import.prototype = {toCSS:function() {
-            return this.css ? "@import " + this._path.toCSS() + ";\n" : ""
-        },eval:function(b) {
-            var c;
-            if (this.css)return this;
-            c = new a.Ruleset(null, this.root.rules.slice(0));
-            for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.Import && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
-            return c.rules
-        }}
-    }(c("less/tree")),function(a) {
-        a.JavaScript = function(a, b, c) {
-            this.escaped = c,this.expression = a,this.index = b
-        },a.JavaScript.prototype = {eval:function(b) {
-            var c,d = this,e = {},f = this.expression.replace(/@\{([\w-]+)\}/g, function(c, e) {
-                return a.jsify((new a.Variable("@" + e, d.index)).eval(b))
-            });
-            try {
-                f = new Function("return (" + f + ")")
-            } catch(g) {
-                throw{message:"JavaScript evaluation error: `" + f + "`",index:this.index}
-            }
-            for (var h in b.frames[0].variables())e[h.slice(1)] = {value:b.frames[0].variables()[h].value,toJS:function() {
-                return this.value.eval(b).toCSS()
-            }};
-            try {
-                c = f.call(e)
-            } catch(g) {
-                throw{message:"JavaScript evaluation error: '" + g.name + ": " + g.message + "'",index:this.index}
-            }
-            return typeof c == "string" ? new a.Quoted('"' + c + '"', c, this.escaped, this.index) : Array.isArray(c) ? new a.Anonymous(c.join(", ")) : new a.Anonymous(c)
-        }}
-    }(c("less/tree")),function(a) {
-        a.Keyword = function(a) {
-            this.value = a
-        },a.Keyword.prototype = {eval:function() {
-            return this
-        },toCSS:function() {
-            return this.value
-        }}
-    }(c("less/tree")),function(a) {
-        a.mixin = {},a.mixin.Call = function(b, c, d) {
-            this.selector = new a.Selector(b),this.arguments = c,this.index = d
-        },a.mixin.Call.prototype = {eval:function(a) {
-            var b,c,d = [],e = !1;
-            for (var f = 0; f < a.frames.length; f++)if ((b = a.frames[f].find(this.selector)).length > 0) {
-                c = this.arguments && this.arguments.map(function(b) {
-                    return b.eval(a)
-                });
-                for (var g = 0; g < b.length; g++)if (b[g].match(c, a))try {
-                    Array.prototype.push.apply(d, b[g].eval(a, this.arguments).rules),e = !0
-                } catch(h) {
-                    throw{message:h.message,index:h.index,stack:h.stack,call:this.index}
-                }
-                if (e)return d;
-                throw{message:"No matching definition was found for `" + this.selector.toCSS().trim() + "(" + this.arguments.map(
-                    function(a) {
-                        return a.toCSS()
-                    }).join(", ") + ")`",index:this.index}
-            }
-            throw{message:this.selector.toCSS().trim() + " is undefined",index:this.index}
-        }},a.mixin.Definition = function(b, c, d) {
-            this.name = b,this.selectors = [new a.Selector([new a.Element(null, b)])],this.params = c,this.arity = c.length,this.rules = d,this._lookups = {},this.required = c.reduce(function(a, b) {
-                return!b.name || b.name && !b.value ? a + 1 : a
-            }, 0),this.parent = a.Ruleset.prototype,this.frames = []
-        },a.mixin.Definition.prototype = {toCSS:function() {
-            return""
-        },variable:function(a) {
-            return this.parent.variable.call(this, a)
-        },variables:function() {
-            return this.parent.variables.call(this)
-        },find:function() {
-            return this.parent.find.apply(this, arguments)
-        },rulesets:function() {
-            return this.parent.rulesets.apply(this)
-        },eval:function(b, c) {
-            var d = new a.Ruleset(null, []),e,f = [];
-            for (var g = 0,h; g < this.params.length; g++)if (this.params[g].name)if (h = c && c[g] || this.params[g].value)d.rules.unshift(new a.Rule(this.params[g].name, h.eval(b))); else throw{message:"wrong number of arguments for " + this.name + " (" + c.length + " for " + this.arity + ")"};
-            for (var g = 0; g < Math.max(this.params.length, c && c.length); g++)f.push(c[g] || this.params[g].value);
-            d.rules.unshift(new a.Rule("@arguments", (new a.Expression(f)).eval(b)));
-            return(new a.Ruleset(null, this.rules.slice(0))).eval({frames:[this,d].concat(this.frames, b.frames)})
-        },match:function(a, b) {
-            var c = a && a.length || 0,d;
-            if (c < this.required)return!1;
-            if (this.required > 0 && c > this.params.length)return!1;
-            d = Math.min(c, this.arity);
-            for (var e = 0; e < d; e++)if (!this.params[e].name && a[e].eval(b).toCSS() != this.params[e].value.eval(b).toCSS())return!1;
-            return!0
-        }}
-    }(c("less/tree")),function(a) {
-        a.Operation = function(a, b) {
-            this.op = a.trim(),this.operands = b
-        },a.Operation.prototype.eval = function(b) {
-            var c = this.operands[0].eval(b),d = this.operands[1].eval(b),e;
-            if (c instanceof a.Dimension && d instanceof a.Color)if (this.op === "*" || this.op === "+")e = d,d = c,c = e; else throw{name:"OperationError",message:"Can't substract or divide a color from a number"};
-            return c.operate(this.op, d)
-        },a.operate = function(a, b, c) {
-            switch (a) {
-                case"+":
-                    return b + c;
-                case"-":
-                    return b - c;
-                case"*":
-                    return b * c;
-                case"/":
-                    return b / c
-            }
-        }
-    }(c("less/tree")),function(a) {
-        a.Quoted = function(a, b, c, d) {
-            this.escaped = c,this.value = b || "",this.quote = a.charAt(0),this.index = d
-        },a.Quoted.prototype = {toCSS:function() {
-            return this.escaped ? this.value : this.quote + this.value + this.quote
-        },eval:function(b) {
-            var c = this,d = this.value.replace(/`([^`]+)`/g,
-                function(d, e) {
-                    return(new a.JavaScript(e, c.index, !0)).eval(b).value
-                }).replace(/@\{([\w-]+)\}/g, function(d, e) {
-                var f = (new a.Variable("@" + e, c.index)).eval(b);
-                return f.value || f.toCSS()
-            });
-            return new a.Quoted(this.quote + d + this.quote, d, this.escaped, this.index)
-        }}
-    }(c("less/tree")),function(a) {
-        a.Rule = function(b, c, d, e) {
-            this.name = b,this.value = c instanceof a.Value ? c : new a.Value([c]),this.important = d ? " " + d.trim() : "",this.index = e,b.charAt(0) === "@" ? this.variable = !0 : this.variable = !1
-        },a.Rule.prototype.toCSS = function(a) {
-            return this.variable ? "" : this.name + (a.compress ? ":" : ": ") + this.value.toCSS(a) + this.important + ";"
-        },a.Rule.prototype.eval = function(b) {
-            return new a.Rule(this.name, this.value.eval(b), this.important, this.index)
-        },a.Shorthand = function(a, b) {
-            this.a = a,this.b = b
-        },a.Shorthand.prototype = {toCSS:function(a) {
-            return this.a.toCSS(a) + "/" + this.b.toCSS(a)
-        },eval:function() {
-            return this
-        }}
-    }(c("less/tree")),function(a) {
-        a.Ruleset = function(a, b) {
-            this.selectors = a,this.rules = b,this._lookups = {}
-        },a.Ruleset.prototype = {eval:function(b) {
-            var c = new a.Ruleset(this.selectors, this.rules.slice(0));
-            c.root = this.root,b.frames.unshift(c);
-            if (c.root)for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.Import && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
-            for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.mixin.Definition && (c.rules[d].frames = b.frames.slice(0));
-            for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.mixin.Call && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
-            for (var d = 0,e; d < c.rules.length; d++)e = c.rules[d],e instanceof a.mixin.Definition || (c.rules[d] = e.eval ? e.eval(b) : e);
-            b.frames.shift();
-            return c
-        },match:function(a) {
-            return!a || a.length === 0
-        },variables:function() {
-            return this._variables ? this._variables : this._variables = this.rules.reduce(function(b, c) {
-                c instanceof a.Rule && c.variable === !0 && (b[c.name] = c);
-                return b
-            }, {})
-        },variable:function(a) {
-            return this.variables()[a]
-        },rulesets:function() {
-            return this._rulesets ? this._rulesets : this._rulesets = this.rules.filter(function(b) {
-                return b instanceof a.Ruleset || b instanceof a.mixin.Definition
-            })
-        },find:function(b, c) {
-            c = c || this;
-            var d = [],e,f,g = b.toCSS();
-            if (g in this._lookups)return this._lookups[g];
-            this.rulesets().forEach(function(e) {
-                if (e !== c)for (var g = 0; g < e.selectors.length; g++)if (f = b.match(e.selectors[g])) {
-                    b.elements.length > 1 ? Array.prototype.push.apply(d, e.find(new a.Selector(b.elements.slice(1)), c)) : d.push(e);
-                    break
-                }
-            });
-            return this._lookups[g] = d
-        },toCSS:function(b, c) {
-            var d = [],e = [],f = [],g = [],h,i;
-            if (!this.root)if (b.length === 0)g = this.selectors.map(function(a) {
-                return[a]
-            }); else for (var j = 0; j < this.selectors.length; j++)for (var k = 0; k < b.length; k++)g.push(b[k].concat([this.selectors[j]]));
-            for (var l = 0; l < this.rules.length; l++)i = this.rules[l],i.rules || i instanceof a.Directive ? f.push(i.toCSS(g, c)) : i instanceof a.Comment ? i.silent || (this.root ? f.push(i.toCSS(c)) : e.push(i.toCSS(c))) : i.toCSS && !i.variable ? e.push(i.toCSS(c)) : i.value && !i.variable && e.push(i.value.toString());
-            f = f.join(""),this.root ? d.push(e.join(c.compress ? "" : "\n")) : e.length > 0 && (h = g.map(
-                function(a) {
-                    return a.map(
-                        function(a) {
-                            return a.toCSS(c)
-                        }).join("").trim()
-                }).join(c.compress ? "," : g.length > 3 ? ",\n" : ", "),d.push(h, (c.compress ? "{" : " {\n  ") + e.join(c.compress ? "" : "\n  ") + (c.compress ? "}" : "\n}\n"))),d.push(f);
-            return d.join("") + (c.compress ? "\n" : "")
-        }}
-    }(c("less/tree")),function(a) {
-        a.Selector = function(a) {
-            this.elements = a,this.elements[0].combinator.value === "" && (this.elements[0].combinator.value = " ")
-        },a.Selector.prototype.match = function(a) {
-            return this.elements[0].value === a.elements[0].value ? !0 : !1
-        },a.Selector.prototype.toCSS = function(a) {
-            if (this._css)return this._css;
-            return this._css = this.elements.map(
-                function(b) {
-                    return typeof b == "string" ? " " + b.trim() : b.toCSS(a)
-                }).join("")
-        }
-    }(c("less/tree")),function(b) {
-        b.URL = function(b, c) {
-            b.data ? this.attrs = b : (!/^(?:https?:\/|file:\/|data:\/)?\//.test(b.value) && c.length > 0 && typeof a != "undefined" && (b.value = c[0] + (b.value.charAt(0) === "/" ? b.value.slice(1) : b.value)),this.value = b,this.paths = c)
-        },b.URL.prototype = {toCSS:function() {
-            return"url(" + (this.attrs ? "data:" + this.attrs.mime + this.attrs.charset + this.attrs.base64 + this.attrs.data : this.value.toCSS()) + ")"
-        },eval:function(a) {
-            return this.attrs ? this : new b.URL(this.value.eval(a), this.paths)
-        }}
-    }(c("less/tree")),function(a) {
-        a.Value = function(a) {
-            this.value = a,this.is = "value"
-        },a.Value.prototype = {eval:function(b) {
-            return this.value.length === 1 ? this.value[0].eval(b) : new a.Value(this.value.map(function(a) {
-                return a.eval(b)
-            }))
-        },toCSS:function(a) {
-            return this.value.map(
-                function(b) {
-                    return b.toCSS(a)
-                }).join(a.compress ? "," : ", ")
-        }}
-    }(c("less/tree")),function(a) {
-        a.Variable = function(a, b) {
-            this.name = a,this
-                .index = b
-        },a.Variable.prototype = {eval:function(b) {
-            var c,d,e = this.name;
-            e.indexOf("@@") == 0 && (e = "@" + (new a.Variable(e.slice(1))).eval(b).value);
-            if (c = a.find(b.frames, function(a) {
-                if (d = a.variable(e))return d.value.eval(b)
-            }))return c;
-            throw{message:"variable " + e + " is undefined",index:this.index}
-        }}
-    }(c("less/tree")),c("less/tree").find = function(a, b) {
-        for (var c = 0,d; c < a.length; c++)if (d = b.call(a, a[c]))return d;
-        return null
-    },c("less/tree").jsify = function(a) {
-        return Array.isArray(a.value) && a.value.length > 1 ? "[" + a.value.map(
-            function(a) {
-                return a.toCSS(!1)
-            }).join(", ") + "]" : a.toCSS(!1)
-    };
-    var g = location.protocol === "file:" || location.protocol === "chrome:" || location.protocol === "chrome-extension:" || location.protocol === "resource:";
-    d.env = d.env || (location.hostname == "127.0.0.1" || location.hostname == "0.0.0.0" || location.hostname == "localhost" || location.port.length > 0 || g ? "development" : "production"),d.async = !1,d.poll = d.poll || (g ? 1e3 : 1500),d.watch = function() {
-        return this.watchMode = !0
-    },d.unwatch = function() {
-        return this.watchMode = !1
-    },d.env === "development" ? (d.optimization = 0,/!watch/.test(location.hash) && d.watch(),d.watchTimer = setInterval(function() {
-        d.watchMode && n(function(a, b, c) {
-            a && q(a.toCSS(), b, c.lastModified)
-        })
-    }, d.poll)) : d.optimization = 3;
-    var h;
-    try {
-        h = typeof a.localStorage == "undefined" ? null : a.localStorage
-    } catch(i) {
-        h = null
-    }
-    var j = document.getElementsByTagName("link"),k = /^text\/(x-)?less$/;
-    d.sheets = [];
-    for (var l = 0; l < j.length; l++)(j[l].rel === "stylesheet/less" || j[l].rel.match(/stylesheet/) && j[l].type.match(k)) && d.sheets.push(j[l]);
-    d.refresh = function(a) {
-        var b,c;
-        b = c = new Date,n(function(a, d, e) {
-            e.local ? u("loading " + d.href + " from cache.") : (u("parsed " + d.href + " successfully."),q(a.toCSS(), d, e.lastModified)),u("css for " + d.href + " generated in " + (new Date - c) + "ms"),e.remaining === 0 && u("css generated in " + (new Date - b) + "ms"),c = new Date
-        }, a),m()
-    },d.refreshStyles = m,d.refresh(d.env === "development")
-})(window)

pom.xml

@@ -4,7 +4,7 @@
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <properties>
-        <com.wisemapping.version>3.1-SNAPSHOT</com.wisemapping.version>
+        <com.wisemapping.version>3.0.4</com.wisemapping.version>
         <superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
     </properties>
 
@@ -12,7 +12,7 @@
     <groupId>org.wisemapping</groupId>
     <artifactId>wisemapping</artifactId>
     <name>WiseMapping Project</name>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.0.4</version>
     <packaging>pom</packaging>
 
     <licenses>

web2d/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.0.4</version>
     </parent>
 
     <build>

web2d/src/main/javascript/peer/svg/TextPeer.js

@@ -169,7 +169,6 @@ web2d.peer.svg.TextPeer = new Class({
             computedWidth = 10;
 
         }
-        console.log("Final result:"+computedWidth);
 
         var width = parseInt(computedWidth);
         width = width + this._font.getWidthMargin();

wise-editor/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.0.4</version>
     </parent>
 
     <dependencies>
@@ -27,5 +27,62 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>8.1.14.v20131031</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8080</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webApp>${project.build.directory}/wise-editor-${com.wisemapping.version}.war</webApp>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <warSourceExcludes>js/mindplot-min.js</warSourceExcludes>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>core-js</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>mindplot</artifactId>
+                            <type>jar</type>
+                            <targetPath>css</targetPath>
+                            <includes>
+                                <include>**/*.css</include>
+                                <include>**/*.html</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>mindplot</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

wise-editor/src/main/webapp/css/editor.less

@@ -1,5 +1,5 @@
 @import "compatibility.less";
-@import "css/libraries/moodialog/css/MooDialog.css";
+@import "libraries/moodialog/css/MooDialog.css";
 /********************************************************************************/
 /* Header & Toolbar Styles */
 /********************************************************************************/

wise-editor/src/main/webapp/js/less.js

@@ -1 +1 @@
-../../../../../mindplot/src/main/javascript/libraries/less/less-1.1.3.min.js
+../../../../../mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js

wise-webapp/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.0.4</version>
     </parent>
 
     <repositories>
@@ -547,9 +547,9 @@
             </plugin>
 
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
+                <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.1.1.v20140108</version>
+                <version>8.1.14.v20131031</version>
                 <configuration>
                     <stopKey>foo</stopKey>
                     <stopPort>9999</stopPort>

wise-webapp/src/main/java/com/wisemapping/dao/LabelManager.java

@@ -17,7 +17,7 @@ public interface LabelManager {
     List<Label> getAllLabels(@NotNull final User user);
 
     @Nullable
-    Label getLabelById(int id);
+    Label getLabelById(int id, @NotNull final User user);
 
     @Nullable
     Label getLabelByTitle(@NotNull final String title, @NotNull final User user);

wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java

@@ -29,19 +29,16 @@ public class LabelManagerImpl extends HibernateDaoSupport
 
     @Nullable
     @Override
-    public Label getLabelById(int id) {
-        return getHibernateTemplate().get(Label.class, id);
+    public Label getLabelById(int id, @NotNull final User user) {
+        List<Label> labels = getHibernateTemplate().find("from com.wisemapping.model.Label wisemapping where id=? and creator=?", new Object[]{id, user});
+        return getFirst(labels);
     }
 
     @Nullable
     @Override
     public Label getLabelByTitle(@NotNull String title, @NotNull final User user) {
-        Label result = null;
         final List<Label> labels = getHibernateTemplate().find("from com.wisemapping.model.Label wisemapping where title=? and creator=?", new Object[]{title, user});
-        if (labels != null && !labels.isEmpty()) {
-            result = labels.get(0);
-        }
-        return result;
+        return getFirst(labels);
     }
 
     @Override
@@ -49,5 +46,12 @@ public class LabelManagerImpl extends HibernateDaoSupport
         getHibernateTemplate().delete(label);
     }
 
+    @Nullable private Label getFirst(List<Label> labels) {
+        Label result = null;
+        if (labels != null && !labels.isEmpty()) {
+            result = labels.get(0);
+        }
+        return result;
+    }
 
 }

wise-webapp/src/main/java/com/wisemapping/exceptions/LabelMindmapRelationshipNotFoundException.java

@@ -1,20 +0,0 @@
-package com.wisemapping.exceptions;
-
-import org.jetbrains.annotations.NotNull;
-
-public class LabelMindmapRelationshipNotFoundException extends ClientException {
-
-    private static final String MSG_KEY = "LABEL_MINDMAP_RELATION_NOT_BE_FOUND";
-
-    public LabelMindmapRelationshipNotFoundException(@NotNull String msg)
-    {
-        super(msg,Severity.WARNING);
-    }
-
-    @NotNull
-    @Override
-    protected String getMsgBundleKey() {
-        return MSG_KEY;
-    }
-
-}

wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java

@@ -21,6 +21,7 @@ package com.wisemapping.exporter;
 public class ExportProperties {
     private ExportFormat format;
     private String baseImgPath;
+    private String version;
 
     public ExportFormat getFormat() {
         return format;
@@ -40,6 +41,14 @@ public class ExportProperties {
         return result;
     }
 
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
     static public class GenericProperties extends ExportProperties {
         private GenericProperties(ExportFormat format) {
             super(format);

wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java

@@ -18,6 +18,7 @@
 
 package com.wisemapping.exporter;
 
+import com.wisemapping.importer.VersionNumber;
 import org.apache.batik.parser.AWTTransformProducer;
 import org.apache.batik.parser.ParseException;
 import org.apache.batik.parser.TransformListParser;
@@ -142,6 +143,7 @@ public class ExporterFactory {
             }
             case FREEMIND: {
                 final FreemindExporter exporter = new FreemindExporter();
+                exporter.setVersion(new VersionNumber(properties.getVersion()));
                 exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
                 break;
             }

wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java

@@ -19,6 +19,8 @@
 package com.wisemapping.exporter;
 
 
+import com.wisemapping.importer.VersionNumber;
+import com.wisemapping.importer.freemind.FreemindConstant;
 import com.wisemapping.importer.freemind.FreemindIconConverter;
 import com.wisemapping.jaxb.wisemap.Note;
 import com.wisemapping.model.Mindmap;
@@ -42,6 +44,7 @@ import java.io.OutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,12 +52,10 @@ import java.util.Map;
 public class FreemindExporter
         implements Exporter {
 
-    private static final String FREE_MIND_VERSION = "0.9.0";
-    private static final String POSITION_LEFT = "left";
-    private static final String POSITION_RIGHT = "right";
+
     private com.wisemapping.jaxb.freemind.ObjectFactory objectFactory;
-    private static final String EMPTY_FONT_STYLE = ";;;;;";
     private Map<String, Node> nodesMap = null;
+    private VersionNumber version = FreemindConstant.SUPPORTED_FREEMIND_VERSION;
 
     public void export(Mindmap map, OutputStream outputStream) throws ExportException {
         export(map.getUnzipXml(), outputStream);
@@ -71,7 +72,7 @@ public class FreemindExporter
             mindmapMap = (com.wisemapping.jaxb.wisemap.Map) JAXBUtils.getMapObject(stream, "com.wisemapping.jaxb.wisemap");
 
             final com.wisemapping.jaxb.freemind.Map freemindMap = objectFactory.createMap();
-            freemindMap.setVersion(FREE_MIND_VERSION);
+            freemindMap.setVersion(this.getVersionNumber());
 
             final List<TopicType> topics = mindmapMap.getTopic();
 
@@ -98,8 +99,9 @@ public class FreemindExporter
 
             final List<RelationshipType> relationships = mindmapMap.getRelationship();
             for (RelationshipType relationship : relationships) {
-                Node srcNode = nodesMap.get(relationship.getSrcTopicId());
-                Node dstNode = nodesMap.get(relationship.getDestTopicId());
+                // FIXME:invert srcNode and dstNode to correct a bug in the wise mind map representation
+                Node srcNode = nodesMap.get(relationship.getDestTopicId());
+                Node dstNode = nodesMap.get(relationship.getSrcTopicId());
 
 
                 // Workaround for nodes without relationship associated ...
@@ -136,6 +138,7 @@ public class FreemindExporter
     private void addNodeFromTopic(@NotNull final TopicType mainTopic, @NotNull final Node destNode) throws IOException, SAXException, ParserConfigurationException {
         final List<TopicType> currentTopic = mainTopic.getTopic();
 
+        Collections.sort(currentTopic, new VerticalPositionComparator());
         for (TopicType topicType : currentTopic) {
             final Node newNode = objectFactory.createNode();
             nodesMap.put(topicType.getId(), newNode);
@@ -149,9 +152,9 @@ public class FreemindExporter
             if (position != null) {
                 String xPos = position.split(",")[0];
                 int x = Integer.valueOf(xPos);
-                newNode.setPOSITION((x < 0 ? POSITION_LEFT : POSITION_RIGHT));
+                newNode.setPOSITION((x < 0 ? FreemindConstant.POSITION_LEFT : FreemindConstant.POSITION_RIGHT));
             } else {
-                newNode.setPOSITION(POSITION_LEFT);
+                newNode.setPOSITION(FreemindConstant.POSITION_LEFT);
             }
         }
     }
@@ -174,17 +177,23 @@ public class FreemindExporter
             }
         }
 
-        freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
+        String wiseShape = mindmapTopic.getShape();
+        if (wiseShape != null && !ShapeStyle.LINE.equals(ShapeStyle.fromValue(wiseShape))) {
+            freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
+        }
         final String shape = mindmapTopic.getShape();
         if (shape != null && !shape.isEmpty()) {
             if (isRoot && !ShapeStyle.ROUNDED_RECTANGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape)) {
 
                 String style = shape;
-                if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape)) {
+                if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape) || ShapeStyle.ELLIPSE.getStyle().equals(shape)) {
                     style = "bubble";
                 }
                 freemindNode.setSTYLE(style);
             }
+        } else if (!isRoot) {
+            String style = "fork";
+            freemindNode.setSTYLE(style);
         }
 
         addIconNode(freemindNode, mindmapTopic);
@@ -274,15 +283,15 @@ public class FreemindExporter
             final Font font = objectFactory.createFont();
             final String[] part = fontStyle.split(";", 6);
             int countParts = part.length;
-            boolean updated = false;
+            boolean fontNodeNeeded = false;
 
-            if (!fontStyle.endsWith(EMPTY_FONT_STYLE)) {
+            if (!fontStyle.endsWith(FreemindConstant.EMPTY_FONT_STYLE)) {
                 int idx = 0;
 
                 // Font name
                 if (idx < countParts && part[idx].length() != 0) {
                     font.setNAME(part[idx]);
-                    updated = true;
+                    fontNodeNeeded = true;
                 }
                 idx++;
 
@@ -290,11 +299,11 @@ public class FreemindExporter
                 if (idx < countParts && part[idx].length() != 0) {
                     final String size = part[idx];
                     if (size != null && !size.isEmpty()) {
-                        int freeSize = Integer.parseInt(size);
-                        Integer fsize = wiseToFreeFontSize.get(freeSize);
-                        if(fsize!=null){
-                            font.setSIZE(BigInteger.valueOf(fsize));
-                            updated = true;
+                        int wiseSize = Integer.parseInt(size);
+                        Integer freeSize = wiseToFreeFontSize.get(wiseSize);
+                        if(freeSize!=null){
+                            font.setSIZE(BigInteger.valueOf(freeSize));
+                            fontNodeNeeded = true;
                         }
                     }
                 }
@@ -303,23 +312,26 @@ public class FreemindExporter
                 // Font Color
                 if (idx < countParts && part[idx].length() != 0) {
                     freemindNode.setCOLOR(part[idx]);
-                    updated = true;
                 }
                 idx++;
 
                 // Font Styles
                 if (idx < countParts && part[idx].length() != 0) {
                     font.setBOLD(Boolean.TRUE.toString());
-                    updated = true;
+                    fontNodeNeeded = true;
                 }
                 idx++;
 
                 if (idx < countParts && part[idx].length() != 0) {
                     font.setITALIC(Boolean.TRUE.toString());
-                    updated = true;
+                    fontNodeNeeded = true;
                 }
 
-                if (updated) {
+                if (fontNodeNeeded) {
+                    // font size should be set if freemind node has font properties note
+                    if (font.getSIZE() == null) {
+                        font.setSIZE(BigInteger.valueOf(wiseToFreeFontSize.get(8)));
+                    }
                     freemindNode.getArrowlinkOrCloudOrEdge().add(font);
                 }
             }
@@ -342,4 +354,15 @@ public class FreemindExporter
     }
 
 
+    public VersionNumber getVersion() {
+        return version;
+    }
+
+    public void setVersion(VersionNumber version) {
+        this.version = version;
+    }
+
+    public String getVersionNumber() {
+        return this.getVersion().getVersion();
+    }
 }

wise-webapp/src/main/java/com/wisemapping/exporter/VerticalPositionComparator.java

@@ -0,0 +1,26 @@
+package com.wisemapping.exporter;
+
+import com.wisemapping.jaxb.wisemap.TopicType;
+
+import java.util.Comparator;
+
+public class VerticalPositionComparator implements Comparator<TopicType> {
+
+    @Override
+    public int compare(TopicType o1, TopicType o2) {
+        final String myPosition = o1.getPosition();
+        final String otherPosition = o2.getPosition();
+        int result;
+        if (otherPosition == null) {
+            result = -1;
+        } else if (myPosition == null) {
+            result = 1;
+        } else {
+            int myPositionY = Integer.parseInt(myPosition.split(",")[1]);
+            int otherPositionY = Integer.parseInt(otherPosition.split(",")[1]);
+            result = myPositionY - otherPositionY;
+        }
+        return result;
+    }
+
+}

wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java

@@ -47,6 +47,7 @@ public class SupportedUserAgent implements Serializable {
 
         boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
         result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
+        result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
         result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
         result = result || browser == Browser.IE && majorVersion >= 8;
         result = result || browser == Browser.OPERA10 && majorVersion >= 11;

wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java

@@ -0,0 +1,34 @@
+package com.wisemapping.importer.freemind;
+
+import com.wisemapping.importer.VersionNumber;
+
+import java.nio.charset.Charset;
+
+public interface FreemindConstant {
+
+    public static final String LAST_SUPPORTED_FREEMIND_VERSION = "1.0.1";
+    public static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber(LAST_SUPPORTED_FREEMIND_VERSION);
+    public static final String CODE_VERSION = "tango";
+
+    public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25;
+    public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
+    public static final int CENTRAL_TO_TOPIC_DISTANCE = 200;
+    public static final int TOPIC_TO_TOPIC_DISTANCE = 90;
+
+    public static final int FONT_SIZE_HUGE = 15;
+    public static final int FONT_SIZE_LARGE = 10;
+    public static final int FONT_SIZE_NORMAL = 8;
+    public static final int FONT_SIZE_SMALL = 6;
+
+    public static final String NODE_TYPE = "NODE";
+    public static final String BOLD = "bold";
+    public static final String ITALIC = "italic";
+    public static final String EMPTY_FONT_STYLE = ";;;;;";
+    public static final String EMPTY_NOTE = "";
+
+    public static final String POSITION_LEFT = "left";
+    public static final String POSITION_RIGHT = "right";
+
+    public final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
+
+}

wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java

@@ -33,9 +33,7 @@ import com.wisemapping.jaxb.wisemap.Link;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.*;
 import org.jsoup.nodes.Document;
-import org.w3c.dom.*;
 import org.w3c.dom.Element;
 
 import javax.xml.bind.JAXBException;
@@ -46,37 +44,17 @@ import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.util.*;
 import java.math.BigInteger;
 
 public class FreemindImporter
         implements Importer {
 
-    public static final String CODE_VERSION = "tango";
-    public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25;
-    public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
-    public static final int CENTRAL_TO_TOPIC_DISTANCE = 200;
-    public static final int TOPIC_TO_TOPIC_DISTANCE = 90;
-    public static final String NODE_TYPE = "NODE";
     private com.wisemapping.jaxb.wisemap.ObjectFactory mindmapObjectFactory;
-    private static final String POSITION_LEFT = "left";
-    private static final String BOLD = "bold";
-    private static final String ITALIC = "italic";
-    private static final String EMPTY_NOTE = "";
     private java.util.Map<String, TopicType> nodesMap = null;
     private List<RelationshipType> relationships = null;
-    private static final String EMPTY_FONT_STYLE = ";;;;;";
-    private final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
-    private final static int ORDER_SEPARATION_FACTOR = 2;
-    private static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber("0.9.0");
-
 
     private int currentId;
-    private static final int FONT_SIZE_HUGE = 15;
-    private static final int FONT_SIZE_LARGE = 10;
-    public static final int FONT_SIZE_NORMAL = 8;
-    private static final int FONT_SIZE_SMALL = 6;
 
     public static void main(String argv[]) {
 
@@ -120,13 +98,8 @@ public class FreemindImporter
             final String version = freemindMap.getVersion();
             if (version != null) {
 
-                // Is freemind mindmap ?
-                if (version.charAt(0) != '0') {
-                    throw new ImporterException("Mindmap is not a FreeMind document. Document type info " + version);
-                }
-
                 final VersionNumber mapVersion = new VersionNumber(version);
-                if (SUPPORTED_FREEMIND_VERSION.isGreaterThan(mapVersion)) {
+                if (mapVersion.isGreaterThan(FreemindConstant.SUPPORTED_FREEMIND_VERSION)) {
                     throw new ImporterException("FreeMind version " + mapVersion.getVersion() + " is not supported.");
                 }
             }
@@ -135,7 +108,7 @@ public class FreemindImporter
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
             final com.wisemapping.jaxb.wisemap.Map mindmapMap = mindmapObjectFactory.createMap();
-            mindmapMap.setVersion(CODE_VERSION);
+            mindmapMap.setVersion(FreemindConstant.CODE_VERSION);
             currentId = 0;
 
             final Node freeNode = freemindMap.getNode();
@@ -156,7 +129,7 @@ public class FreemindImporter
             addRelationships(mindmapMap);
 
             JAXBUtils.saveMap(mindmapMap, baos);
-            wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET);
+            wiseXml = new String(baos.toByteArray(), FreemindConstant.UTF_8_CHARSET);
             result.setXmlStr(wiseXml);
             result.setTitle(mapName);
             result.setDescription(description);
@@ -235,6 +208,8 @@ public class FreemindImporter
         TopicType currentWiseTopic = wiseParent;
 
         int order = 0;
+        int firstLevelRightOrder = 0;
+        int firstLevelLeftOrder = 1;
         for (Object element : freeChilden) {
 
             if (element instanceof Node) {
@@ -252,13 +227,19 @@ public class FreemindImporter
                 if (depth != 1) {
                     norder = order++;
                 } else {
-                    norder = calcFirstLevelOrder(freeChilden, freeChild);
+                    if (freeChild.getPOSITION() != null && freeChild.getPOSITION().equals(FreemindConstant.POSITION_LEFT)) {
+                        norder = firstLevelLeftOrder;
+                        firstLevelLeftOrder = firstLevelLeftOrder + 2;
+                    } else {
+                        norder = firstLevelRightOrder;
+                        firstLevelRightOrder = firstLevelRightOrder + 2;
+                    }
                 }
                 wiseChild.setOrder(norder);
 
                 // Convert node position
-                int childrenCount = freeChilden.size();
-                final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
+                int childrenCountSameSide = getChildrenCountSameSide(freeChilden, freeChild);
+                final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCountSameSide);
                 wiseChild.setPosition(position);
 
                 // Convert the rest of the node properties ...
@@ -297,7 +278,7 @@ public class FreemindImporter
                 String textNote = hook.getText();
                 if (textNote == null) // It is not a note is a BlinkingNodeHook or AutomaticLayout Hook
                 {
-                    textNote = EMPTY_NOTE;
+                    textNote = FreemindConstant.EMPTY_NOTE;
                     mindmapNote.setValue(textNote);
                     currentWiseTopic.setNote(mindmapNote);
                 }
@@ -305,13 +286,13 @@ public class FreemindImporter
                 final Richcontent content = (Richcontent) element;
                 final String type = content.getTYPE();
 
-                if (type.equals(NODE_TYPE)) {
+                if (type.equals(FreemindConstant.NODE_TYPE)) {
                     String text = html2text(content);
                     currentWiseTopic.setText(text);
                 } else {
                     String text = html2text(content);
                     final com.wisemapping.jaxb.wisemap.Note mindmapNote = new com.wisemapping.jaxb.wisemap.Note();
-                    text = text != null ? text : EMPTY_NOTE;
+                    text = text != null ? text : FreemindConstant.EMPTY_NOTE;
                     mindmapNote.setValue(text);
                     currentWiseTopic.setNote(mindmapNote);
 
@@ -320,8 +301,9 @@ public class FreemindImporter
                 final Arrowlink arrow = (Arrowlink) element;
                 RelationshipType relt = mindmapObjectFactory.createRelationshipType();
                 String destId = arrow.getDESTINATION();
-                relt.setSrcTopicId(freeParent.getID());
-                relt.setDestTopicId(destId);
+                // FIXME: invert srcTopic and dstTopic to correct a bug in the wise mind map representation
+                relt.setSrcTopicId(destId);
+                relt.setDestTopicId(freeParent.getID());
                 final String endinclination = arrow.getENDINCLINATION();
                 if (endinclination != null) {
                     String[] inclination = endinclination.split(";");
@@ -348,50 +330,27 @@ public class FreemindImporter
         }
     }
 
-    /**
-     * Sort the freemind node following this pattern:
-     * <p/>
-     * 0 -> 3
-     * 1 -> 1
-     * 2 -> 0
-     * 3 -> 2
-     * 4 -> 4
-     */
-    private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @Nullable Node freeChild) {
-        final List<Node> nodes = new ArrayList<Node>();
-        int result;
+    private int getChildrenCountSameSide(@NotNull List<Object> freeChildren, Node freeChild)  {
+        int result = 0;
+        String childSide = freeChild.getPOSITION();
+        if (childSide == null) {
+            childSide = FreemindConstant.POSITION_RIGHT;
+        }
 
-        // Collect all the nodes of the same side ...
-        for (Object child : freeChilden) {
+        // Count all the nodes of the same side ...
+        for (Object child : freeChildren) {
             if (child instanceof Node) {
                 Node node = (Node) child;
 
-                final String side = node.getPOSITION();
-                if (side == freeChild.getPOSITION() || freeChild.getPOSITION().equals(side)) {
-                    nodes.add(node);
+                String side = node.getPOSITION();
+                if (side == null) {
+                    side = FreemindConstant.POSITION_RIGHT;
+                }
+                if (childSide.equals(side)) {
+                    result++;
                 }
             }
         }
-
-        // What is the index of the current node ?
-        int nodeIndex = 0;
-        for (Node node : nodes) {
-            if (node == freeChild) {
-                break;
-            }
-            nodeIndex++;
-        }
-
-        int size = nodes.size();
-        int center = (size - 1) / 2;
-        result = nodeIndex - center;
-
-        if (result < 0) {
-            result = (result * ORDER_SEPARATION_FACTOR * -2) - 1;
-
-        } else {
-            result = result * ORDER_SEPARATION_FACTOR * 2;
-        }
         return result;
     }
 
@@ -410,11 +369,11 @@ public class FreemindImporter
 
         // Problem on setting X position:
         // Text Size is not taken into account ...
-        int x = CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * TOPIC_TO_TOPIC_DISTANCE);
+        int x = FreemindConstant.CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * FreemindConstant.TOPIC_TO_TOPIC_DISTANCE);
         if (depth == 1) {
 
             final String side = freeChild.getPOSITION();
-            x = x * (side != null && POSITION_LEFT.equals(side) ? -1 : 1);
+            x = x * (side != null && FreemindConstant.POSITION_LEFT.equals(side) ? -1 : 1);
         } else {
             final Coord coord = Coord.parse(wiseParent.getPosition());
             x = x * (coord.isOnLeftSide() ? -1 : 1);
@@ -425,23 +384,21 @@ public class FreemindImporter
         int y;
         if (depth == 1) {
 
-            // Follow the following algorithm ...
-            // Order: 3 = -100  1
-            // Order: 1 = -50   2
-            // Order: 0 =  0    3
-            // Order: 2 = 50    4
-            // Order: 4 = 100   5
+            // pair order numbers represent nodes at the right
+            // odd order numbers represent nodes at the left
             if (order % 2 == 0) {
-                y = ROOT_LEVEL_TOPIC_HEIGHT * order;
+                int multiplier = ((order + 1) - childrenCount) * 2;
+                y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT;
             } else {
-                y = -ROOT_LEVEL_TOPIC_HEIGHT * (order + 1);
+                int multiplier = (order - childrenCount) * 2;
+                y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT;
             }
         } else {
 
             // Problem: What happen if the node is more tall than what is defined here.
             Coord coord = Coord.parse(wiseParent.getPosition());
             int parentY = coord.y;
-            y = parentY - ((childrenCount / 2) * SECOND_LEVEL_TOPIC_HEIGHT - (order * SECOND_LEVEL_TOPIC_HEIGHT));
+            y = parentY - ((childrenCount / 2) * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT - (order * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT));
 
 
         }
@@ -573,14 +530,14 @@ public class FreemindImporter
         // 10 Large
         // 15 Huge
         if (font != null) {
-            final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FONT_SIZE_NORMAL) : font.getSIZE()).intValue();
-            int wiseFontSize = FONT_SIZE_SMALL;
+            final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FreemindConstant.FONT_SIZE_NORMAL) : font.getSIZE()).intValue();
+            int wiseFontSize = FreemindConstant.FONT_SIZE_SMALL;
             if (fontSize >= 24) {
-                wiseFontSize = FONT_SIZE_HUGE;
+                wiseFontSize = FreemindConstant.FONT_SIZE_HUGE;
             } else if (fontSize >= 16) {
-                wiseFontSize = FONT_SIZE_LARGE;
+                wiseFontSize = FreemindConstant.FONT_SIZE_LARGE;
             } else if (fontSize >= 12) {
-                wiseFontSize = FONT_SIZE_NORMAL;
+                wiseFontSize = FreemindConstant.FONT_SIZE_NORMAL;
             }
             fontStyle.append(wiseFontSize);
 
@@ -597,19 +554,19 @@ public class FreemindImporter
         // Bold ...
         if (font != null) {
             boolean hasBold = Boolean.parseBoolean(font.getBOLD());
-            fontStyle.append(hasBold ? BOLD : "");
+            fontStyle.append(hasBold ? FreemindConstant.BOLD : "");
         }
         fontStyle.append(";");
 
         // Italic ...
         if (font != null) {
             boolean hasItalic = Boolean.parseBoolean(font.getITALIC());
-            fontStyle.append(hasItalic ? ITALIC : "");
+            fontStyle.append(hasItalic ? FreemindConstant.ITALIC : "");
         }
         fontStyle.append(";");
 
         final String result = fontStyle.toString();
-        return result.equals(EMPTY_FONT_STYLE) ? null : result;
+        return result.equals(FreemindConstant.EMPTY_FONT_STYLE) ? null : result;
     }
 
     private

wise-webapp/src/main/java/com/wisemapping/model/Label.java

@@ -12,6 +12,7 @@ public class Label {
     @NotNull private User creator;
     @Nullable private Label parent;
     @NotNull private String color;
+    @NotNull private String iconName;
 
     public void setParent(@Nullable Label parent) {
         this.parent = parent;
@@ -57,6 +58,15 @@ public class Label {
         this.color = color;
     }
 
+    @NotNull
+    public String getIconName() {
+        return iconName;
+    }
+
+    public void setIconName(@NotNull String iconName) {
+        this.iconName = iconName;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -76,4 +86,5 @@ public class Label {
         result = 31 * result + (parent != null ? parent.hashCode() : 0);
         return result;
     }
+
 }

wise-webapp/src/main/java/com/wisemapping/model/LabelMindmap.java

@@ -1,50 +0,0 @@
-package com.wisemapping.model;
-
-import java.io.Serializable;
-
-public class LabelMindmap implements Serializable{
-
-    private int mindmapId;
-    private int labelId;
-
-    public LabelMindmap(int labelId, int mindmapId) {
-        this.mindmapId = mindmapId;
-        this.labelId = labelId;
-    }
-
-    public LabelMindmap() {}
-
-    public int getMindmapId() {
-        return mindmapId;
-    }
-
-    public void setMindmapId(int mindmapId) {
-        this.mindmapId = mindmapId;
-    }
-
-    public int getLabelId() {
-        return labelId;
-    }
-
-    public void setLabelId(int labelId) {
-        this.labelId = labelId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof LabelMindmap)) return false;
-
-        LabelMindmap that = (LabelMindmap) o;
-
-        return labelId == that.labelId && mindmapId == that.mindmapId;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = mindmapId;
-        result = 31 * result + labelId;
-        return result;
-    }
-}

wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java

@@ -23,7 +23,8 @@ public enum ShapeStyle
     LINE("line"),
     ROUNDED_RECTANGLE("rounded rectagle"),
     RECTANGLE("rectagle"),
-    ELLIPSE("elipse");
+    ELLIPSE("elipse"),
+    IMAGE("image");
 
     private String style;
 
@@ -35,5 +36,14 @@ public enum ShapeStyle
     public String getStyle()
     {
         return style;
-    }    
+    }
+
+    public static ShapeStyle fromValue(String value) {
+        for (ShapeStyle shapeStyle : ShapeStyle.values()) {
+            if (shapeStyle.getStyle().equals(value)) {
+                return shapeStyle;
+            }
+        }
+        throw new IllegalArgumentException("Shape value \"" + value + "\" doesn't match with a value shape style.");
+    }
 }

wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java

@@ -69,7 +69,7 @@ public class LabelController extends BaseController {
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void deleteLabelById(@PathVariable int id) throws WiseMappingException {
         final User user = Utils.getUser();
-        final Label label = labelService.getLabelById(id);
+        final Label label = labelService.getLabelById(id, user);
         if (label == null) {
             throw new LabelCouldNotFoundException("Label could not be found. Id: " + id);
         }

wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java

@@ -20,6 +20,7 @@ package com.wisemapping.rest;
 
 import com.mangofactory.swagger.annotations.ApiIgnore;
 import com.wisemapping.exceptions.ImportUnexpectedException;
+import com.wisemapping.exceptions.LabelCouldNotFoundException;
 import com.wisemapping.exceptions.MapCouldNotFoundException;
 import com.wisemapping.exceptions.MultipleSessionsOpenException;
 import com.wisemapping.exceptions.SessionExpiredException;
@@ -45,6 +46,7 @@ import com.wisemapping.rest.model.RestMindmapInfo;
 import com.wisemapping.rest.model.RestMindmapList;
 import com.wisemapping.security.Utils;
 import com.wisemapping.service.CollaborationException;
+import com.wisemapping.service.LabelService;
 import com.wisemapping.service.LockInfo;
 import com.wisemapping.service.LockManager;
 import com.wisemapping.service.MindmapService;
@@ -88,6 +90,10 @@ public class MindmapController extends BaseController {
     @Autowired
     private MindmapService mindmapService;
 
+    @Qualifier("labelService")
+    @Autowired
+    private LabelService labelService;
+
     @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/json", "application/xml", "text/html"})
     @ResponseBody
     public RestMindmap retrieve(@PathVariable int id) throws WiseMappingException {
@@ -108,13 +114,14 @@ public class MindmapController extends BaseController {
         return new ModelAndView("transformViewWise", values);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"})
+    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm","version"})
     @ResponseBody
-    public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException, MapCouldNotFoundException {
+    public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id, @RequestParam(value = "version") String version) throws IOException, MapCouldNotFoundException {
         final Mindmap mindMap = findMindmapById(id);
         final Map<String, Object> values = new HashMap<String, Object>();
         values.put("content", mindMap.getXmlStr());
         values.put("filename", mindMap.getTitle());
+        values.put("version", version);
         return new ModelAndView("transformViewFreemind", values);
     }
 
@@ -630,18 +637,23 @@ public class MindmapController extends BaseController {
         mindmapService.removeLabel(mindmap, delegated);
     }
 
-    @RequestMapping(method = RequestMethod.POST, value = "/labels/maps", consumes = {"application/json"})
+    @RequestMapping(method = RequestMethod.POST, value = "/labels/maps", consumes = { "application/xml","application/json"})
     @ResponseStatus(value = HttpStatus.OK)
     public void addLabel(@RequestBody RestLabel restLabel, @RequestParam(required = true) String ids) throws WiseMappingException {
         int labelId = restLabel.getId();
+        final User user = Utils.getUser();
+        final Label delegated = restLabel.getDelegated();
+        delegated.setCreator(user);
+        final Label found = labelService.getLabelById(labelId, user);
+        if (found == null) {
+            throw new LabelCouldNotFoundException("Label could not be found. Id: " + labelId);
+        }
         for (String id : ids.split(",")) {
             final int mindmapId = Integer.parseInt(id);
             final Mindmap mindmap = findMindmapById(mindmapId);
             final Label label = mindmap.findLabel(labelId);
             if (label == null) {
-                final Label delegated = restLabel.getDelegated();
-                delegated.setCreator(Utils.getUser());
-                mindmapService.addLabel(mindmap, delegated);
+                mindmapService.linkLabel(mindmap, delegated);
             }
         }
     }

wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java

@@ -65,10 +65,18 @@ public class RestLabel {
         label.setColor(color);
     }
 
+    public void setIconName(@NotNull final String iconName) {
+        label.setIconName(iconName);
+    }
+
     @Nullable public String getColor() {
         return label.getColor();
     }
 
+    @Nullable public String getIconName() {
+        return label.getIconName();
+    }
+
     @JsonIgnore
     public Label getDelegated() {
         return label;

wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java

@@ -99,8 +99,11 @@ public class RestMindmapInfo {
     }
      public Set<RestLabel> getLabels() {
          final Set<RestLabel> result = new LinkedHashSet<>();
+         final User me = Utils.getUser();
          for (Label label : mindmap.getLabels()) {
-             result.add(new RestLabel(label));
+             if (label.getCreator().equals(me)) {
+                 result.add(new RestLabel(label));
+             }
          }
          return result;
      }

wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java

@@ -56,6 +56,7 @@ public class TransformView extends AbstractView {
 
         final String content = (String) viewMap.get("content");
         final String filename = (String) viewMap.get("filename");
+        final String version = (String) viewMap.get("version");
 
         // Build format properties ...
         final ExportProperties properties = ExportProperties.create(exportFormat);
@@ -63,6 +64,9 @@ public class TransformView extends AbstractView {
             final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
             imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
         }
+        if (version != null) {
+            properties.setVersion(version);
+        }
 
         // Set format content type...
         final String contentType = exportFormat.getContentType();

wise-webapp/src/main/java/com/wisemapping/service/LabelService.java

@@ -15,7 +15,7 @@ public interface LabelService {
     @NotNull List<Label> getAll(@NotNull final User user);
 
     @Nullable
-    Label getLabelById(int id);
+    Label getLabelById(int id, @NotNull final User user);
 
     public Label getLabelByTitle(@NotNull String title, @NotNull final User user);
 

wise-webapp/src/main/java/com/wisemapping/service/LabelServiceImpl.java

@@ -31,8 +31,8 @@ public class LabelServiceImpl implements LabelService {
     }
 
     @Override @Nullable
-    public Label getLabelById(int id) {
-        return labelManager.getLabelById(id);
+    public Label getLabelById(int id, @NotNull final User user) {
+        return labelManager.getLabelById(id, user);
     }
 
     @Nullable

wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java

@@ -68,7 +68,7 @@ public interface MindmapService {
 
     void purgeHistory(int mapId) throws IOException;
 
-    void addLabel(@NotNull final Mindmap mindmap, @NotNull final Label label);
+    void linkLabel(@NotNull final Mindmap mindmap, @NotNull final Label label);
 
     void removeLabel(@NotNull final Mindmap mindmap, @NotNull final Label label);
 }

wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java

@@ -88,15 +88,13 @@ public class MindmapServiceImpl
     }
 
     @Override
-    public void addLabel(@NotNull Mindmap mindmap, @NotNull final Label label) {
+    public void linkLabel(@NotNull Mindmap mindmap, @NotNull final Label label) {
         mindmap.addLabel(label);
-        //mindmapManager.saveMindmap(mindmap);
     }
 
     @Override
     public void removeLabel(@NotNull Mindmap mindmap, @NotNull Label label) {
         mindmap.removeLabel(label);
-        //mindmapManager.saveMindmap(mindmap);
     }
 
     @Override

wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java

@@ -37,6 +37,7 @@ public class LabelValidator implements Validator {
     private void validateLabel(@NotNull final Label label, @NotNull final Errors errors) {
         ValidationUtils.rejectIfEmptyOrWhitespace(errors, "title", Messages.FIELD_REQUIRED);
         ValidationUtils.rejectIfEmptyOrWhitespace(errors, "color", Messages.FIELD_REQUIRED);
+        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "iconName", Messages.FIELD_REQUIRED);
         final String title = label.getTitle();
         ValidatorUtils.rejectIfExceeded(
                 errors,

wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java

@@ -157,6 +157,7 @@ public class MindmapController {
             final LockManager lockManager = this.mindmapService.getLockManager();
             if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) {
                 readOnlyMode = true;
+                isLocked = true;
             } else {
                 model.addAttribute("lockTimestamp", mindmap.getLastModificationTime().getTimeInMillis());
                 model.addAttribute(LOCK_SESSION_ATTRIBUTE, lockManager.generateSession());

wise-webapp/src/main/resources/com/wisemapping/model/Label.hbm.xml

@@ -11,6 +11,7 @@
         </id>
         <property name="title"/>
         <property name="color"/>
+        <property name="iconName"/>
         <many-to-one name="parent" column="parent_label_id" not-null="false"/>
         <many-to-one name="creator" column="creator_id" unique="true" not-null="false" lazy="proxy"/>
     </class>

wise-webapp/src/main/resources/messages_ca.properties

@@ -35,7 +35,8 @@ EXPORT=Exportar
 SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
 PDF_EXPORT_FORMAT=Portable Document Format (PDF)
 IMG_EXPORT_FORMAT=Imatge(PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 DELETE=Esborrar
 LOGIN_ERROR=El nom d'usuari o la contrasenya no són correctes
 USER_INACTIVE=Perdo, el seu compre encara no ha estar activar. Rebrà un correu amb les dades d'activació.
@@ -162,7 +163,7 @@ ADD_MESSAGE=Afegir un missatge
 WHO_CAN_ACCESS=Qui pot accedir
 IS_OWNER=És propietari
 OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incloure un missatge personalitzat
-IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 0.9 i WiseMapping. Seleccioni el fitxer a importar.
+IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 1.0.1 i WiseMapping. Seleccioni el fitxer a importar.
 VIEW=veure
 YOU=Vostè
 INFO_UPDATE_SUCCESS=La seva informació s'ha actualitzat correctament.

wise-webapp/src/main/resources/messages_de.properties

@@ -38,7 +38,8 @@ EXPORT=Exportieren
 SVG_EXPORT_FORMAT=Skalierbare Vektor Graphik (SVG)
 PDF_EXPORT_FORMAT=Portables Dokumenten Format (PDF)
 IMG_EXPORT_FORMAT=Bilddatei (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=Zuletzt geändert
 LAST_UPDATE_BY=Zuletzt geändert von
@@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Outch!!. Ein unerwarteter Fehler ist aufgetreten.
 UNEXPECTED_ERROR_DETAILS=Es tut uns Leid! Es ist ein Fehler aufgetreten der es uns nicht ermöglicht Ihre Anfrage zu bearbeiten. Bitte versuchen Sie es noch einmal oder gehen Sie zur Anfangsseite.
 NO_ENOUGH_PERMISSIONS=Outch!!. Diese map ist nicht mehr verfügbar.
 NO_ENOUGH_PERMISSIONS_DETAILS=Sie haben nicht die erforderlichen Rechte, um sich diese map anzusehen. Diese map ist entweder privat oder wurde gelöscht.
-IMPORT_MINDMAP_INFO=Sie können FreeMind 0.9 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import.
+IMPORT_MINDMAP_INFO=Sie können FreeMind 1.0.1 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import.
 PRINT=Drucken
 IMPORT_MAP_ERROR=FreeMind Datei konnte nicht importiert werden. {0}
 MAP_TITLE_ALREADY_EXISTS=Sie haben schon eine map mit identischem Namen.

wise-webapp/src/main/resources/messages_en.properties

@@ -40,7 +40,8 @@ EXPORT=Export
 SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
 PDF_EXPORT_FORMAT=Portable Document Format (PDF)
 IMG_EXPORT_FORMAT=Image File (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=Last Update
 LAST_UPDATE_BY=Last Update By
@@ -103,7 +104,7 @@ 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, click below on "Raise An Issue" to open a ticket.
 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.
-IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import.
+IMPORT_MINDMAP_INFO=You can import FreeMind 1.0.1 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}
 MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name
@@ -145,6 +146,7 @@ NEW=New
 MIND_FILE=File
 PARENT_LABEL=Nest label under
 COLOR=Color
+ICON=Icon
 CHOOSE_LABEL=Choose a label
 SELECT_LABEL=Please select a label
 NO_SEARCH_RESULT=No mindmap available for the selected filter criteria
@@ -259,7 +261,7 @@ MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted.
 LABEL_CAN_NOT_BE_FOUND= Upps. The label can not be found. It must have been deleted.
 LICENSE=License
 WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
-WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
+WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>
 OPENID_LOGIN=Open Id Login
 LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here:
 WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a>
@@ -281,6 +283,132 @@ OPEN_OFFICE_EXPORT_FORMAT_DETAILS=Get your map as OpenOffice Write Document
 MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x
 MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format
 MINDMAP_IS_LOCKED=Mindmap is locked for edition.
+# icons..
+ASTERISK=Asterisk
+PLUS=Plus
+EURO=Euro
+MINUS=Minus
+CLOUD=Cloud
+ENVELOPE=Envelope
+PENCIL=Pencil
+CLASS=Glass
+MUSIC=Music
+HEART=Heart
+STAR=Star
+STAR-EMPTY=Empty Star
+USER=User
+FILM=Film
+OK=Ok
+REMOVE=Remove
+SIGNAL=Signal
+COG=Cog
+TRASH=Trash
+FILE=File
+TIME=Time
+DOWNLOAD-ALT=Download
+DOWNLOAD=Download
+UPLOAD=Upload
+INBOX=Inbox
+REPEAT=Repeat
+REFRESH=Refresh
+LIST-ALT=List
+LOCK=Lock
+FLAG=Flag
+HEADPHONES=Headphones
+GRCODE=GR Code
+BARCODE=Barcode
+TAG=Tag
+TAGS=Tags
+BOOK=Book
+BOOKMARK=Bookmark
+PRING=Print
+CAMERA=Camera
+LIST=List
+FACETIME-VIDEO=Facetime Video
+PICTURE=Picture
+MAP-MARKER=Map Maker
+ADJUST=Adjust
+TINT=Tint
+EDIT=Edit
+CHECK=Check
+CHEVRON-LEFT=Chevron Left
+CHEVRON-RIGHT=Chevron Right
+PLUS-SIGN=Plus Sign
+MINUS-SIGN=Minus Sign
+REMOVE-SIGN=Remove Sign
+OK-SIGN=Ok Sign
+QUESTION-SIGN=Question Sign
+INFO-SIGN=Info Sign
+SCREENSHOT=Screenshot
+REMOVE-CIRCLE=Remove Circle
+OK-CIRCLE=Ok Circle
+BAN-CIRCLE=Ban Circle
+ARROW-LEFT=Arrow Left
+ARROW-RIGHT=Arrow Right
+ARROW-UP=Arrow Up
+ARROW-DOWN=Arrow Down
+SHARE-ALT=Share
+EXCLAMATION-SIGN=Exclamation
+GIFT=Gift
+LEAF=Leaf
+FIRE=Fire
+EYE-OPEN=Open eye
+EYE-CLOSE=Closed eye
+WARNING-SIGN=Warning
+PLANE=Plane
+CALENDAR=Calendar
+RANDOM=Random
+COMMENT=Comment
+MAGNET=Magnet
+CHEVRON-UP=Chevrop Up
+CHEVRON-DOWN=Chevron Down
+SHOPPING-CART=Shopping
+FOLDER-CLOSE=Closed Folder
+FOLDER-OPEN=Open Folder
+HDD=HDD
+BULLHORN=Bullhorn
+BELL=Bell
+CERTIFICATE=Certificate
+THUMBS-UP=Thumbs up
+THUMBS-DOWN=Thumbs down
+HAND-RIGHT=Hand right
+HAND-LEFT=Hand left
+HAND-UP=Hang up
+HAND-DOWN=Hang down
+CIRCLE-ARROW-RIGHT=Circle right
+CIRCLE-ARROW-LEFT=Circle left
+CIRCLE-ARROW-UP=Circle up
+CIRCLE-ARROW-DOWN=Circle down
+GLOBE=Globe
+WRENCH=Wrench
+TASKS=Tasks
+FILTER=Filter
+BRIEFCASE=Briefcase
+PAPERCLIP=Paperclip
+HEART-EMPTY=Empty Heart
+LINK=Link
+PHONE=Phone
+PUSHPIN=Pushpin
+USD=USD
+GBP=GBP
+UNCHECKED=Unchecked
+FLASH=Flash
+RECORD=Record
+SAVED=Saved
+SEND=Send
+FLOPPY-DISK=Floppy Disk
+TRANSFER
+CUTLERY=Cutlery
+HEADER=Header
+COMPRESSED=Compressed
+EARPHONE=Earphone
+PHONE-ALT=Phone
+TOWER=Tower
+STATS=Stats
+COPYRIGTH-MARK=Copyright
+REGISTRATION-MARK=Registration Mark
+CLOUD-DOWNLOAD=Cloud Download
+CLOUD-UPLOAD=Cloud Updload
 
 
 

wise-webapp/src/main/resources/messages_es.properties

@@ -35,7 +35,8 @@ EXPORT=Exportar
 SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
 PDF_EXPORT_FORMAT=Portable Document Format (PDF)
 IMG_EXPORT_FORMAT=Imagen (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 DELETE=Borrar
 LOGIN_ERROR=El nombre de usuario o la contraseña introducidos no son correctos.
 USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibirá una notificación por email tan pronto la activemos.
@@ -66,7 +67,7 @@ ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
 SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) es un XML markup language para describir gráficos vectoriale de dos dimensiones. Este formato le permitira imprimir sus mapas sin perdida de calidad o resolución.
 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 gráfica 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
+FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind una aplicación de escritorio gratuita de diseño de mapas mentales
 TERMSOFUSE=Términos de uso
 PRIVACYPOLICY= Politica de privacidad
 EXPORT_DETAILS=Exporte el mapa en el formato que desee y comience a utilizarlo en sus presentaciones
@@ -164,7 +165,7 @@ ADD_MESSAGE=Agregar un mensaje
 WHO_CAN_ACCESS=Quienes pueden acceder
 IS_OWNER=Es dueño
 OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incluir un mensaje personalizado
-IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 0.9 y WiseMapping. Seleccione el archivo a importar.
+IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 1.0.1 y WiseMapping. Seleccione el archivo a importar.
 VIEW=ver
 YOU=Vos
 INFO_UPDATE_SUCCESS=Your info has been changed successfully

wise-webapp/src/main/resources/messages_fr.properties

@@ -43,7 +43,8 @@ EXPORT=Exporter
 SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
 PDF_EXPORT_FORMAT=Portable Document Format (PDF)
 IMG_EXPORT_FORMAT=Fichier Graphique (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=Date dernière modification
 LAST_UPDATE_BY=Dernière modification par
@@ -104,7 +105,7 @@ UNEXPECTED_ERROR=Aïe!!. Une erreur inattendue est survenue.
 UNEXPECTED_ERROR_DETAILS=Désolé, une erreur s'est produite et nous ne pouvons pas exécuter votre demande. Essayez à nouveau, ou retournez à la page d'accueil. 
 NO_ENOUGH_PERMISSIONS=Aïe!!. Cette carte n'est plus accessible.
 NO_ENOUGH_PERMISSIONS_DETAILS=Vous n'avez pas les droits d'accès suffisants pour voir cette carte. Cette carte est devenue privée, ou a été détruite. 
-IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 0.9 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer. 
+IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 1.0.1 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer.
 PRINT=Imprimer
 IMPORT_MAP_ERROR=Le fichier FreeMind n'a pas pu être importé. {0}
 MAP_TITLE_ALREADY_EXISTS=Vous avez déjà une carte portant le même nom.

wise-webapp/src/main/resources/messages_it.properties

@@ -38,7 +38,8 @@ EXPORT=Esporta
 SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
 PDF_EXPORT_FORMAT=Portable Document Format (PDF)
 IMG_EXPORT_FORMAT=File Immagine (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (versione 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=Ultimo Aggiornamento
 LAST_UPDATE_BY=Ultimo aggiornamento da
@@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Oops!! Si è verificato un errore inaspettato.
 UNEXPECTED_ERROR_DETAILS=Siamo spiacenti, si è verificato un errore e non possiamo procedere nella tua richiesta. Prego, provare più tardi o torna alla home page.
 NO_ENOUGH_PERMISSIONS=Oops!!. Questa mappa non è più disponibile.
 NO_ENOUGH_PERMISSIONS_DETAILS=Non hai sufficienti diritti per visualizzare questa mappa. Il suo stato è cambiato in Privato oppure è stata eliminata.
-IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 0.9 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare.
+IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 1.0.1 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare.
 PRINT=Stampa
 IMPORT_MAP_ERROR=Il file FreeMind non può essere importato. {0}
 MAP_TITLE_ALREADY_EXISTS=Esiste già una mappa con lo stesso nome

wise-webapp/src/main/resources/messages_pt_BR.properties

@@ -36,7 +36,8 @@ EXPORT=Exportar
 SVG_EXPORT_FORMAT=Gráfico Vetorial Escalável (SVG)
 PDF_EXPORT_FORMAT=Formato de Documento Portável (PDF)
 IMG_EXPORT_FORMAT=Arquivo de Imagem (PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Exportar para o Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=Última Atualização
 LAST_UPDATE_BY=Última Atualização
@@ -97,7 +98,7 @@ UNEXPECTED_ERROR=Opa!!. Ocorreu um erro inesperado.
 UNEXPECTED_ERROR_DETAILS=Lamentamos, ocorreu um erro e não podemos processar a sua solicitação. Por favor, tente novamente ou vá para a página Inicial.
 NO_ENOUGH_PERMISSIONS=Opa!!. Este mapa não está mais disponível.
 NO_ENOUGH_PERMISSIONS_DETAILS=Você não tem privilégios suficientes para ver este mapa. Este mapa foi alterado para privado ou deletado.
-IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 0.9 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar.
+IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 1.0.1 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar.
 PRINT=Imprimir
 IMPORT_MAP_ERROR=O arquivo FreeMind não pode ser importado. {0}
 MAP_TITLE_ALREADY_EXISTS=Você já tem um mapa com o mesmo nome

wise-webapp/src/main/resources/messages_zh_CN.properties

@@ -99,7 +99,7 @@ UNEXPECTED_ERROR=晕！！不可预知的错误。
 UNEXPECTED_ERROR_DETAILS=抱歉，突遭错误，我们无法处理你的请求。 请重试或者访问首页。
 NO_ENOUGH_PERMISSIONS=晕！！此图不可访问。
 NO_ENOUGH_PERMISSIONS_DETAILS=你没有权限访问这张图。此图已修改访问权限或者已删除。
-IMPORT_MINDMAP_INFO=你可以导入 FreeMind 0.9 和 WiseMapping 格式的思维导图。选择你想要导入的文件。
+IMPORT_MINDMAP_INFO=你可以导入 FreeMind 1.0.1 和 WiseMapping 格式的思维导图。选择你想要导入的文件。
 PRINT=打印
 IMPORT_MAP_ERROR=FreeMind 文件不能导入。
 MAP_TITLE_ALREADY_EXISTS=已有同名称图

wise-webapp/src/main/resources/messages_zh_TW.properties

@@ -38,7 +38,8 @@ EXPORT=導出
 SVG_EXPORT_FORMAT=可縮放向量圖形(SVG)
 PDF_EXPORT_FORMAT=便攜檔格式(PDF)
 IMG_EXPORT_FORMAT=圖像檔(PNG/JPEG)
-FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
+FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
 WISEMAPPING_EXPORT_FORMAT = WiseMapping
 LAST_UPDATE=最近更新
 LAST_UPDATE_BY=最近更新者
@@ -99,7 +100,7 @@ UNEXPECTED_ERROR=暈！！不可預知的錯誤。
 UNEXPECTED_ERROR_DETAILS=抱歉，突遭錯誤，我們無法處理你的請求。 請重試或者訪問首頁。
 NO_ENOUGH_PERMISSIONS=暈！！此圖不可訪問。
 NO_ENOUGH_PERMISSIONS_DETAILS=你沒有許可權訪問這張圖。此圖已修改訪問許可權或者已刪除。
-IMPORT_MINDMAP_INFO=你可以導入 FreeMind 0.9 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。
+IMPORT_MINDMAP_INFO=你可以導入 FreeMind 1.0.1 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。
 PRINT=列印
 IMPORT_MAP_ERROR=FreeMind 檔不能導入。
 MAP_TITLE_ALREADY_EXISTS=已有同名稱圖

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -1,4 +1,3 @@
-
 ##################################################################################
 # Database Configuration
 ##################################################################################
@@ -93,7 +92,7 @@ admin.user = admin@wisemapping.org
 
 # Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
 # If you are planning to put wisemapping behind an Apache using an Apache Proxy setup, you must enable this property.
-#site.baseurl = http:///example.com:8080/wisemapping
+#site.baseurl = http://example.com:8080/wisemapping
 
 
 # Site Homepage URL. This will be used as URL for homepage location.
@@ -129,9 +128,9 @@ security.ldap.server.password=password
 security.ldap.basedn=dc=wisemapping,dc=com
 
 
-# This will be concatenated as part of the DN. In this case, I will be ou="people".
+# This will be concatenated as part of the DN. In this case, I will be "ou=people".
 # In case this need to be changed, modify the wisemapping-security-ldap.xml.
-security.ldap.subDn=people
+security.ldap.subDn=ou=people
 
 # Attribute used as authentication login (Eg: in this case, the user email will be used)
 security.ldap.auth.attribute=mail

wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml

@@ -13,6 +13,7 @@
             <list>
                 <value>getMindmapUserBy</value>
                 <value>getMindmapById</value>
+                <value>linkLabel</value>
                 <value>find*</value>
                 <value>filter*</value>
             </list>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml

@@ -45,7 +45,7 @@
 
     <bean id="ldapUserSearch"
           class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch">
-        <constructor-arg index="0" value="ou=${security.ldap.subDn}"/>
+        <constructor-arg index="0" value="${security.ldap.subDn}"/>
         <constructor-arg index="1" value="(${security.ldap.auth.attribute}={0})"/>
         <constructor-arg index="2" ref="contextSource"/>
         <property name="searchSubtree" value="true"/>

wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.min.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.svg

@@ -28,12 +28,12 @@
 <glyph unicode="&#x205f;" horiz-adv-x="326" />
 <glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
 <glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
-<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
 <glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
 <glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
 <glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
 <glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
 <glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
 <glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
@@ -46,7 +46,7 @@
 <glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
 <glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
 <glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
 <glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
 <glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
 <glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
@@ -58,7 +58,7 @@
 <glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
 <glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
 <glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
-<glyph unicode="&#xe028;" d="M0 25v475l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
 <glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
 <glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
 <glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
@@ -71,14 +71,14 @@
 <glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
 <glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
 <glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
-<glyph unicode="&#xe041;" d="M1 700v475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="&#xe042;" d="M2 700v475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
 <glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
 <glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
 <glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
 <glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
 <glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
-<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v70h471q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
 <glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
 <glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
 <glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
@@ -93,10 +93,10 @@
 <glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
 <glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
 <glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
-<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
 <glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
 <glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l566 567l-136 137l-430 -431l-147 147z" />
+<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
 <glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
 <glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
 <glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
@@ -110,13 +110,13 @@
 <glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
 <glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
 <glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
-<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h600v200h-600v-200z" />
-<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141z" />
+<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
+<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
 <glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM363 700h144q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26 q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-105 0 -172 -56t-67 -183zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
-<glyph unicode="&#xe087;" d="M0 500v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200 v-206q149 48 201 206h-201v200h200q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210z" />
+<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
+<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
 <glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
 <glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
 <glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
@@ -127,14 +127,14 @@
 <glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
 <glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
 <glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
-<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100z M100 0h400v400h-400v-400zM200 900q-3 0 14 48t35 96l18 47l214 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
 <glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
 <glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
 <glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
 <glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
-<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
-<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -21 -13 -29t-32 1l-94 78h-222l-94 -78q-19 -9 -32 -1t-13 29v64 q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
 <glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
 <glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
 <glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
@@ -148,33 +148,33 @@
 <glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
 <glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
 <glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
-<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM99 500v250v5q0 13 0.5 18.5t2.5 13t8 10.5t15 3h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35q-56 337 -56 351z M1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23t-167.5 -37 t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
 <glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q123 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 212l100 213h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
-<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
 <glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
-<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 37h302l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 16.5 -10.5t26 -26t16.5 -36.5v-526q0 -13 -85.5 -93.5t-93.5 -80.5h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l106 89v502l-342 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM999 201v600h200v-600h-200z" />
-<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
-<glyph unicode="&#xe130;" d="M1 585q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85l-1 -302q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM76 565l237 339h503l89 -100v-294l-340 -130 q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 500h300l-2 -194l402 294l-402 298v-197h-298v-201z" />
-<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l400 -294v194h302v201h-300v197z" />
-<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
-<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -34 5.5 -93t7.5 -87q0 -9 17 -44t16 -60q12 0 23 -5.5 t23 -15t20 -13.5q20 -10 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55.5t-20 -57.5q12 -21 22.5 -34.5t28 -27t36.5 -17.5q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q101 -2 221 111q31 30 47 48t34 49t21 62q-14 9 -37.5 9.5t-35.5 7.5q-14 7 -49 15t-52 19 q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q8 16 22 22q6 -1 26 -1.5t33.5 -4.5t19.5 -13q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5 t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23 q-19 -3 -37 0q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -46 0t-45 -3q-20 -6 -51.5 -25.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79zM518 915q3 12 16 30.5t16 25.5q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -18 8 -42.5t16.5 -44 t9.5 -23.5q-6 1 -39 5t-53.5 10t-36.5 16z" />
+<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
+<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
+<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
+<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
 <glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
 <glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
 <glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
 <glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
 <glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM513 609q0 32 21 56.5t52 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-16 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5q-37 0 -62.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
-<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36 q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60l517 511 q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
-<glyph unicode="&#xe143;" d="M79 784q0 131 99 229.5t230 98.5q144 0 242 -129q103 129 245 129q130 0 227 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100l-84.5 84.5t-68 74t-60 78t-33.5 70.5t-15 78z M250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-106 48.5q-73 0 -131 -83l-118 -171l-114 174q-51 80 -124 80q-59 0 -108.5 -49.5t-49.5 -118.5z" />
-<glyph unicode="&#xe144;" d="M57 353q0 -94 66 -160l141 -141q66 -66 159 -66q95 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-12 12 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141l19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -18q46 -46 77 -99l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
+<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
 <glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
 <glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335l-27 7q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5v-307l64 -14 q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5zM700 237 q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
-<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -11 2.5 -24.5t5.5 -24t9.5 -26.5t10.5 -25t14 -27.5t14 -25.5 t15.5 -27t13.5 -24h242v-100h-197q8 -50 -2.5 -115t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10 t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5t-30 142.5h-221z" />
+<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
 <glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
 <glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
 <glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
@@ -187,15 +187,15 @@
 <glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
 <glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
 <glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
-<glyph unicode="&#xe162;" d="M216 519q10 -19 32 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8l9 -1q13 0 26 16l538 630q15 19 6 36q-8 18 -32 16h-300q1 4 78 219.5t79 227.5q2 17 -6 27l-8 8h-9q-16 0 -25 -15q-4 -5 -98.5 -111.5t-228 -257t-209.5 -238.5q-17 -19 -7 -40z" />
+<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
 <glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
 <glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
 <glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
 <glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
 <glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
 <glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 401h700v699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l248 -237v700h-699zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
 <glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
 <glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
 <glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
@@ -204,11 +204,11 @@
 <glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
 <glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
 <glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
-<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -117q-25 -16 -43.5 -50.5t-18.5 -65.5v-359z" />
+<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
 <glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
 <glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
-<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q16 17 13 40.5t-22 37.5l-192 136q-19 14 -45 12t-42 -19l-119 -118q-143 103 -267 227q-126 126 -227 268l118 118q17 17 20 41.5 t-11 44.5l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
-<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -15 -35.5t-35 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
 <glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
 <glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
 <glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
@@ -221,9 +221,9 @@
 <glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
 <glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
 <glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
-<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300 h200l-300 -300z" />
-<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104t60.5 178q0 121 -85 207.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
+<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
 <glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
-<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -12t1 -11q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
 </font>
 </defs></svg> 

wise-webapp/src/main/webapp/bootstrap/js/bootstrap.js

@@ -1,13 +1,13 @@
 /*!
- * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') }
+if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
 
 /* ========================================================================
- * Bootstrap: transition.js v3.1.0
+ * Bootstrap: transition.js v3.1.1
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -56,7 +56,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: alert.js v3.1.0
+ * Bootstrap: alert.js v3.1.1
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -145,7 +145,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: button.js v3.1.0
+ * Bootstrap: button.js v3.1.1
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -253,7 +253,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: carousel.js v3.1.0
+ * Bootstrap: carousel.js v3.1.1
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -459,7 +459,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: collapse.js v3.1.0
+ * Bootstrap: collapse.js v3.1.1
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -630,7 +630,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: dropdown.js v3.1.0
+ * Bootstrap: dropdown.js v3.1.1
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -778,7 +778,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: modal.js v3.1.0
+ * Bootstrap: modal.js v3.1.1
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -1022,7 +1022,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: tooltip.js v3.1.0
+ * Bootstrap: tooltip.js v3.1.1
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -1422,7 +1422,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: popover.js v3.1.0
+ * Bootstrap: popover.js v3.1.1
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -1533,7 +1533,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.1.0
+ * Bootstrap: scrollspy.js v3.1.1
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -1687,7 +1687,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: tab.js v3.1.0
+ * Bootstrap: tab.js v3.1.1
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -1813,7 +1813,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: affix.js v3.1.0
+ * Bootstrap: affix.js v3.1.1
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.

wise-webapp/src/main/webapp/css/mindmapList.less

@@ -1,4 +1,4 @@
-@import "bootstrap/css/bootstrap-colorpicker.min.css";
+@import "../bootstrap/css/bootstrap-colorpicker.min.css";
 @import "../bootstrap/css/bootstrap.min.css";
 @import "pageHeaders.css";
 
@@ -6,7 +6,6 @@
 @body-width: 1050px;
 
 @font-family: "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
-@base-font-size: 11px;
 
 @base-margin: 10px;
 @base-padding: @base-margin;
@@ -14,31 +13,21 @@
 @base-color: #111;
 
 /* ----------------------------- General -------------------------------- */
-.nav-list {
-  margin-top: -20px;
-}
-.nav-list li {
+.filterList li {
   position: relative;
   width: 90%;
+  height: 35px;
 }
-.nav-list a, .nav-header {
-  margin-top: 4px;
-  border: 1px solid rgb(213, 207, 207);
-  border-radius: 6px;
-  box-shadow: 0px 1px 3px #888888;
-}
-.nav-header {
-  background-color: #eee;
+
+.filterList {
+  width: 108%;
 }
 .active {
   position: relative;
   left: 8px;
 }
-#mindmapListTable {
-  border-radius: 6px;
-  left: -4px;
-  position: relative;
-  box-shadow: 0px 1px 9px #888888;
+.colorpicker {
+  z-index: 2000;
 }
 
 #mindmapListContainer {
@@ -54,6 +43,10 @@
     -moz-border-radius: @radius;
 }
 
+.mindmapName {
+    color: #428bca;
+}
+
 /* ------------------------------ Table --------------------------------- */
 
 @table-gap: 2%;
@@ -113,25 +106,31 @@ input#selectAll {
     padding: 4px;
 }
 
+#mindmapListTable tbody tr {
+    cursor: pointer;
+}
+
 /* Pagination Styles */
 #paginateContainer {
     height: 40px;
     width: 100%;
 }
 
+.dataTables_info {
+  font-size: 12px;
+  line-height: 1.428571429;
+  color: #555;
+  font-weight: 700;
+
+}
 .dataTables_length {
     display: block;
     height: 34px;
-    padding: 6px 12px;
-    font-size: 14px;
+    font-size: 12px;
     line-height: 1.428571429;
     color: #555;
     background-color: #fff;
     background-image: none;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
     float: right;
 }
 
@@ -146,8 +145,8 @@ input#selectAll {
     height: 12px;
     display: inline-block;
     position: relative;
-    left: 2px;
-    top: 1px;
+    left: 3px;
+    top: 2px;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -155,6 +154,11 @@ input#selectAll {
     float: left;
 }
 
+.colorInput {
+  border-radius: 4px !important;
+  border: 1px solid #ccc !important;
+}
+
 .labelIcon {
   float: left;
 }
@@ -163,11 +167,11 @@ input#selectAll {
     display: inline-block;
     position: relative;
     left: 7px;
-    top: -1px;
+    top: -2px;
 }
 
 .labelNameList {
-  max-width: 120px;
+  max-width: 79px;
   word-wrap: break-word;
 }
 
@@ -194,6 +198,7 @@ input#selectAll {
 
 .closeTag {
   cursor: pointer;
+  z-index: 2000;
 }
 
 .tableTag {
@@ -201,6 +206,8 @@ input#selectAll {
   margin-bottom: 0px;
   margin-right: 5px;
   float: right;
+  position: relative;
+  top: 3px;
 }
 
 table.tableTag td {
@@ -338,15 +345,57 @@ abbr[title] {
 }
 
 #foldersContainer {
-    padding-top: 60px;
+    padding-top: 86px;
 }
 
 #footerContainer > ul {
    padding:0px;
    margin:0px;
 }
+
 #footerContainer > li.active {
    padding:0px;
    margin:0px;
 }
 
+#foldersContainer > ul > li > a {
+  padding: 8px 15px;
+  white-space: nowrap;
+}
+
+/* ----------------------------- Icons ----------------------------------- */
+
+#defaultIcon {
+  background: #eee;
+  border: 1px solid #ccc !important;
+}
+
+#defaultIcon:hover {
+  background-color: #C8C8C8;
+}
+
+.colorInput:hover {
+  background-color: #C8C8C8;
+}
+
+.bs-glyphicons > ul {
+  padding-left: 10px;
+  overflow-x: hidden;
+}
+
+.bs-glyphicons > ul > li {
+  float: left;
+  width: 12%;
+  height: 20%;
+  padding: 10px;
+  font-size: 10px;
+  line-height: 1.4;
+  text-align: center;
+  border: 1px solid #fff;
+  background-color: #f9f9f9;
+  cursor: pointer;
+}
+
+.bs-glyphicons > ul > li:hover {
+  background-color: #C8C8C8;
+}

wise-webapp/src/main/webapp/css/pageHeaders.css

@@ -57,6 +57,7 @@ html,body {
     padding-left: 7px;
     font-weight: bold;
     vertical-align: middle;
+    font-size: 20px;
 }
 
 #headerButtons {
@@ -125,3 +126,8 @@ div#headerActions {
 div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
     color: white;
 }
+
+#dialogMainForm label
+{
+    font-weight:normal;
+}

wise-webapp/src/main/webapp/css/pageTemplate.css

@@ -2,7 +2,7 @@
 @import "pageHeaders.css";
 
 div#register {
-    margin: 40px auto;
+    margin: 20px auto;
     text-align: center;
     white-space: nowrap;
 }
@@ -17,34 +17,6 @@ div#pageContainer {
     min-height: 100%;
 }
 
-div.bodyContainer {
-    padding-top: 30px;
-    padding-bottom: 85px; /* Height of the footer */
-}
-
-div.bodyContainer h1 {
-    color: #093A9D;
-    font-size: 150%;
-    margin-bottom: 5px;
-    font-weight: bold;
-}
-
-div.bodyContainer h2 {
-    color: gray;
-    font-size: 150%;
-    border-bottom: 1px dashed #BBB4D6;
-    margin: 20px 0;
-}
-
-div.bodyContainer ul {
-    padding: 5px;
-}
-
-div.bodyContainer li {
-    list-style-type: disc;
-    margin-left: 12px;
-}
-
 #footerContainer {
     padding-top: 10px;
     border-top: 1px black solid;
@@ -58,21 +30,31 @@ div.bodyContainer li {
 
 /*--   End Main Page Style -- */
 
-span.errorMsg {
-    color: red;
+
+/* Reduce styles */
+.jumbotron > h1 {
+    font-size: 30px;
+    color: #00008b;
 }
 
-div.fform {
-    background: #eeeeee;
-    border: 1px solid #cfcfcf;
-    padding: 5px 25px;
-    -moz-border-radius: 8px;
-    -khtml-border-radius: 8px;
-    -webkit-border-radius: 8px;
-    border-radius: 8px;
+.jumbotron  p {
+    font-size: 15px;
 }
 
-div.fform label {
-    font-weight: bold;
+#login h1 {
+    font-size: 25px;
+    color: #00008b;
+}
+
+#loginPanel {
+    padding: 0 60px;
+    background: #ffffff;
+    margin-top: 40px;
+    background: #F7C931;
+    color: #ffffff;
+}
+
+#loginPanel h1 {
+    color: #00008b;
 }
 

wise-webapp/src/main/webapp/js/jquery.timeago.en_us.js

@@ -0,0 +1,20 @@
+// English (US)
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: null,
+  suffixAgo: "ago",
+  suffixFromNow: "from now",
+  seconds: "less than a minute",
+  minute: "about a minute",
+  minutes: "%d minutes",
+  hour: "about an hour",
+  hours: "about %d hours",
+  day: "a day",
+  days: "%d days",
+  month: "about a month",
+  months: "%d months",
+  year: "about a year",
+  years: "%d years",
+  wordSeparator: " ",
+  numbers: []
+};

wise-webapp/src/main/webapp/js/less.js

@@ -0,0 +1 @@
+../../../../../mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js

wise-webapp/src/main/webapp/js/mindmapList.js

@@ -66,7 +66,6 @@ jQuery.fn.dataTableExt.removeSelectedRows = function () {
     updateStatusToolbar();
 };
 
-
 jQuery.fn.dialogForm = function (options) {
 
     var containerId = this[0].id;
@@ -78,7 +77,8 @@ jQuery.fn.dialogForm = function (options) {
 
     // Clear form values ...
     if (options.clearForm == undefined || options.clearForm) {
-        $("#" + containerId).find('input[name!="color"]').val('');
+        //FIXME: icon and color should be handled as exceptions..
+        $("#" + containerId).find('input[name!="color"]input[name!="iconName"]').val('');
     }
 
     // Clear button "Saving..." state ...
@@ -170,14 +170,13 @@ jQuery.fn.dialogForm = function (options) {
     });
 
     // Open the modal dialog ...
-    this.on('shown', function() {
-        $('#' + containerId + ' input:first').focus();
+    this.on('shown.bs.modal', function() {
+        $(this).find('input:first').focus();
     });
     this.modal();
 
 };
 
-
 // Update toolbar events ...
 function updateStatusToolbar() {
 
@@ -185,14 +184,14 @@ function updateStatusToolbar() {
     $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected');
     $("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected');
 
-    $('.buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide();
+    $('.buttonsToolbar').find('.act-single').fadeOut('slow').end().find('.act-multiple').fadeOut('slow');
 
     var tableElem = $('#mindmapListTable');
     var selectedRows = tableElem.dataTableExt.getSelectedRows();
 
     if (selectedRows.length > 0) {
         if (selectedRows.length == 1) {
-            $('.buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show();
+            $('.buttonsToolbar').find('.act-single').fadeIn('slow').end().find('.act-multiple').fadeIn('slow');
 
             // Can be executed by the owner ?
             var rowData = tableElem.dataTable().fnGetData(selectedRows[0]);
@@ -202,7 +201,7 @@ function updateStatusToolbar() {
                 $(".buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide();
             }
         } else {
-            $(".buttonsToolbar .act-multiple").show();
+            $(".buttonsToolbar .act-multiple").fadeIn('slow');
         }
     }
 }
@@ -254,8 +253,23 @@ function updateStarred(spanElem) {
 
 function callbackOnTableInit() {
     // Register starred events ...
-    $('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function () {
+    $('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function (event) {
         updateStarred(this);
+        event.stopPropagation();
+    });
+
+    $("#mindmapListTable tbody tr").click(
+        function(event) {
+            var target = $(event.target);
+            if (!target.is('.closeTag')){
+                if (!target.parent().is('.closeTag')) {
+                    var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
+                    window.open(baseUrl + 'c/maps/' + $(this).find('.mindmapName').attr('value') + '/edit' , '_self');
+                }
+            }
+    });
+    $('input:checkbox').click(function(event) {
+        event.stopPropagation();
     });
     updateStatusToolbar();
 }
@@ -286,10 +300,15 @@ $(function () {
                 postUpdate: function(data, id) {
                     createLabelItem(data, id);
                     if (mapIds.length > 0) {
-                        linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color});
+                        linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color, icon: data.icon});
                     }
                 }
             });
+            // Setting sizes to label icon list
+            var dropDownHeight = $(window).height()/3;
+            $("#labelIconItems ul").height(dropDownHeight);
+            var dropDownWidth = $(window).width()/3;
+            $("#labelIconItems ul").width(dropDownWidth);
         }
     );
 
@@ -466,18 +485,17 @@ $(function () {
                 var dataTable = $('#mindmapListTable').dataTable();
                 //remove the selected tag...
                 $("#foldersContainer li.active").remove();
-                //find the second li... (all)
-                $("#foldersContainer li:nth-child(2)").addClass("active");
+                $("#foldersContainer li:first").addClass("active");
                 $('#foldersContainer .active i').addClass('icon-white');
-                $("#foldersContainer li:nth-child(2)").animate({left: '+=8px'}, 'fast');
+                $("#foldersContainer li:first").animate({left: '+=8px'}, 'fast');
                 dataTable.fnReloadAjax("c/restful/maps/?q=all", callbackOnTableInit, true);
             }
         })
     });
 
-    $(document).on('click', ".closeTag", function() {
+    $(document).on('click', ".closeTag", function(event) {
         var me = $(this);
-        var mindmapId = me.parents("td").find("a").attr("value");
+        var mindmapId = me.parents("td").find(".mindmapName").attr("value");
         var data = {
             id: me.attr("value"),
             title: me.attr("name"),
@@ -510,7 +528,35 @@ $(function () {
                 }
             }
         });
-    })
+
+        //setting max heigth to ul filters...
+        var maxHeight = $("#map-table").height() - 20;
+         $("#foldersContainer ul").css('overflow-y', 'scrollbar');
+         $("#foldersContainer ul").css('overflow-x', 'hidden');
+         $("#foldersContainer ul").height(maxHeight);
+
+    });
+
+    //init popovers...
+    var icons = $(".bs-glyphicons-list li");
+    icons.each(function() {
+        $(this).popover({
+            animation: true,
+            placement: "auto",
+            trigger: 'hover',
+            //FIXME: Which is the best way to use messages.properties here?
+            content: ($(this).attr('class').replace('glyphicon glyphicon-',''))
+        })
+    });
+
+    icons.on("click", function(){
+        var defaultIcon = $("#defaultIcon");
+        //remove current icon
+        defaultIcon.find("i").remove();
+        var myClass = $(this).attr("class");
+        defaultIcon.prepend("<i class='" + myClass +"'></i>");
+        defaultIcon.closest("#iconGroup").find('input').val(myClass);
+    });
 });
 
 /*--------------------------------------------- Label actions --------------------------------------------------**/
@@ -519,7 +565,7 @@ function createLabelItem(data, id) {
     var labelItem = $("<li data-filter=\""  + data.title  + "\">");
     labelItem.append(
         "<a href=\"#\"> " +
-            "<i class=\"icon-tag labelIcon\"></i>" +
+            "<i class=\"" + data.iconName + " labelIcon\"></i>" +
             "<div class='labelColor' style='background: " +  data.color + "'></div>" +
             "<div class='labelName labelNameList'>" + data.title + "</div>" +
             "<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
@@ -590,9 +636,10 @@ function prepareLabelList(labels) {
     //append items to dropdown
     $.each(labels, function(index, value) {
         labelList.append(
-            $('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color)
+            $('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon)
                 .append(
                     '<a href="#" onclick="return false">' +
+                        "<div class='labelIcon " + value.iconName + "'></div>" +
                         "<div class='labelColor' style='background: " +  value.color + "'></div>" +
                         "<div class='labelName'>" + value.title + "</div>" +
                         '</a>')
@@ -624,13 +671,9 @@ function linkLabelToMindmap(mapIds, label) {
 }
 
 //animations...
-$(document).on('mouseenter', '#foldersContainer li[class!="nav-header"]', function (event) {
+$(document).on('click', '#foldersContainer li[class!="nav-header"]', function (event) {
     if ($(this).attr('class') != 'active') {
         $(this).animate({left: '+=8px'}, 'fast');
     }
 });
 
-$(document).on('mouseleave', '#foldersContainer li[class!="active"][class!="nav-header"]', function (event) {
-    $(this).animate({left: '-=8px'}, 'fast');
-});
-

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

@@ -8,62 +8,78 @@
             <li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li>
         </c:if>
         <li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li>
-        <li><a href="#deleteAccountPanel" data-toggle="pill"><spring:message code="DELETE__ACCOUNT"/></a></li>
+        <c:if test="${principal.databaseSchema}">
+            <li><a href="#deleteAccountPanel" data-toggle="pill"><spring:message code="DELETE__ACCOUNT"/></a></li>
+        </c:if>
     </ul>
 
     <div class="tab-content" style="padding-top:15px;">
         <div class="tab-pane fade ${principal.databaseSchema?'active in':''}" id="changeUserPanel">
-            <div id="changeInfoMsg" class="alert">
-            </div>
+            <div id="changeInfoMsg" class="alert"></div>
             <form action="#" method="POST" id="changeUserForm" class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="email" class="col-sm-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label>
-                        <div class="col-sm-8">
-                            <input type="text" name="password" id="email" required="required" class="form-control" readonly="readonly" value="${user.email}"/>
+                        <label for="email" class="col-md-3 control-label"><strong><spring:message
+                                code="EMAIL"/>:</strong></label>
+
+                        <div class="col-md-8">
+                            <input type="text" name="password" id="email" required="required" class="form-control"
+                                   readonly="readonly" value="${user.email}"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="firstname" class="col-sm-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
-                        <div class="col-sm-8">
-                            <input type="text" name="firstname" id="firstname" required="required" class="form-control" value="${user.firstname}"/>
-                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="lastname" class="col-sm-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label>
-                        <div class="col-sm-8">
-                            <input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/>
+                        <label for="firstname" class="col-md-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
+
+                        <div class="col-md-8">
+                            <input type="text" name="firstname" id="firstname" required="required" class="form-control"
+                                   value="${user.firstname}"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
-                            <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
-                        <div>
+                        <label for="lastname" class="col-md-3 control-label"><strong><spring:message
+                                code="LASTNAME"/>:</strong></label>
+
+                        <div class="col-md-8">
+                            <input type="text" name="lastname" id="lastname" required="required" class="form-control"
+                                   value="${user.lastname}"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-offset-8 col-md-2">
+                            <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control"
+                                   value="<spring:message code="SAVE_CHANGES"/>"/>
+                        </div>
                     </div>
                 </fieldset>
             </form>
-
         </div>
         <div class="tab-pane fade" id="changePasswordPanel">
             <div id="changePasswordMsg" class="alert">
             </div>
-            <form action="#" method="POST" id="changePasswordForm"  class="form-horizontal">
+            <form action="#" method="POST" id="changePasswordForm" class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="password" class="col-sm-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
-                        <div class="col-sm-8">
-                            <input type="password" name="password" id="password" required="required" class="form-control"/>
+                        <label for="password" class="col-md-3 control-label"><strong><spring:message
+                                code="NEW_PASSWORD"/>:</strong></label>
+
+                        <div class="col-md-8">
+                            <input type="password" name="password" id="password" required="required"
+                                   class="form-control"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="repassword" class="col-sm-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
-                        <div class="col-sm-8">
-                            <input type="password" name="password" id="repassword" required="required" class="form-control"/>
+                        <label for="repassword" class="col-md-3 control-label"><strong><spring:message
+                                code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
+
+                        <div class="col-md-8">
+                            <input type="password" name="password" id="repassword" required="required"
+                                   class="form-control"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
-                            <input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/>
+                        <div class="col-md-offset-8 col-md-2">
+                            <input type="submit" id="changePasswordBtn" class="btn btn-primary"
+                                   value="<spring:message code="CHANGE_PASSWORD"/>"/>
                         </div>
                     </div>
                 </fieldset>
@@ -74,49 +90,56 @@
             </div>
             <form action="#" method="POST" id="languageForm" class="form-horizontal">
                 <div class="form-group">
-                    <label for="language" class="col-sm-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label>
-                    <div class="col-sm-8">
-                    <select name="language" id="language" class="form-control">
-                        <option value="en">English</option>
-                        <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
-                            español
-                        </option>
-                        <option value="fr" <c:if test="${user.locale=='fr'}">selected="selected" </c:if>>French -
-                            français
-                        </option>
-                        <option value="de" <c:if test="${user.locale=='de'}">selected="selected" </c:if>>German -
-                            Deutsch
-                        </option>
-                        <option value="it" <c:if test="${user.locale=='it'}">selected="selected" </c:if>>Italian -
-                            italiano
-                        </option>
-                        <option value="pt_BR" <c:if test="${user.locale=='pt_BR'}">selected="selected" </c:if>>
-                            Portuguese
-                            (Brazil) - português (Brasil)
-                        </option>
-                        <option value="zh_CN" <c:if test="${user.locale=='zh_CN'}">selected="selected" </c:if>>Chinese
-                            (Simplified Han) - 中文（简体中文）
-                        </option>
-                        <option value="zh_TW" <c:if test="${user.locale=='zh_TW'}">selected="selected" </c:if>>Chinese
-                            (Traditional Han) - 中文 (繁體中文)
-                        </option>
-                        <option value="ca" <c:if test="${user.locale=='ca'}">selected="selected" </c:if>>Catalan -
-                            català
-                        </option>
-                    </select></div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
-                            <input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/>
-                        </div>
+                    <label for="language" class="col-md-3 control-label"><strong><spring:message
+                            code="LANGUAGE"/>:</strong></label>
+                    <div class="col-md-8">
+                        <select name="language" id="language" class="form-control">
+                            <option value="en">English</option>
+                            <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
+                                español
+                            </option>
+                            <option value="fr" <c:if test="${user.locale=='fr'}">selected="selected" </c:if>>French -
+                                français
+                            </option>
+                            <option value="de" <c:if test="${user.locale=='de'}">selected="selected" </c:if>>German -
+                                Deutsch
+                            </option>
+                            <option value="it" <c:if test="${user.locale=='it'}">selected="selected" </c:if>>Italian -
+                                italiano
+                            </option>
+                            <option value="pt_BR" <c:if test="${user.locale=='pt_BR'}">selected="selected" </c:if>>
+                                Portuguese
+                                (Brazil) - português (Brasil)
+                            </option>
+                            <option value="zh_CN" <c:if test="${user.locale=='zh_CN'}">selected="selected" </c:if>>
+                                Chinese
+                                (Simplified Han) - 中文（简体中文）
+                            </option>
+                            <option value="zh_TW" <c:if test="${user.locale=='zh_TW'}">selected="selected" </c:if>>
+                                Chinese
+                                (Traditional Han) - 中文 (繁體中文)
+                            </option>
+                            <option value="ca" <c:if test="${user.locale=='ca'}">selected="selected" </c:if>>Catalan -
+                                català
+                            </option>
+                        </select></div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-offset-8 col-md-2">
+                        <input type="submit" id="changeLanguageBtn" class="btn btn-primary"
+                               value="<spring:message code="CHANGE_LANGUAGE"/>"/>
                     </div>
+                </div>
             </form>
         </div>
         <div class="tab-pane fade" id="deleteAccountPanel">
-            <div id="deleteAccountMsg" class="alert alert-danger" style="display: block;"><spring:message code="WARNING_DELETE_USER"/></div>
+            <div id="deleteAccountMsg" class="alert alert-danger" style="display: block;"><spring:message
+                    code="WARNING_DELETE_USER"/></div>
             <form action="#" method="POST" id="deleteAccountForm">
                 <div class="form-group" style="text-align:right">
-                     <input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>   <input type="submit" id="deleteAccountBtn" class="btn btn-primary" value="<spring:message code="DELETE__ACCOUNT"/>"/>
+                    <input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>
+                    <input type="submit" id="deleteAccountBtn" class="btn btn-primary"
+                           value="<spring:message code="DELETE__ACCOUNT"/>"/>
                 </div>
             </form>
         </div>
@@ -157,11 +180,11 @@
             postChange(
                     "c/restful/account/password",
                     inputVal,
-                    function() {
+                    function () {
                         changePasswordMsg.removeClass('alert-danger').addClass('alert-info').show();
                         changePasswordMsg.text('<spring:message code="CHANGE_PASSWORD_SUCCESS"/>');
                     },
-                    function(textStatus) {
+                    function (textStatus) {
                         changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show();
                         changePasswordMsg.text(textStatus);
                     }
@@ -177,12 +200,12 @@
         postChange(
                 "c/restful/account/firstname",
                 firstname,
-                function() {
+                function () {
                     var changeInfoMsg = $('#changeInfoMsg');
                     changeInfoMsg.removeClass('alert-error').addClass('alert-info').show();
                     changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
                 },
-                function(textStatus) {
+                function (textStatus) {
                     changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
                     changeInfoMsg.text(textStatus);
                 }
@@ -190,11 +213,11 @@
         postChange(
                 "c/restful/account/lastname",
                 lastname,
-                function() {
+                function () {
                     changeInfoMsg.removeClass('alert-danger').addClass('alert-info').show();
                     changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
                 },
-                function(textStatus) {
+                function (textStatus) {
                     changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
                     changeInfoMsg.text(textStatus);
                 }
@@ -209,11 +232,11 @@
         postChange(
                 "c/restful/account/locale",
                 locale,
-                function() {
+                function () {
                     languageMsg.removeClass('alert-danger').addClass('alert-info').show();
                     languageMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
                 },
-                function(textStatus) {
+                function (textStatus) {
                     languageMsg.removeClass('alert-info').addClass('alert-danger').show();
                     languageMsg.text(textStatus);
                 }
@@ -226,10 +249,10 @@
         postChange(
                 "c/restful/account",
                 locale,
-                function() {
+                function () {
                     window.location.href = "/c/logout"
                 },
-                function(textStatus) {
+                function (textStatus) {
                     var deleteAccountMsg = $('#deleteAccountMsg');
                     deleteAccountMsg.removeClass('alert-info').addClass('alert-danger').show();
                     deleteAccountMsg.text(textStatus);

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

@@ -21,14 +21,15 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
     <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
-    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
-    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
-    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>
+    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
+
     <script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
     <script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script>
+    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
+    <link rel="stylesheet" type="text/css" href="css/pageHeaders.css"/>
 
 <body>
-<div style="padding-top:20px">
+<div style="padding:10px">
     <tiles:insertAttribute name="body"/>
 </div>
 </body>

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

@@ -1,39 +1,48 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <div id="footerContainer" class="row">
-    <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
-    <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
+    <script type="text/javascript"
+            src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
+    <script type="text/javascript"
+            src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
 
     <script type="text/javascript">
-     window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
-        "a47981d6": {
-            triggerFunction:  function(showCollectorDialog) {
-                //Requries that jQuery is available!
-                jQuery("#feedbackBtn").click(function(e) {
-                    e.preventDefault();
-                    showCollectorDialog();
-                });
-             }
-        },
-        "703b9822":{
-            triggerFunction: function(showCollectorDialog) {
-                //Requries that jQuery is available!
-                jQuery("#reportIssueBtn").click(function(e) {
-                    e.preventDefault();
-                    showCollectorDialog();
-                });
+        window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
+            "a47981d6": {
+                triggerFunction: function (showCollectorDialog) {
+                    //Requries that jQuery is available!
+                    jQuery("#feedbackBtn").click(function (e) {
+                        e.preventDefault();
+                        showCollectorDialog();
+                    });
+                }
+            },
+            "703b9822": {
+                triggerFunction: function (showCollectorDialog) {
+                    //Requries that jQuery is available!
+                    jQuery("#reportIssueBtn").click(function (e) {
+                        e.preventDefault();
+                        showCollectorDialog();
+                    });
+                }
             }
-        }
-     });
+        });
     </script>
 
     <div class="col-md-1 col-md-offset-2">
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
-        <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+        <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com"
+           data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
+        <script>!function (d, s, id) {
+            var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https';
+            if (!d.getElementById(id)) {
+                js = d.createElement(s);
+                js.id = id;
+                js.src = p + '://platform.twitter.com/widgets.js';
+                fjs.parentNode.insertBefore(js, fjs);
+            }
+        }(document, 'script', 'twitter-wjs');</script>
     </div>
-
     <div class="col-md-1">
-
         <!-- Place this tag where you want the +1 button to render. -->
         <div class="g-plusone" data-href="http://www.wisemapping.com"></div>
 
@@ -49,15 +58,13 @@
             })();
         </script>
     </div>
-    <div class="col-md-4">
-        <p style="text-align: center;">
-            <a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
-            <a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
-            <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
-            <a href="https://wisemapping.atlassian.net/wiki/display/WS/License  "><spring:message code="LICENSE"/></a><br/>
-            <a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
-        </p>
-
+    <div class="col-md-4" style="text-align: center">
+        <a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
+        <a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
+        <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
+        <a href="https://wisemapping.atlassian.net/wiki/display/WS/License  "><spring:message
+                code="LICENSE"/></a><br/>
+        <a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
     </div>
     <div class="col-md-1">
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post">

wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf

@@ -1,19 +1,15 @@
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <c:if test="${requestScope['google.analytics.enabled']}">
-    <script type="text/javascript">
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', '${requestScope['google.analytics.account']}']);
-        _gaq.push(['_setDomainName', 'wisemapping.com']);
-        _gaq.push(['_trackPageview']);
 
-        (function () {
-            var ga = document.createElement('script');
-            ga.type = 'text/javascript';
-            ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0];
-            s.parentNode.insertBefore(ga, s);
-        })();
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', '${requestScope['google.analytics.account']}', 'wisemapping.com');
+      ga('send', 'pageview');
+
     </script>
 </c:if>

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

@@ -26,6 +26,7 @@
                 var svgXml = context.method == "POST" ? window.document.getElementById('workspaceContainer').innerHTML : "";
                 $('svgXml').setAttribute('value', svgXml);
                 $('download').setAttribute('value', context.formatType);
+                $('version').setAttribute('value', context.version);
                 iframeForm.submit();
             }
             if (MooDialog.Request.active) {
@@ -44,4 +45,5 @@
       enctype="application/x-www-form-urlencoded" id="iframeExportForm">
     <input name="svgXml" id="svgXml" value="" type="hidden"/>
     <input name="download" id="download" type="hidden" value="mm"/>
+    <input name="version" id="version" type="hidden" value=""/>
 </form>

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

@@ -0,0 +1,132 @@
+<%@page pageEncoding="UTF-8" %>
+
+<ul class="bs-glyphicons-list">
+    <li class="glyphicon glyphicon-asterisk"></li>
+    <li class="glyphicon glyphicon-plus"></li>
+    <li class="glyphicon glyphicon-euro"></li>
+    <li class="glyphicon glyphicon-minus"></li>
+    <li class="glyphicon glyphicon-cloud"></li>
+    <li class="glyphicon glyphicon-envelope"></li>
+    <li class="glyphicon glyphicon-pencil"></li>
+    <li class="glyphicon glyphicon-glass"></li>
+    <li class="glyphicon glyphicon-music"></li>
+    <li class="glyphicon glyphicon-search"></li>
+    <li class="glyphicon glyphicon-heart"></li>
+    <li class="glyphicon glyphicon-star"></li>
+    <li class="glyphicon glyphicon-star-empty"></li>
+    <li class="glyphicon glyphicon-user"></li>
+    <li class="glyphicon glyphicon-film"></li>
+    <li class="glyphicon glyphicon-ok"></li>
+    <li class="glyphicon glyphicon-remove"></li>
+    <li class="glyphicon glyphicon-signal"></li>
+    <li class="glyphicon glyphicon-cog"></li>
+    <li class="glyphicon glyphicon-trash"></li>
+    <li class="glyphicon glyphicon-home"></li>
+    <li class="glyphicon glyphicon-file"></li>
+    <li class="glyphicon glyphicon-time"></li>
+    <li class="glyphicon glyphicon-download-alt"></li>
+    <li class="glyphicon glyphicon-download"></li>
+    <li class="glyphicon glyphicon-upload"></li>
+    <li class="glyphicon glyphicon-inbox"></li>
+    <li class="glyphicon glyphicon-repeat"></li>
+    <li class="glyphicon glyphicon-refresh"></li>
+    <li class="glyphicon glyphicon-list-alt"></li>
+    <li class="glyphicon glyphicon-lock"></li>
+    <li class="glyphicon glyphicon-flag"></li>
+    <li class="glyphicon glyphicon-headphones"></li>
+    <li class="glyphicon glyphicon-qrcode"></li>
+    <li class="glyphicon glyphicon-barcode"></li>
+    <li class="glyphicon glyphicon-tag"></li>
+    <li class="glyphicon glyphicon-tags"></li>
+    <li class="glyphicon glyphicon-book"></li>
+    <li class="glyphicon glyphicon-bookmark"></li>
+    <li class="glyphicon glyphicon-print"></li>
+    <li class="glyphicon glyphicon-camera"></li>
+    <li class="glyphicon glyphicon-list"></li>
+    <li class="glyphicon glyphicon-facetime-video"></li>
+    <li class="glyphicon glyphicon-picture"></li>
+    <li class="glyphicon glyphicon-map-marker"></li>
+    <li class="glyphicon glyphicon-adjust"></li>
+    <li class="glyphicon glyphicon-tint"></li>
+    <li class="glyphicon glyphicon-edit"></li>
+    <li class="glyphicon glyphicon-share"></li>
+    <li class="glyphicon glyphicon-check"></li>
+    <li class="glyphicon glyphicon-chevron-left"></li>
+    <li class="glyphicon glyphicon-chevron-right"></li>
+    <li class="glyphicon glyphicon-plus-sign"></li>
+    <li class="glyphicon glyphicon-minus-sign"></li>
+    <li class="glyphicon glyphicon-remove-sign"></li>
+    <li class="glyphicon glyphicon-ok-sign"></li>
+    <li class="glyphicon glyphicon-question-sign"></li>
+    <li class="glyphicon glyphicon-info-sign"></li>
+    <li class="glyphicon glyphicon-screenshot"></li>
+    <li class="glyphicon glyphicon-remove-circle"></li>
+    <li class="glyphicon glyphicon-ok-circle"></li>
+    <li class="glyphicon glyphicon-ban-circle"></li>
+    <li class="glyphicon glyphicon-arrow-left"></li>
+    <li class="glyphicon glyphicon-arrow-right"></li>
+    <li class="glyphicon glyphicon-arrow-up"></li>
+    <li class="glyphicon glyphicon-arrow-down"></li>
+    <li class="glyphicon glyphicon-share-alt"></li>
+    <li class="glyphicon glyphicon-exclamation-sign"></li>
+    <li class="glyphicon glyphicon-gift"></li>
+    <li class="glyphicon glyphicon-leaf"></li>
+    <li class="glyphicon glyphicon-fire"></li>
+    <li class="glyphicon glyphicon-eye-open"></li>
+    <li class="glyphicon glyphicon-eye-close"></li>
+    <li class="glyphicon glyphicon-warning-sign"></li>
+    <li class="glyphicon glyphicon-plane"></li>
+    <li class="glyphicon glyphicon-calendar"></li>
+    <li class="glyphicon glyphicon-random"></li>
+    <li class="glyphicon glyphicon-comment"></li>
+    <li class="glyphicon glyphicon-magnet"></li>
+    <li class="glyphicon glyphicon-chevron-up"></li>
+    <li class="glyphicon glyphicon-chevron-down"></li>
+    <li class="glyphicon glyphicon-shopping-cart"></li>
+    <li class="glyphicon glyphicon-folder-close"></li>
+    <li class="glyphicon glyphicon-folder-open"></li>
+    <li class="glyphicon glyphicon-hdd"></li>
+    <li class="glyphicon glyphicon-bullhorn"></li>
+    <li class="glyphicon glyphicon-bell"></li>
+    <li class="glyphicon glyphicon-certificate"></li>
+    <li class="glyphicon glyphicon-thumbs-up"></li>
+    <li class="glyphicon glyphicon-thumbs-down"></li>
+    <li class="glyphicon glyphicon-hand-right"></li>
+    <li class="glyphicon glyphicon-hand-left"></li>
+    <li class="glyphicon glyphicon-hand-up"></li>
+    <li class="glyphicon glyphicon-hand-down"></li>
+    <li class="glyphicon glyphicon-circle-arrow-right"></li>
+    <li class="glyphicon glyphicon-circle-arrow-left"></li>
+    <li class="glyphicon glyphicon-circle-arrow-up"></li>
+    <li class="glyphicon glyphicon-circle-arrow-down"></li>
+    <li class="glyphicon glyphicon-globe"></li>
+    <li class="glyphicon glyphicon-wrench"></li>
+    <li class="glyphicon glyphicon-tasks"></li>
+    <li class="glyphicon glyphicon-filter"></li>
+    <li class="glyphicon glyphicon-briefcase"></li>
+    <li class="glyphicon glyphicon-paperclip"></li>
+    <li class="glyphicon glyphicon-heart-empty"></li>
+    <li class="glyphicon glyphicon-link"></li>
+    <li class="glyphicon glyphicon-phone"></li>
+    <li class="glyphicon glyphicon-pushpin"></li>
+    <li class="glyphicon glyphicon-usd"></li>
+    <li class="glyphicon glyphicon-gbp"></li>
+    <li class="glyphicon glyphicon-unchecked"></li>
+    <li class="glyphicon glyphicon-flash"></li>
+    <li class="glyphicon glyphicon-record"></li>
+    <li class="glyphicon glyphicon-saved"></li>
+    <li class="glyphicon glyphicon-send"></li>
+    <li class="glyphicon glyphicon-floppy-disk"></li>
+    <li class="glyphicon glyphicon-transfer"></li>
+    <li class="glyphicon glyphicon-cutlery"></li>
+    <li class="glyphicon glyphicon-header"></li>
+    <li class="glyphicon glyphicon-compressed"></li>
+    <li class="glyphicon glyphicon-earphone"></li>
+    <li class="glyphicon glyphicon-phone-alt"></li>
+    <li class="glyphicon glyphicon-tower"></li>
+    <li class="glyphicon glyphicon-stats"></li>
+    <li class="glyphicon glyphicon-copyright-mark"></li>
+    <li class="glyphicon glyphicon-registration-mark"></li>
+    <li class="glyphicon glyphicon-cloud-download"></li>
+    <li class="glyphicon glyphicon-cloud-upload"></li>
+</ul>

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

@@ -12,54 +12,63 @@
     });
 </script>
 
-<div class="row">
-    <div class="col-md-5" style="margin-top: 20px">
+<div class="row" id="login">
+    <div class="col-md-6" style="padding-top: 25px">
         <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
         <spring:message code="WELCOME_DETAILS"/>
     </div>
-    <div id="login" class="fform col-md-6">
-        <h1><spring:message code="SIGN_IN"/></h1>
+    <div class="col-md-6">
+        <div class="row jumbotron" id="loginPanel">
+            <h1><spring:message code="SIGN_IN"/></h1>
 
-        <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label>
-                <div class="col-md-10">
-                    <input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
+            <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal"
+                  id="loginForm">
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="email"><spring:message code="EMAIL"/>: </label>
+
+                    <div class="col-md-9">
+                        <input type='email' tabindex="1" id="email" name='j_username' required="required"
+                               class="form-control"/>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
-                <div class="col-md-10">
-                    <input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="password"><spring:message code="PASSWORD"/>: </label>
+
+                    <div class="col-md-9">
+                        <input type='password' tabindex="2" id="password" name='j_password' required="required"
+                               class="form-control"/>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" style="text-align: center" >
-                <div class="col-md-offset-2 col-md-10" style="text-align: center" >
-                    <button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button>
-                    <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>  <label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
+                <div class="form-group" style="text-align: center">
+                    <div class="col-md-offset-2 col-md-10" style="text-align: center">
+                        <button class="btn btn-primary" tabindex="4"
+                                data-loading-text="<spring:message code="SIGN_ING"/>">
+                            <spring:message code="SIGN_IN"/></button>
+                        <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label
+                            for="rememberme"><spring:message code="REMEMBER_ME"/></label>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" style="text-align: center" >
-                <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
-            </div>
-            <div class="form-group">
-                <c:if test="${not empty param.login_error}">
-                    <c:choose>
-                        <c:when test="${param.login_error == 3}">
-                            <div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
-                        </c:when>
-                        <c:otherwise>
-                            <div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
-                        </c:otherwise>
-                    </c:choose>
-                </c:if>
-            </div>
-        </form>
+                <div class="form-group" style="text-align: center">
+                    <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
+                </div>
+                <div class="form-group">
+                    <c:if test="${not empty param.login_error}">
+                        <c:choose>
+                            <c:when test="${param.login_error == 3}">
+                                <div class="alert alert-warning"><spring:message code="USER_INACTIVE"/></div>
+                            </c:when>
+                            <c:otherwise>
+                                <div class="alert alert-warning"><spring:message code="LOGIN_ERROR"/></div>
+                            </c:otherwise>
+                        </c:choose>
+                    </c:if>
+                </div>
+            </form>
+        </div>
     </div>
 </div>
-
 <div class="row">
-    <div id="register" class="col-md-10">
+    <div id="register" class="col-md-12">
         <c:if test="${requestScope['security.type']=='db'}">
             <b><spring:message code="NOT_READY_A_USER"/></b>
             <spring:message code="NOT_READY_A_USER_MESSAGE"/>
@@ -69,7 +78,8 @@
         </c:if>
         <c:if test="${requestScope['security.openid.enabled']}">
             <p>
-                <spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message code="HERE"/></b></a>.
+                <spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message
+                    code="HERE"/></b></a>.
             </p>
         </c:if>
     </div>
@@ -81,7 +91,8 @@
         <div class="alert alert-info col-md-offset12">
             <span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
                 code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
-                href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message code="HERE"/></a>.
+                href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message
+                code="HERE"/></a>.
         </div>
     </div>
 </c:if>

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

@@ -10,11 +10,17 @@
           enctype="application/x-www-form-urlencoded" id="dialogMainForm">
         <input name="svgXml" id="svgXml" value="" type="hidden"/>
         <input name="download" type="hidden" value="mm"/>
+        <input name="version" type="hidden" value=""/>
         <fieldset>
 
             <label for="freemind">
-                <input type="radio" id="freemind" name="exportFormat" value="mm" checked="checked"/>
+                <input type="radio" id="freemind" name="exportFormat" value="mm" version="1.0.1" checked="checked"/>
                 <strong><spring:message code="FREEMIND_EXPORT_FORMAT"/></strong><br/>
+            </label>
+
+            <label for="freemind09">
+                <input type="radio" id="freemind09" name="exportFormat" value="mm" version="0.9.0"/>
+                <strong><spring:message code="FREEMIND_EXPORT_FORMAT_09"/></strong><br/>
                 <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
             </label>
 
@@ -33,7 +39,7 @@
             <label for="svg">
                 <input type="radio" id="svg" name="exportFormat" value="svg"/>
                 <strong><spring:message code="SVG_EXPORT_FORMAT"/></strong><br/>
-                <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+                <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/><br/>
             </label>
 
             <label for="pdf">
@@ -51,7 +57,7 @@
                     <option value='png'>PNG</option>
                     <option value='jpg'>JPEG</option>
                 </select>
-            </label>
+            </label><br/>
 
             <label for="txt">
                 <input type="radio" name="exportFormat" value="txt" id="txt"/>
@@ -59,11 +65,11 @@
                 <spring:message code="TXT_EXPORT_FORMAT_DETAILS"/>
             </label>
 
-            <label for="xls">
+            </br><label for="xls">
                 <input type="radio" name="exportFormat" value="xls" id="xls"/>
                 <strong><spring:message code="XLS_EXPORT_FORMAT"/></strong><br/>
                 <spring:message code="XLS_EXPORT_FORMAT_DETAILS"/>
-            </label>
+            </label><br/>
 
             <label for="odt">
                 <input type="radio" name="exportFormat" value="odt" id="odt"/>
@@ -87,7 +93,7 @@
     // No way to obtain map svg. Hide panels..
     if (window.location.pathname.indexOf('exportf') != -1) {
         $('#exportInfo').hide();
-        $('#freemind,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) {
+        $('#freemind,#freemind09,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) {
             $('#imgFormat').hide();
         });
 
@@ -103,7 +109,6 @@
         // If the map is opened, use the latest model ...
         var formatType = $('#dialogMainForm input:checked').attr('value');
         var form = $('#dialogMainForm');
-
         // Restore default ..
         form.attr('action', 'c/restful/maps/${mindmap.id}.' + formatType);
 
@@ -123,6 +128,11 @@
 
         }
 
+        var version = $('#dialogMainForm input:checked').attr('version');
+        if (version) {
+            $('#dialogMainForm input[name=version]').attr('value', version);
+        }
+
         $('#dialogMainForm input[name=download]').attr('value', formatType);
         if (!differ) {
             form.submit();
@@ -131,7 +141,7 @@
         // Close dialog ...
         $('#export-dialog-modal').modal('hide');
 
-        return {"action":form.attr('action'), "method":form.attr('method'), formatType:formatType};
+        return {"action":form.attr('action'), "method":form.attr('method'), "formatType":formatType, "version": version};
     }
 
 </script>

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

@@ -9,23 +9,23 @@
         <div class="errorMessage"></div>
         <fieldset>
             <div class="form-group">
-                <label for="mapFile" class="control-label col-sm-2 "><spring:message code="MIND_FILE"/>: </label>
-                <div class="col-sm-10">
+                <label for="mapFile" class="control-label col-md-2 "><spring:message code="MIND_FILE"/>: </label>
+                <div class="col-md-10">
                     <input type="file" name="file" id="mapFile" required="required" class="form-control"/>
                 </div>
             </div>
             <div class="form-group">
-                <label for="title" class="control-label col-sm-2 "><spring:message code="NAME"/>: </label>
-                <div class="col-sm-10">
+                <label for="title" class="control-label col-md-2 "><spring:message code="NAME"/>: </label>
+                <div class="col-md-10">
                    <input type="text" id="title" name="title" required="required"
                            placeholder="<spring:message code="MAP_NAME_HINT"/>"
                            class="form-control" maxlength="255"/>
                 </div>
             </div>
             <div class="form-group">
-                <label for="description" class="control-label col-sm-2"><spring:message code="DESCRIPTION"/>: </label>
-                <div class="col-sm-10">
-                    <textarea type="text" name="description" id="description"
+                <label for="description" class="control-label col-md-2"><spring:message code="DESCRIPTION"/>: </label>
+                <div class="col-md-10">
+                    <textarea name="description" id="description"
                           placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea>
                 </div>
             </div>
@@ -46,12 +46,46 @@
 
     $('#dialogMainForm').submit(function (event) {
         // Load form parameters ...
-        var title = $('#dialogMainForm #title').attr('value');
+        var title = $('#dialogMainForm #title').val();
         title = title == undefined ? "" : title;
 
-        var description = $('#dialogMainForm #description').attr('value');
+        var description = $('#dialogMainForm #description').val();
         description = description == undefined ? "" : description;
 
+        var onSuccess = function (data, textStatus, jqXHR) {
+            var resourceId = data.getResponseHeader("ResourceId");
+            window.location = "c/maps/" + resourceId + "/edit";
+        };
+
+        var onError = function (jqXHR, textStatus, errorThrown) {
+            if (jqXHR.status == 400) {
+                var errors = JSON.parse(jqXHR.responseText);
+                // Mark fields with errors ...
+                var fieldErrors = errors.fieldErrors;
+                if (fieldErrors) {
+                    for (var fieldName in fieldErrors) {
+                        // Mark the field with errors ...
+                        var message = fieldErrors[fieldName];
+                        var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
+                        $("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
+                        inputField.parent().addClass('error');
+                    }
+                }
+                var globalErrors = errors.globalErrors;
+                if (globalErrors) {
+                    for (var error in globalErrors) {
+                        // Mark the field with errors ...
+                        $("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
+                        inputField.parent().addClass('error');
+                    }
+                }
+            } else {
+                console.log(errorThrown);
+                console.log(jqXHR);
+                $('#messagesPanel div').text(errorThrown).parent().show();
+            }
+        };
+
         // Save status on click ...
         jQuery.ajax("c/restful/maps?title=" + encodeURI(title) + "&description=" + encodeURI(description),
                 {
@@ -60,37 +94,10 @@
                     type:'POST',
                     dataType:'json',
                     contentType:contentType,
-                    success:function (data, textStatus, jqXHR) {
-                        var resourceId = jqXHR.getResponseHeader("ResourceId");
-                        window.location = "c/maps/" + resourceId + "/edit";
-                    },
-                    error:function (jqXHR, textStatus, errorThrown) {
-                        if (jqXHR.status == 400) {
-                            var errors = JSON.parse(jqXHR.responseText);
-                            // Mark fields with errors ...
-                            var fieldErrors = errors.fieldErrors;
-                            if (fieldErrors) {
-                                for (var fieldName in fieldErrors) {
-                                    // Mark the field with errors ...
-                                    var message = fieldErrors[fieldName];
-                                    var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
-                                    $("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
-                                    inputField.parent().addClass('error');
-                                }
-                            }
-                            var globalErrors = errors.globalErrors;
-                            if (globalErrors) {
-                                for (var error in globalErrors) {
-                                    // Mark the field with errors ...
-                                    $("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
-                                    inputField.parent().addClass('error');
-                                }
-                            }
-                        } else {
-                            console.log(errorThrown);
-                            console.log(jqXHR);
-                            $('#messagesPanel div').text(errorThrown).parent().show();
-                        }
+                    statusCode: {
+                        201: onSuccess,
+                        400: onError,
+                        default: onError
                     }
                 });
         event.preventDefault();

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

@@ -12,6 +12,7 @@
 <head>
     <base href="${requestScope['site.baseurl']}/">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="WiseMapping">
     <meta name="publisher" content="WiseMapping Open Source">
     <meta name="keywords"
@@ -41,7 +42,7 @@
     <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
 
-    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
+    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
     <script src="js/less.js" type="text/javascript"></script>
 </head>
 <body>
@@ -51,34 +52,44 @@
         <jsp:param name="removeSignin" value="${requestScope.removeSignin}"/>
     </jsp:include>
 
-    <div class="bodyContainer">
+    <div class="container">
         <div class="row">
-            <div class="col-md-2"></div>
-            <div class="pageBodyContent col-md-8">
-               <div class="row">
-                <tiles:insertAttribute name="body"/>
-               </div>
-            </div>
-            <c:if test="${requestScope['google.ads.enabled']}">
-                <div class="row" style="text-align: center;margin: 5px">
-                    <script type="text/javascript"><!--
-                    google_ad_client = "ca-pub-7564778578019285";
-                    /* WiseMapping Login */
-                    google_ad_slot = "2192653431";
-                    google_ad_width = 728;
-                    google_ad_height = 90;
-                    //-->
-                    </script>
-                    <script type="text/javascript"
-                            src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
-                    </script>
+            <div class="col-md-offset-1 col-md-10">
+                <div class="jumbotron" style="margin:40px 0 15px 0;padding: 10px 60px;">
+                    <tiles:insertAttribute name="body"/>
                 </div>
-            </c:if>
+            </div>
+            <div class="col-md-1" style="padding-top:25px">
+                <c:if test="${requestScope['google.ads.enabled']}">
+                    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+                    <!-- Wise: Lateral Image (Small) -->
+                    <ins class="adsbygoogle"
+                         style="display:inline-block;width:120px;height:240px"
+                         data-ad-client="ca-pub-7564778578019285"
+                         data-ad-slot="6751959325"></ins>
+                    <script>
+                    (adsbygoogle = window.adsbygoogle || []).push({});
+                    </script>
+                </c:if>
+            </div>
         </div>
+        <c:if test="${requestScope['google.ads.enabled']}">
+              <div class="row" style="text-align: center;">
+                <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+                <!-- Wise: Pages Footer  (All pages) -->
+                <ins class="adsbygoogle"
+                     style="display:inline-block;width:728px;height:90px"
+                     data-ad-client="ca-pub-7564778578019285"
+                     data-ad-slot="3798492923"></ins>
+                <script>
+                (adsbygoogle = window.adsbygoogle || []).push({});
+                </script>
+           </div>
+        </c:if>
     </div>
 
-    <jsp:include page="footer.jsp"/>
-</div>
+        <jsp:include page="footer.jsp"/>
+    </div>
 </body>
 </html>
 

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

@@ -9,29 +9,22 @@
     });
 </script>
 
-<div>
-    <div class="fform">
-        <h1>
-            <spring:message code="FORGOT_PASSWORD"/>
-        </h1>
+<h1>
+    <spring:message code="FORGOT_PASSWORD"/>
+</h1>
 
-        <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
+<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
 
-        <form:form method="post" commandName="resetPassword"  class="form-horizontal">
-            <fieldset>
-                <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
-                <div class="col-sm-5">
-                    <input id="email" type="email" required="required" name="email" class="form-control"/>
-                </div>
-                <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
-                       data-loading-text="<spring:message code="SENDING"/>"/>
-                <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
-                       onclick="window.location='<c:url value="c/maps/"/>'"/>
-            </fieldset>
-        </form:form>
-        </br>
+<form:form method="post" commandName="resetPassword" class="form-horizontal">
+    <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
+    <div class="col-md-5">
+        <input id="email" type="email" required="required" name="email" class="form-control"/>
     </div>
-</div>
+    <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
+           data-loading-text="<spring:message code="SENDING"/>"/>
+    <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
+           onclick="window.location='<c:url value="c/maps/"/>'"/>
+</form:form>
 
 <div id="register">
     <b>

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

@@ -1,79 +1,79 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="/jsp/init.jsp" %>
 
-<div class="fform" >
+<h1><spring:message code="USER_REGISTRATION"/></h1>
 
-    <h1><spring:message code="USER_REGISTRATION"/></h1>
+<p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
+<form:form method="post" commandName="user" class="form-horizontal">
+    <div class="form-group">
+        <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
+        <div class="col-md-5">
+            <form:input path="email" id="email" type="email" required="required" class="form-control"/>
+            <form:errors path="email" cssClass="errorMsg"/>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
 
-    <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
-    <form:form method="post" commandName="user" class="form-horizontal">
-    <fieldset>
-        <div class="form-group">
-            <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
-            <div class="col-sm-5">
-                <form:input path="email" id="email" type="email" required="required" class="form-control"/>
-                <form:errors path="email" cssClass="errorMsg"/>
-            </div>
+        <div class="col-md-5">
+            <form:input path="firstname" id="firstname" required="required" class="form-control"/>
+            <form:errors path="firstname" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="firstname" class="col-sm-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
-            <div class="col-sm-5">
-                <form:input path="firstname" id="firstname" required="required" class="form-control"/>
-                <form:errors path="firstname" cssClass="errorMsg"/>
-           </div>
+    </div>
+    <div class="form-group">
+        <label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
+
+        <div class="col-md-5">
+            <form:input path="lastname" id="lastname" required="required" class="form-control"/>
+            <form:errors path="lastname" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="lastname" class="col-sm-2 control-label"><spring:message code="LASTNAME"/>: </label>
-            <div class="col-sm-5">
-                <form:input path="lastname" id="lastname" required="required" class="form-control"/>
-                <form:errors path="lastname" cssClass="errorMsg"/>
-            </div>
+    </div>
+    <div class="form-group">
+        <label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
+
+        <div class="col-md-5">
+            <form:password path="password" id="password" required="required" class="form-control"/>
+            <form:errors path="password" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="password" class="col-sm-2 control-label"><spring:message code="PASSWORD"/>: </label>
-            <div class="col-sm-5">
-                <form:password path="password" id="password" required="required" class="form-control"/>
-                <form:errors path="password" cssClass="errorMsg"/>
-            </div>
+    </div>
+    <div class="form-group">
+        <label for="retypePassword" class="col-md-2 control-label"><spring:message
+                code="RETYPE_PASSWORD"/>: </label>
+
+        <div class="col-md-5">
+            <form:password path="retypePassword" id="retypePassword" class="form-control"/>
+            <form:errors path="retypePassword" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="retypePassword" class="col-sm-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label>
-            <div class="col-sm-5">
-                <form:password path="retypePassword" id="retypePassword" class="form-control"/>
-                <form:errors path="retypePassword" cssClass="errorMsg"/>
-           </div>
-        </div>
-        <div class="form-group">
-            <div class="col-sm-10 col-sm-offset-2">
-                <c:if test="${requestScope.captchaEnabled}">
-                    ${requestScope.captchaHtml}
+    </div>
+    <div class="form-group">
+        <div class="col-md-10 col-md-offset-2">
+            <c:if test="${requestScope.captchaEnabled}">
+                ${requestScope.captchaHtml}
                 <p>
                     <form:errors path="captcha" cssClass="errorMsg"/>
                 </p>
             </c:if>
-          </div>
         </div>
-        <div>
-            <p>
-                <spring:message code="TERM_OF_THE_SERVICE"/>
-                <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"
-                                                                        target="_blank"><spring:message
-                    code="HERE"/></a>.
-                <spring:message code="REGISTRATION_CLICK_ADVICE"/>
-            </p>
-        </div>
-        <div class="form-group">
-            <div class="col-sm-offset-2 col-sm-10">
+    </div>
+    <div class="form-group">
+        <p>
+            <spring:message code="TERM_OF_THE_SERVICE"/>
+            <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
+            <a href="c/termsOfUse" target="_blank"><spring:message code="HERE"/></a>.
+            <spring:message code="REGISTRATION_CLICK_ADVICE"/>
+        </p>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
             <input type="submit" value="<spring:message code="REGISTER"/>"
-               data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
-               class="btn btn-primary">
+                   data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
+                   class="btn btn-primary">
             <input type="button" value="<spring:message code="CANCEL"/>"
-               onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
-           <div>
-        <div>
-        </fieldset>
+                   onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
+
+        </div>
+    </div>
+</form:form>
 
-       </form:form>
-</div>
 
 

wise-webapp/src/test/java/com/wisemapping/test/importer/VersionComparisonTest.java

@@ -0,0 +1,29 @@
+package com.wisemapping.test.importer;
+
+import com.wisemapping.importer.ImporterException;
+import com.wisemapping.importer.VersionNumber;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Test
+public class VersionComparisonTest {
+
+    @Test
+    public void compareVersionTest() throws ImporterException {
+
+        final VersionNumber greatest = new VersionNumber("1.0.1");
+        final VersionNumber smaller = new VersionNumber("0.9.0");
+        final VersionNumber intermediate = new VersionNumber("1.0.0");
+
+        Assert.assertTrue(smaller.isSmallerThan(intermediate));
+        Assert.assertFalse(greatest.isSmallerThan(intermediate));
+
+        Assert.assertTrue(greatest.isGreaterThan(smaller));
+        Assert.assertFalse(intermediate.isGreaterThan(greatest));
+
+        Assert.assertTrue(intermediate.equals(intermediate));
+        Assert.assertFalse(greatest.equals(smaller));
+
+    }
+
+}

wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java

@@ -54,6 +54,9 @@ public class UserAgentTest {
 
         final SupportedUserAgent firefox20 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 6.1; WOW64; rv:20.0) Gecko/20121215 Firefox/20.0 AppEngine-Google; (+http://code.google.com/appengine; appid: slubuntuk)");
         Assert.assertEquals(firefox20.isBrowserSupported(), true);
+
+        final SupportedUserAgent firefox30 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0");
+        Assert.assertEquals(firefox30.isBrowserSupported(), true);
     }
 
 

wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java

@@ -18,6 +18,7 @@ public class RestHelper {
     public static final String HOST_PORT = "http://localhost:8080";
     public static final String BASE_REST_URL = HOST_PORT + "/service";
     public static final String ADMIN_CREDENTIALS = "admin@wisemapping.org" + ":" + "admin";
+    public static final String COLOR = "#000000";
 
     static HttpHeaders createHeaders(@NotNull MediaType mediaType) {
         List<MediaType> acceptableMediaTypes = new ArrayList<MediaType>();

wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelITCase.java

@@ -30,6 +30,7 @@ public class RestLabelITCase {
 
     private String userEmail;
     private static final String COLOR = "#000000";
+    private static final String ICON = "glyphicon glyphicon-tag";
 
     @BeforeClass
     void createUser() {
@@ -45,16 +46,16 @@ public class RestLabelITCase {
 
         // Create a new label
         final String title1 = "Label 1  - " + mediaType.toString();
-        addNewLabel(requestHeaders, template, title1, COLOR);
+        addNewLabel(requestHeaders, template, title1, COLOR, ICON);
 
         // Create a new label
         final String title2 = "Label 2  - " + mediaType.toString();
-        addNewLabel(requestHeaders, template, title2, COLOR);
+        addNewLabel(requestHeaders, template, title2, COLOR, ICON);
 
         // Check that the label has been created ...
         final RestLabelList restLabelList = getLabels(requestHeaders, template);
 
-        // Validate that the two maps are there ...
+        // Validate that the two labels are there ...
         final List<RestLabel> labels = restLabelList.getLabels();
 
         boolean found1 = false;
@@ -71,7 +72,7 @@ public class RestLabelITCase {
 
     }
 
-    private RestLabelList getLabels(HttpHeaders requestHeaders, RestTemplate template) {
+    static RestLabelList getLabels(HttpHeaders requestHeaders, RestTemplate template) {
         final HttpEntity findLabelEntity = new HttpEntity(requestHeaders);
         final ResponseEntity<RestLabelList> response = template.exchange(BASE_REST_URL + "/labels", HttpMethod.GET, findLabelEntity, RestLabelList.class);
         return response.getBody();
@@ -83,7 +84,7 @@ public class RestLabelITCase {
         final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin");
 
         try {
-            addNewLabel(requestHeaders, template, null, COLOR);
+            addNewLabel(requestHeaders, template, null, COLOR, ICON);
             fail("Wrong response");
         } catch (HttpClientErrorException e) {
             final String responseBodyAsString = e.getResponseBodyAsString();
@@ -91,12 +92,21 @@ public class RestLabelITCase {
         }
 
         try {
-            addNewLabel(requestHeaders, template, "title12345", null);
+            addNewLabel(requestHeaders, template, "title12345", null, ICON);
             fail("Wrong response");
         } catch (HttpClientErrorException e) {
             final String responseBodyAsString = e.getResponseBodyAsString();
             assert (responseBodyAsString.contains("Required field cannot be left blank"));
         }
+
+        try {
+            addNewLabel(requestHeaders, template, "title12345", COLOR, null);
+            fail("Wrong response");
+        } catch (HttpClientErrorException e) {
+            final String responseBodyAsString = e.getResponseBodyAsString();
+            assert (responseBodyAsString.contains("Required field cannot be left blank"));
+        }
+
     }
 
     @Test(dataProviderClass = RestHelper.class, dataProvider="ContentType-Provider-Function")
@@ -105,7 +115,7 @@ public class RestLabelITCase {
         final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin");
 
         final String title = "title to delete";
-        final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR);
+        final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR, ICON);
 
         // Now remove it ...
         template.delete(RestHelper.HOST_PORT + resourceUri.toString());
@@ -119,7 +129,7 @@ public class RestLabelITCase {
 
     }
 
-    static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color ) throws IOException, WiseMappingException {
+    static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color, @Nullable String icon) throws IOException, WiseMappingException {
         final RestLabel restLabel = new RestLabel();
         if (title != null) {
             restLabel.setTitle(title);
@@ -127,6 +137,9 @@ public class RestLabelITCase {
         if (color != null) {
             restLabel.setColor(color);
         }
+        if (icon != null) {
+            restLabel.setIconName(icon);
+        }
 
         // Create a new label ...
         HttpEntity<RestLabel> createUserEntity = new HttpEntity<RestLabel>(restLabel, requestHeaders);

wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapITCase.java

@@ -2,6 +2,10 @@ package com.wisemapping.test.rest;
 
 
 import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.Label;
+import com.wisemapping.model.User;
+import com.wisemapping.rest.model.RestLabel;
+import com.wisemapping.rest.model.RestLabelList;
 import com.wisemapping.rest.model.RestMindmap;
 import com.wisemapping.rest.model.RestMindmapInfo;
 import com.wisemapping.rest.model.RestMindmapList;
@@ -24,6 +28,7 @@ import java.net.URI;
 import java.util.List;
 
 import static com.wisemapping.test.rest.RestHelper.BASE_REST_URL;
+import static com.wisemapping.test.rest.RestHelper.COLOR;
 import static com.wisemapping.test.rest.RestHelper.HOST_PORT;
 import static com.wisemapping.test.rest.RestHelper.createHeaders;
 import static com.wisemapping.test.rest.RestHelper.createTemplate;
@@ -35,6 +40,7 @@ import static org.testng.Assert.fail;
 public class RestMindmapITCase {
 
     private String userEmail = "admin@wisemapping.com";
+    private static final String ICON = "glyphicon glyphicon-tag";
 
     @BeforeClass
     void createUser() {
@@ -239,6 +245,35 @@ public class RestMindmapITCase {
         assertEquals(response.getBody().getProperties(), mapToUpdate.getProperties());
     }
 
+    @Test(dataProviderClass = RestHelper.class, dataProvider="ContentType-Provider-Function")
+    public void addLabelToMindmap(final @NotNull MediaType mediaType) throws IOException, WiseMappingException {    // Configure media types ...
+        final HttpHeaders requestHeaders = createHeaders(mediaType);
+        final RestTemplate template = createTemplate(userEmail);
+
+        // Create a new label
+        final String titleLabel = "Label 1  - " + mediaType.toString();
+        final URI labelUri = RestLabelITCase.addNewLabel(requestHeaders, template, titleLabel, COLOR, ICON);
+
+        // Create a sample map ...
+        final String mapTitle = "Maps 1  - " + mediaType.toString();
+        final URI mindmapUri = addNewMap(requestHeaders, template, mapTitle);
+        final String mapId = mindmapUri.getPath().replace("/service/maps/", "");
+
+        final RestLabel restLabel = new RestLabel();
+        restLabel.setColor(COLOR);
+        String labelId = labelUri.getPath().replace("/service/labels/", "");
+        restLabel.setId(Integer.parseInt(labelId));
+        restLabel.setTitle(titleLabel);
+
+        HttpEntity<RestLabel> labelEntity = new HttpEntity<>(restLabel, requestHeaders);
+        template.postForLocation(BASE_REST_URL + "/labels/maps?ids=" + mapId, labelEntity);
+
+        // Load map again ..
+        final RestMindmap withLabel = findMap(requestHeaders, template, mindmapUri);
+
+//        assertTrue(withLabel.getDelegated().getLabels().size() == 1);
+    }
+
     private RestMindmap findMap(HttpHeaders requestHeaders, RestTemplate template, URI resourceUri) {
         final HttpEntity findMapEntity = new HttpEntity(requestHeaders);
         final ResponseEntity<RestMindmap> response = template.exchange(HOST_PORT + resourceUri.toString(), HttpMethod.GET, findMapEntity, RestMindmap.class);

wise-webapp/src/test/resources/data/export/bigmap.latex

@@ -1,251 +1,251 @@
 
 	\chapter{corona}\label{ID_null}
-	\section{Modelo in world}\label{ID_null}
-	\subsection{International market protected Modelo from unstable peso}\label{ID_null}
-	\subsection{Fifth largest distributor in world}\label{ID_null}
-	\subsubsection{Can they sustain that trend}\label{ID_null}
-	\subsubsection{in 12 years}\label{ID_null}
-	\subsection{One of top 10 breweries in world}\label{ID_null}
-	\section{Carloz Fernandez CEO}\label{ID_null}
-	\subsection{CEO Since 1997}\label{ID_null}
-	\subsubsection{29 years old}\label{ID_null}working there since 13\par
-		
-	\subsection{vision: top five brewers}\label{ID_null}
-	\subsubsection{International Business model}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}experienced local distributors\par
-		\item \label{ID_null}Growing international demand\par
-		\item \label{ID_null}Capitalize on NAFTA\par
-		
-			\end{itemize}
-			
-	\subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}7.8 % sales growth compounded over ten years\par
-		\item \label{ID_null}2005\par
-		\begin{itemize}
-			\item \label{ID_null}12.3 % exports\par
-		\item \label{ID_null}4% increase domestically\par
-		\item \label{ID_null}export sales 30%\par
-		
-			\end{itemize}
-			\item \label{ID_null}Corona Extra\par
-		\begin{itemize}
-			\item \label{ID_null}worlds fourth best selling beer\par
-		\item \label{ID_null}56% shar of domestic market\par
-		\item \label{ID_null}Since 1997 #1 import in US\par
-		outsold competitor by 50%\par
-		
-			\end{itemize}
-			
-			\end{itemize}
-			
-	\subsection{Expanding production }\label{ID_null}
-	\subsubsection{renovate facility in Zacatecas}\label{ID_null}
-	\subsubsection{300 million investment}\label{ID_null}
-	\section{US Beer Market}\label{ID_null}
-	\subsection{2nd largest nest to China}\label{ID_null}
-	\subsection{Consumption six times higher per cap}\label{ID_null}
-	\subsection{Groth expectations reduced}\label{ID_null}
-	\subsection{80% of market}\label{ID_null}
-	\subsubsection{AB}\label{ID_null}75% of industry profits\par
-		
-	\subsubsection{adolf coors}\label{ID_null}
-	\subsubsection{Miller}\label{ID_null}
-	\subsection{dense network of regional craft brewing}\label{ID_null}
-	\subsection{volume main driver}\label{ID_null}
-	\section{Modelo in Mexico}\label{ID_null}
-	\subsection{History to 1970}\label{ID_null}
-	\subsubsection{formed in 1922}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par
-		\item \label{ID_null}Iriarte died in 1932\par
-		\item \label{ID_null}Diez sole owner 1936\par
-		\item \label{ID_null}Fernandez Family Sole owner since 1936\par
-		
-			\end{itemize}
-			
-	\subsubsection{focus on Mexico City}\label{ID_null}
-	\subsubsection{Modelo 1st Brand}\label{ID_null}
-	\subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par
-		
-	\subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize}
-			\item \label{ID_null}concentrate domesti¬cally \par
-		\item \label{ID_null}improve distribution methods and produc¬tion facilities \par
-		distribution: direct with profit sharing\par
-		
-			\end{itemize}
-			
-	\subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}1935\par
-		\item \label{ID_null}country's oldest brand of beer\par
-		
-			\end{itemize}
-			
-	\subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null}
-	\subsubsection{Mexican Stock exchange in 1994}\label{ID_null}
-	\subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9%  voting\par
-		
-	\subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null}
-	\subsubsection{corona 56% share}\label{ID_null}
-	\section{Modelo in US}\label{ID_null}
-	\subsection{History}\label{ID_null}
-	\subsubsection{1979}\label{ID_null}
-	\subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par
-		
-	\subsubsection{gained popularity in southern states}\label{ID_null}
-	\subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par
-		
-	\subsubsection{1991}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}doubling of federal excise tax on beer\par
-		\begin{itemize}
-			\item \label{ID_null}sales decrease of 15 percent\par
-		\item \label{ID_null}distributor absorb the tax 92\par
-		
-			\end{itemize}
-			\item \label{ID_null}distributors took the loss\par
-		
-			\end{itemize}
-			
-	\subsection{2007 5 beers to us}\label{ID_null}
-	\subsubsection{3 of top 8 beers in US}\label{ID_null}
-	\subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par
-		
-	\subsubsection{131 million cases}\label{ID_null}
-	\subsection{Marketing}\label{ID_null}
-	\subsubsection{surfing mythology}\label{ID_null}
-	\subsubsection{not selling premium quality}\label{ID_null}
-	\subsubsection{not testosterone driven}\label{ID_null}
-	\subsubsection{found new following}\label{ID_null}
-	\subsubsection{beer for non beer drinkers}\label{ID_null}
-	\subsubsection{dependable second choise}\label{ID_null}
-	\subsubsection{Fun in the sun}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Barton Beer's idea\par
-		\item \label{ID_null}escape\par
-		\item \label{ID_null}relaxation\par
-		
-			\end{itemize}
-			
-	\subsubsection{1996ad budget}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Corona 5.1 mil\par
-		\item \label{ID_null}Heiniken 15 mil\par
-		\item \label{ID_null}an bsch 192 mil\par
-		
-			\end{itemize}
-			
-	\subsection{Us dist contracts}\label{ID_null}
-	\subsubsection{importer/distributors}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Local Companies\par
-		\item \label{ID_null}Autonomous\par
-		\item \label{ID_null}competitive relationship\par
-		\item \label{ID_null}transportation\par
-		\item \label{ID_null}insurance\par
-		\item \label{ID_null}pricing\par
-		\item \label{ID_null}customs\par
-		\item \label{ID_null}advertixing\par
-		
-			\end{itemize}
-			
-	\subsubsection{procermex inc}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Modelo us subsidiary\par
-		\item \label{ID_null}Support\par
-		\item \label{ID_null}Supervise\par
-		\item \label{ID_null}Coordinate\par
-		
-			\end{itemize}
-			
-	\subsubsection{Modelo had final say on brand image}\label{ID_null}
-	\subsubsection{production in Mexico}\label{ID_null}
-	\subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par
-		
-	\subsubsection{Gambrinus}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}1986\par
-		\item \label{ID_null}eastern dist\par
-		
-			\end{itemize}
-			
 	\section{The Beer market}\label{ID_null}
-	\subsection{traditionally a clustered market}\label{ID_null}
-	\subsection{many local breweries}\label{ID_null}
-	\subsection{no means of transport}\label{ID_null}
-	\subsection{colsolition happened in 1800s}\label{ID_null}
-	\subsection{different countries had different tastes}\label{ID_null}
-	\subsection{90s national leaders expanded abroad}\label{ID_null}
-	\subsection{startup costs high}\label{ID_null}
-	\subsubsection{industry supported conectration}\label{ID_null}
-	\subsection{Interbrew}\label{ID_null}
-	\subsubsection{Belgian}\label{ID_null}
-	\subsubsection{aquired breweries in 20 countries}\label{ID_null}
-	\subsubsection{sales in 110 countries}\label{ID_null}
-	\subsubsection{local managers controlling brands}\label{ID_null}
-	\subsubsection{flagship brand: Stella Artois}\label{ID_null}
-	\subsection{2004 merger}\label{ID_null}
-	\subsubsection{#1 Interbrew}\label{ID_null}
-	\subsubsection{#5 Am Bev - Brazil}\label{ID_null}
-	\subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par
+	\subsection{Future}\label{ID_null}
+	\subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null}
+	\subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par
 		
+	\subsubsection{other merger talks}\label{ID_null}
+	\subsubsection{domestic and foreign threats}\label{ID_null}
+	\subsection{Beer Marketing}\label{ID_null}
+	\subsubsection{People drink marketing}\label{ID_null}
 	\subsection{2007}\label{ID_null}
-	\subsubsection{inbev}\label{ID_null}
-	\subsubsection{SAP Miller}\label{ID_null}
+	\subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par
+		
 	\subsubsection{Heineken}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Dutch\par
+		\item \label{ID_null}reputation of top selling beer in world\par
+		\item \label{ID_null}marketing\par
+		\begin{itemize}
+			\item \label{ID_null}2006 aggressive marketing campaign\par
+		Heineken Premium Light\par
+		\item \label{ID_null}superior taste\par
+		\item \label{ID_null}no mythology\par
+		\item \label{ID_null}premium brand\par
+		\item \label{ID_null}premium beer\par
+		
+			\end{itemize}
 			\item \label{ID_null}produces beer domestically\par
 		parent of local distributors\par
 		\begin{itemize}
-			\item \label{ID_null}marketing\par
+			\item \label{ID_null}distribution\par
 		\item \label{ID_null}importing\par
 		import taxes passed on to consumer\par
-		\item \label{ID_null}distribution\par
-		
-			\end{itemize}
-			\item \label{ID_null}marketing\par
-		\begin{itemize}
-			\item \label{ID_null}premium beer\par
-		\item \label{ID_null}premium brand\par
-		\item \label{ID_null}no mythology\par
-		\item \label{ID_null}superior taste\par
-		\item \label{ID_null}2006 aggressive marketing campaign\par
-		Heineken Premium Light\par
-		
-			\end{itemize}
-			\item \label{ID_null}reputation of top selling beer in world\par
-		\item \label{ID_null}Dutch\par
+		\item \label{ID_null}marketing\par
 		
 			\end{itemize}
 			
-	\subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par
+			\end{itemize}
+			
+	\subsubsection{SAP Miller}\label{ID_null}
+	\subsubsection{inbev}\label{ID_null}
+	\subsection{2004 merger}\label{ID_null}
+	\subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par
 		
-	\subsection{Beer Marketing}\label{ID_null}
-	\subsubsection{People drink marketing}\label{ID_null}
-	\subsection{Future}\label{ID_null}
-	\subsubsection{domestic and foreign threats}\label{ID_null}
-	\subsubsection{other merger talks}\label{ID_null}
-	\subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par
+	\subsubsection{#5 Am Bev - Brazil}\label{ID_null}
+	\subsubsection{#1 Interbrew}\label{ID_null}
+	\subsection{Interbrew}\label{ID_null}
+	\subsubsection{flagship brand: Stella Artois}\label{ID_null}
+	\subsubsection{local managers controlling brands}\label{ID_null}
+	\subsubsection{sales in 110 countries}\label{ID_null}
+	\subsubsection{aquired breweries in 20 countries}\label{ID_null}
+	\subsubsection{Belgian}\label{ID_null}
+	\subsection{startup costs high}\label{ID_null}
+	\subsubsection{industry supported conectration}\label{ID_null}
+	\subsection{90s national leaders expanded abroad}\label{ID_null}
+	\subsection{different countries had different tastes}\label{ID_null}
+	\subsection{colsolition happened in 1800s}\label{ID_null}
+	\subsection{no means of transport}\label{ID_null}
+	\subsection{many local breweries}\label{ID_null}
+	\subsection{traditionally a clustered market}\label{ID_null}
+	\section{Carloz Fernandez CEO}\label{ID_null}
+	\subsection{Expanding production }\label{ID_null}
+	\subsubsection{300 million investment}\label{ID_null}
+	\subsubsection{renovate facility in Zacatecas}\label{ID_null}
+	\subsection{vision: top five brewers}\label{ID_null}
+	\subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Corona Extra\par
+		\begin{itemize}
+			\item \label{ID_null}Since 1997 #1 import in US\par
+		outsold competitor by 50%\par
+		\item \label{ID_null}56% shar of domestic market\par
+		\item \label{ID_null}worlds fourth best selling beer\par
 		
-	\subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null}
+			\end{itemize}
+			\item \label{ID_null}2005\par
+		\begin{itemize}
+			\item \label{ID_null}export sales 30%\par
+		\item \label{ID_null}4% increase domestically\par
+		\item \label{ID_null}12.3 % exports\par
+		
+			\end{itemize}
+			\item \label{ID_null}7.8 % sales growth compounded over ten years\par
+		
+			\end{itemize}
+			
+	\subsubsection{International Business model}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Capitalize on NAFTA\par
+		\item \label{ID_null}Growing international demand\par
+		\item \label{ID_null}experienced local distributors\par
+		
+			\end{itemize}
+			
+	\subsection{CEO Since 1997}\label{ID_null}
+	\subsubsection{29 years old}\label{ID_null}working there since 13\par
+		
+	\section{Modelo in world}\label{ID_null}
+	\subsection{One of top 10 breweries in world}\label{ID_null}
+	\subsection{Fifth largest distributor in world}\label{ID_null}
+	\subsubsection{in 12 years}\label{ID_null}
+	\subsubsection{Can they sustain that trend}\label{ID_null}
+	\subsection{International market protected Modelo from unstable peso}\label{ID_null}
 	\section{Mexico Industry}\label{ID_null}
-	\subsection{has most trade agreements in world}\label{ID_null}
-	\subsection{one of the largest domestic beer markets}\label{ID_null}
-	\subsection{imported beer only 1% sales}\label{ID_null}
-	\subsubsection{half were anh bcsh dist by modelo}\label{ID_null}
-	\subsection{modelo}\label{ID_null}
-	\subsubsection{NAFTA S.A. An Bucsh}\label{ID_null}
-	\subsubsection{62.8% of market}\label{ID_null}
 	\subsection{FEMSA}\label{ID_null}
+	\subsubsection{foriegn market}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Recently partnered with Heiniken for US market\par
+		2005 18.7% growth\par
+		\item \label{ID_null}90s entry to us market failed\par
+		\item \label{ID_null}Partnership Heiniken\par
+		Distribution in US\par
+		
+			\end{itemize}
+			
 	\subsubsection{domestic market}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}37% of domestic market\par
-		\item \label{ID_null}production and distribution in Mexico: peso not a threat\par
+			\item \label{ID_null}NAFTA SACoca cola\par
+		Exclusive distributor\par
+		\item \label{ID_null}997 to 2004 taking domestic market share\par
+		\item \label{ID_null}leads domestic premium beer market\par
 		\item \label{ID_null}Owns Oxxo C\par
 		CA largest chain of conv stores\par
-		\item \label{ID_null}leads domestic premium beer market\par
-		\item \label{ID_null}997 to 2004 taking domestic market share\par
-		\item \label{ID_null}NAFTA SACoca cola\par
-		Exclusive distributor\par
+		\item \label{ID_null}production and distribution in Mexico: peso not a threat\par
+		\item \label{ID_null}37% of domestic market\par
 		
 			\end{itemize}
 			
-	\subsubsection{foriegn market}\label{ID_null}\begin{itemize}
-			\item \label{ID_null}Partnership Heiniken\par
-		Distribution in US\par
-		\item \label{ID_null}90s entry to us market failed\par
-		\item \label{ID_null}Recently partnered with Heiniken for US market\par
-		2005 18.7% growth\par
+	\subsection{modelo}\label{ID_null}
+	\subsubsection{62.8% of market}\label{ID_null}
+	\subsubsection{NAFTA S.A. An Bucsh}\label{ID_null}
+	\subsection{imported beer only 1% sales}\label{ID_null}
+	\subsubsection{half were anh bcsh dist by modelo}\label{ID_null}
+	\subsection{one of the largest domestic beer markets}\label{ID_null}
+	\subsection{has most trade agreements in world}\label{ID_null}
+	\section{Modelo in Mexico}\label{ID_null}
+	\subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null}
+	\subsubsection{corona 56% share}\label{ID_null}
+	\subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null}
+	\subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9%  voting\par
+		
+	\subsubsection{Mexican Stock exchange in 1994}\label{ID_null}
+	\subsection{History to 1970}\label{ID_null}
+	\subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}country's oldest brand of beer\par
+		\item \label{ID_null}1935\par
 		
 			\end{itemize}
-			
+			
+	\subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize}
+			\item \label{ID_null}improve distribution methods and produc¬tion facilities \par
+		distribution: direct with profit sharing\par
+		\item \label{ID_null}concentrate domesti¬cally \par
+		
+			\end{itemize}
+			
+	\subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par
+		
+	\subsubsection{Modelo 1st Brand}\label{ID_null}
+	\subsubsection{focus on Mexico City}\label{ID_null}
+	\subsubsection{formed in 1922}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Fernandez Family Sole owner since 1936\par
+		\item \label{ID_null}Diez sole owner 1936\par
+		\item \label{ID_null}Iriarte died in 1932\par
+		\item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par
+		
+			\end{itemize}
+			
+	\section{US Beer Market}\label{ID_null}
+	\subsection{volume main driver}\label{ID_null}
+	\subsection{dense network of regional craft brewing}\label{ID_null}
+	\subsection{80% of market}\label{ID_null}
+	\subsubsection{Miller}\label{ID_null}
+	\subsubsection{adolf coors}\label{ID_null}
+	\subsubsection{AB}\label{ID_null}75% of industry profits\par
+		
+	\subsection{Groth expectations reduced}\label{ID_null}
+	\subsection{Consumption six times higher per cap}\label{ID_null}
+	\subsection{2nd largest nest to China}\label{ID_null}
+	\section{Modelo in US}\label{ID_null}
+	\subsection{Us dist contracts}\label{ID_null}
+	\subsubsection{Gambrinus}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}eastern dist\par
+		\item \label{ID_null}1986\par
+		
+			\end{itemize}
+			
+	\subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par
+		
+	\subsubsection{production in Mexico}\label{ID_null}
+	\subsubsection{Modelo had final say on brand image}\label{ID_null}
+	\subsubsection{procermex inc}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}Coordinate\par
+		\item \label{ID_null}Supervise\par
+		\item \label{ID_null}Support\par
+		\item \label{ID_null}Modelo us subsidiary\par
+		
+			\end{itemize}
+			
+	\subsubsection{importer/distributors}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}advertixing\par
+		\item \label{ID_null}customs\par
+		\item \label{ID_null}pricing\par
+		\item \label{ID_null}insurance\par
+		\item \label{ID_null}transportation\par
+		\item \label{ID_null}competitive relationship\par
+		\item \label{ID_null}Autonomous\par
+		\item \label{ID_null}Local Companies\par
+		
+			\end{itemize}
+			
+	\subsection{Marketing}\label{ID_null}
+	\subsubsection{1996ad budget}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}an bsch 192 mil\par
+		\item \label{ID_null}Heiniken 15 mil\par
+		\item \label{ID_null}Corona 5.1 mil\par
+		
+			\end{itemize}
+			
+	\subsubsection{Fun in the sun}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}relaxation\par
+		\item \label{ID_null}escape\par
+		\item \label{ID_null}Barton Beer's idea\par
+		
+			\end{itemize}
+			
+	\subsubsection{dependable second choise}\label{ID_null}
+	\subsubsection{beer for non beer drinkers}\label{ID_null}
+	\subsubsection{found new following}\label{ID_null}
+	\subsubsection{not testosterone driven}\label{ID_null}
+	\subsubsection{not selling premium quality}\label{ID_null}
+	\subsubsection{surfing mythology}\label{ID_null}
+	\subsection{2007 5 beers to us}\label{ID_null}
+	\subsubsection{131 million cases}\label{ID_null}
+	\subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par
+		
+	\subsubsection{3 of top 8 beers in US}\label{ID_null}
+	\subsection{History}\label{ID_null}
+	\subsubsection{1991}\label{ID_null}\begin{itemize}
+			\item \label{ID_null}distributors took the loss\par
+		\item \label{ID_null}doubling of federal excise tax on beer\par
+		\begin{itemize}
+			\item \label{ID_null}distributor absorb the tax 92\par
+		\item \label{ID_null}sales decrease of 15 percent\par
+		
+			\end{itemize}
+			
+			\end{itemize}
+			
+	\subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par
+		
+	\subsubsection{gained popularity in southern states}\label{ID_null}
+	\subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par
+		
+	\subsubsection{1979}\label{ID_null}

wise-webapp/src/test/resources/data/export/bigmap.mm

@@ -1,262 +1,262 @@
-<map version="0.9.0">
+<map version="1.0.1">
     <node ID="ID_null" TEXT="corona">
-        <node ID="ID_null" POSITION="left" TEXT="Modelo in world">
-            <node ID="ID_null" POSITION="left" TEXT="International market protected Modelo from unstable peso"/>
-            <node ID="ID_null" POSITION="left" TEXT="Fifth largest distributor in world">
-                <node ID="ID_null" POSITION="left" TEXT="Can they sustain that trend"/>
-                <node ID="ID_null" POSITION="left" TEXT="in 12 years"/>
-            </node>
-            <node ID="ID_null" POSITION="left" TEXT="One of top 10 breweries in world"/>
-        </node>
-        <node ID="ID_null" POSITION="left" TEXT="Carloz Fernandez CEO">
-            <node ID="ID_null" POSITION="left" TEXT="CEO Since 1997">
-                <node ID="ID_null" POSITION="left" TEXT="29 years old">
-                    <node ID="ID_null" POSITION="left" TEXT="working there since 13"/>
+        <node ID="ID_null" POSITION="right" STYLE="fork" TEXT="The Beer market">
+            <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Future">
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Sales were decreasing due to competitive media budgets"/>
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Inbev in talks with Anh Bush">
+                    <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Two biggest companies will create huge company"/>
                 </node>
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="other merger talks"/>
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="domestic and foreign threats"/>
             </node>
-            <node ID="ID_null" POSITION="left" TEXT="vision: top five brewers">
-                <node ID="ID_null" POSITION="left" TEXT="International Business model">
-                    <node ID="ID_null" POSITION="left" TEXT="experienced local distributors"/>
-                    <node ID="ID_null" POSITION="left" TEXT="Growing international demand"/>
-                    <node ID="ID_null" POSITION="left" TEXT="Capitalize on NAFTA"/>
+            <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Beer Marketing">
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="People drink marketing"/>
+            </node>
+            <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2007">
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Anh Bush">
+                    <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="produces in foreign markets"/>
                 </node>
-                <node ID="ID_null" POSITION="left" TEXT="top 10 beer producers in world">
-                    <node ID="ID_null" POSITION="left" TEXT="7.8 % sales growth compounded over ten years"/>
-                    <node ID="ID_null" POSITION="left" TEXT="2005">
-                        <node ID="ID_null" POSITION="left" TEXT="12.3 % exports"/>
-                        <node ID="ID_null" POSITION="left" TEXT="4% increase domestically"/>
-                        <node ID="ID_null" POSITION="left" TEXT="export sales 30%"/>
-                    </node>
-                    <node ID="ID_null" POSITION="left" TEXT="Corona Extra">
-                        <node ID="ID_null" POSITION="left" TEXT="worlds fourth best selling beer"/>
-                        <node ID="ID_null" POSITION="left" TEXT="56% shar of domestic market"/>
-                        <node ID="ID_null" POSITION="left" TEXT="Since 1997 #1 import in US">
-                            <node ID="ID_null" POSITION="left" TEXT="outsold competitor by 50%"/>
+                <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heineken">
+                    <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Dutch"/>
+                    <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="reputation of top selling beer in world"/>
+                    <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="marketing">
+                        <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2006 aggressive marketing campaign">
+                            <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heineken Premium Light"/>
                         </node>
+                        <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="superior taste"/>
+                        <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="no mythology"/>
+                        <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="premium brand"/>
+                        <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="premium beer"/>
                     </node>
-                </node>
-            </node>
-            <node ID="ID_null" POSITION="left" TEXT="Expanding production ">
-                <node ID="ID_null" POSITION="left" TEXT="renovate facility in Zacatecas"/>
-                <node ID="ID_null" POSITION="left" TEXT="300 million investment"/>
-            </node>
-        </node>
-        <node ID="ID_null" POSITION="left" TEXT="US Beer Market">
-            <node ID="ID_null" POSITION="left" TEXT="2nd largest nest to China"/>
-            <node ID="ID_null" POSITION="left" TEXT="Consumption six times higher per cap"/>
-            <node ID="ID_null" POSITION="left" TEXT="Groth expectations reduced"/>
-            <node ID="ID_null" POSITION="left" TEXT="80% of market">
-                <node ID="ID_null" POSITION="left" TEXT="AB">
-                    <node ID="ID_null" POSITION="left" TEXT="75% of industry profits"/>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="adolf coors"/>
-                <node ID="ID_null" POSITION="left" TEXT="Miller"/>
-            </node>
-            <node ID="ID_null" POSITION="left" TEXT="dense network of regional craft brewing"/>
-            <node ID="ID_null" POSITION="left" TEXT="volume main driver"/>
-        </node>
-        <node ID="ID_null" POSITION="left" TEXT="Modelo in Mexico">
-            <node ID="ID_null" POSITION="left" TEXT="History to 1970">
-                <node ID="ID_null" POSITION="left" TEXT="formed in 1922">
-                    <node ID="ID_null" POSITION="left" TEXT="Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr"/>
-                    <node ID="ID_null" POSITION="left" TEXT="Iriarte died in 1932"/>
-                    <node ID="ID_null" POSITION="left" TEXT="Diez sole owner 1936"/>
-                    <node ID="ID_null" POSITION="left" TEXT="Fernandez Family Sole owner since 1936"/>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="focus on Mexico City"/>
-                <node ID="ID_null" POSITION="left" TEXT="Modelo 1st Brand"/>
-                <node ID="ID_null" POSITION="left" TEXT="Corona 2nd Brand">
-                    <node ID="ID_null" POSITION="left" TEXT="Clear Glass Customers preference"/>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="1940s period of strong growth ">
-                    <node ID="ID_null" POSITION="left" TEXT="concentrate domesti&#172;cally "/>
-                    <node ID="ID_null" POSITION="left" TEXT="improve distribution methods and produc&#172;tion facilities ">
-                        <node ID="ID_null" POSITION="left" TEXT="distribution: direct with profit sharing"/>
-                    </node>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="bought the brands and assets of the Toluca y Mexico Brewery">
-                    <node ID="ID_null" POSITION="left" TEXT="1935"/>
-                    <node ID="ID_null" POSITION="left" TEXT="country's oldest brand of beer"/>
-                </node>
-            </node>
-            <node ID="ID_null" POSITION="left" TEXT="1971, Antonino Fernandez was appointed CEO">
-                <node ID="ID_null" POSITION="left" TEXT="Mexican Stock exchange in 1994"/>
-                <node ID="ID_null" POSITION="left" TEXT="Anheuser-Busch 17.7 % of the equity">
-                    <node ID="ID_null" POSITION="left" TEXT="The 50.2 % represented 43.9%  voting"/>
-                </node>
-            </node>
-            <node ID="ID_null" POSITION="left" TEXT="Largest Beer producer and distrubutor in Mexico">
-                <node ID="ID_null" POSITION="left" TEXT="corona 56% share"/>
-            </node>
-        </node>
-        <node ID="ID_null" POSITION="right" TEXT="Modelo in US">
-            <node ID="ID_null" POSITION="left" TEXT="History">
-                <node ID="ID_null" POSITION="left" TEXT="1979"/>
-                <node ID="ID_null" POSITION="left" TEXT="Amalgamated Distillery Products Inc. (">
-                    <node ID="ID_null" POSITION="left" TEXT="later renamed Barton Beers Ltd."/>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="gained popularity in southern states"/>
-                <node ID="ID_null" POSITION="left" TEXT="rapid growth 1980s">
-                    <node ID="ID_null" POSITION="left" TEXT="second most popular imported beer"/>
-                </node>
-                <node ID="ID_null" POSITION="left" TEXT="1991">
-                    <node ID="ID_null" POSITION="left" TEXT="doubling of federa