Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols

Conflicts:
	mindplot/src/main/javascript/LinkIcon.js

mindplot/src/main/javascript/PersistenceManager.js

@@ -42,7 +42,7 @@ mindplot.PersistenceManager = new Class({
         var domMap = serializer.toXML(mindmap);
         var mapXml = core.Utils.innerXML(domMap);
 
-        var pref = (editorProperties);
+        var pref = JSON.stringify(editorProperties);
         try {
             this.saveMapXml(mapId, mapXml, pref, saveHistory, events, sync);
         } catch (e) {

mindplot/src/main/javascript/RestPersistenceManager.js

@@ -57,11 +57,11 @@ mindplot.RESTPersistenceManager = new Class({
 
                 $.ajax({
                     url: this.documentUrl.replace("{id}", mapId) + "?" + query,
-                    headers:{"Content-Type":"application/json; charset=utf-8", "Accept":"application/json"},
+                    type:'put',
-                    method:'put',
+                    dataType:"json",
+                    data: JSON.stringify(data),
+                    contentType:"application/json; charset=utf-8",
                     async:!sync,
-                    dataType: "json",
-                    data: data,
 
                     success: function (data, textStatus, jqXHRresponseText) {
                         persistence.timestamp = jqXHRresponseText;

wise-editor/pom.xml

@@ -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-webapp/jetty.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-    <Call name="addAliasCheck">
-        <Arg>
-            <New class="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker"/>
-        </Arg>
-    </Call>
-</Configure>

wise-webapp/pom.xml

@@ -553,17 +553,27 @@
             </plugin>
 
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
+                <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.2.1.v20140609</version>
+                <version>8.1.14.v20131031</version>
                 <configuration>
                     <baseAppFirst>false</baseAppFirst>
                     <stopKey>foo</stopKey>
                     <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>
                     <reload>automatic</reload>
-                    <contextXml>${project.basedir}/jetty.xml</contextXml>
+                    <webAppConfig>
+                        <overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
+                    </webAppConfig>
                     <systemProperties>
+                        <systemProperty>
+                            <name>org.mortbay.util.FileResource.checkAliases</name>
+                            <value>false</value>
+                        </systemProperty>
+                        <systemProperty>
+                            <name>org.mortbay.util.FileResource.checkAliases</name>
+                            <value>false</value>
+                        </systemProperty>
                         <systemProperty>
                             <name>database.base.url</name>
                             <value>${project.build.directory}</value>
@@ -603,9 +613,9 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.eclipse.jetty</groupId>
+                                    <groupId>org.mortbay.jetty</groupId>
                                     <artifactId>jetty-runner</artifactId>
-                                    <version>9.1.3.v20140225</version>
+                                    <version>7.4.5.v20110725</version>
                                     <destFileName>jetty-runner.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>

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

@@ -112,7 +112,7 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
 
 div#headerActions {
     padding-right: 8px;
-    padding-top: 4px;
+    padding-top: 2px;
     position: absolute;
     right: 0;
     z-index: 50;

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

@@ -13,6 +13,25 @@
     }
 %>
 
+<style>
+    .btn-header {
+        background-color: #F7C931;
+        border-color: #575757;
+        color: #000000;
+    }
+    .btn-header:hover {
+        background-color: #eee;
+    }
+    .WelcomeHeader {
+        position: relative;
+        float: left;
+        padding: 5px 10px;
+        font-size: 14px;
+        line-height: 1.5;
+        border: 1px solid transparent;
+    }
+</style>
+
 <div id="settings-dialog-modal" class="modal fade">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -33,15 +52,23 @@
     <div id="headerToolbar">
         <c:choose>
             <c:when test="${principal != null}">
-                <div id="headerActions">
+
+                <div class='WelcomeHeader' >
                     <spring:message code="WELCOME"/>, ${principal.firstname}
-                    | <span><a href="c/maps/"><spring:message
+                </div>
-                        code="MY_WISEMAPS"/></a></span>
+
-                    | <span><a id="userSettingsBtn" href="#"
+                <div class="btn-group" id="headerActions">
-                               title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message
+
-                        code="ACCOUNT"/></a></span>
+                    <button type="button" onclick="location.href='c/maps/'" class="btn btn-sm btn-header"><spring:message code="MY_WISEMAPS"/></button>
-                    | <span><a href="c/logout"
+
-                               title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
+                    <button type="button" onclick="accountInfo()" title="<spring:message code="ACCOUNT_DETAIL"/>" class="btn btn-sm btn-header">
+                        <spring:message code="ACCOUNT"/>
+                    </button>
+
+                    <button onclick="location.href='c/logout'" title="<spring:message code="LOGOUT"/>" type="button" class="btn btn-sm btn-header">
+                        <spring:message code="LOGOUT"/>
+                    </button>
+
                 </div>
             </c:when>
             <c:when test="${!param.removeSignin && !requestScope.removeSignin}">
@@ -69,10 +96,8 @@
 
 
 <script type="text/javascript">
-    var userSettingsLink = $('#userSettingsBtn');
+
-    if (userSettingsLink) {
+    function accountInfo(event) {
-        userSettingsLink.click(
-                function (event) {
         $('#settings-dialog-modal .modal-body').load("c/account/settings",
                 function () {
                     $('#settings-dialog-modal .btn-cancel').unbind('click').click(function () {
@@ -83,8 +108,6 @@
         );
         $('#settings-dialog-modal').modal();
         event.preventDefault();
-
-                });
     }
 
 </script>

wise-webapp/webdefault.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+        metadata-complete="false"
+        version="3.1">
+
+
+    <servlet>
+        <servlet-name>default</servlet-name>
+        <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>aliases</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </servlet>
+</web-app>