Fix Printer ...

2011-10-18 09:29:29 -03:00
parent 8913b5f187
commit ce52e078b5
21 changed files with 647 additions and 94 deletions
--- a/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
+++ b/wise-webapp/src/main/webapp/jsp/embeddedView.jsp
@@ -4,7 +4,7 @@

 <html>
 <head>
-     <!--[if lt IE 9]>
+    <!--[if lt IE 9]>
    <meta http-equiv="X-UA-Compatible" content="chrome=1">
    <![endif]-->
    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
@@ -12,8 +12,7 @@

    <link rel="stylesheet" type="text/css" href="../css/embedded.css"/>

-    <script type='text/javascript'
-            src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-core-1.3.2-full-compress.js'></script>
    <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
    <script type='text/javascript' src='../js/core.js'></script>

@@ -26,10 +25,8 @@
            mindReady = resource == 'mind' ? true : mindReady;
            if (mindReady) {

-                var editorProperties = {zoom:${zoom},saveOnLoad:true,collab:'standalone'};
-
-                var isTryMode = false;
-                designer = buildDesigner(editorProperties, true);
+                var editorProperties = {zoom:${zoom},saveOnLoad:true,collab:'standalone',readOnly:true};
+                designer = buildDesigner(editorProperties);

                var domDocument = core.Utils.createDocumentFromText(mapXml);
                var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromDocument(domDocument);
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -15,13 +15,11 @@
    <![endif]-->
    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
-
    <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
    <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
    <link rel="stylesheet/less" type="text/css" href="../css/editor2.css"/>

-    <script type='text/javascript'
-            src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-core-1.3.2-full-compress.js'></script>
    <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>

    <script type="text/javascript" src="../dwr/engine.js"></script>
@@ -42,9 +40,8 @@

                var editorProperties = ${mindmap.properties};
                editorProperties.collab = 'standalone';
-
-                var isTryMode = ${editorTryMode};
-                designer = buildDesigner(editorProperties, isTryMode);
+                editorProperties.readOnly = false;
+                designer = buildDesigner(editorProperties);

                var domDocument = core.Utils.createDocumentFromText(mapXml);
                var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromDocument(domDocument);
@@ -121,7 +118,7 @@

            <spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
                href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span> |
-            <span><a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
+            <span><a id="settings" href="${pageContext.request.contextPath}/c/settings.htm"
                     title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
            | <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
            <spring:message code="LOGOUT"/>
@@ -201,7 +198,7 @@
                <img src="../nicons/font-size.png"/>
            </div>
            <div id="fontBold" class="buttonOn" title="Bold Style">
-                <img src="../nicons/topic-border.png"/>
+                <img src="../nicons/font-bold.png"/>
            </div>
            <div id="fontItalic" class="buttonOn" title="Italic Style">
                <img src="../nicons/font-italic.png"/>
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -64,7 +64,7 @@
            <tr>
                <td style="text-align:center;margin-top:10px;">
                    <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
-                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
+                    <input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
                           onclick="">
                </td>
            </tr>
@@ -89,6 +89,10 @@
        MooDialog.Request.active.close();
    });

+    $('cancel').addEvent('click', function(event) {
+        MooDialog.Request.active.close();
+    });
+
    document.exportForm.mapSvg.value = $("workspaceContainer").innerHTML;

 </script>
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -14,8 +14,7 @@
    <link rel="stylesheet" type="text/css" href="../css/mymaps.css"/>
    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
-    <script type='text/javascript'
-            src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-core-1.3.2-full-compress.js'></script>
 </head>
 <body>
 <div class="content">
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -1,28 +1,91 @@
 <%@ page import="java.text.DateFormat" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Calendar" %>
+
+<%@ include file="/jsp/init.jsp" %>
+
 <%
    Calendar calendar = Calendar.getInstance(request.getLocale());
    calendar.setTimeInMillis(System.currentTimeMillis());
    DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
    String todayString = dateFormat.format(calendar.getTime());
 %>
-<!DOCTYPE HTML PUBLIC>
-<%@ include file="/jsp/init.jsp" %>
+<!DOCTYPE HTML>
 <html>
 <head>
-    <title>
-        <spring:message code="PRINT"/>
-        - ${mindmap.title}</title>
-    <link rel="stylesheet" type="text/css" href="../css/common.css">
+    <!--[if lt IE 9]>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <![endif]-->
+    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
+    <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
+
+
+    <link rel="stylesheet" type="text/css" href="../css/print.css"/>
+
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-core-1.3.2-full-compress.js'></script>
+    <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
+    <script type='text/javascript' src='../js/core.js'></script>
+
+
+    <script type="text/javascript">
+        var mapId = '${mindmap.id}';
+        var mapXml = '${mapXml}';
+        var mindReady = false;
+        $(document).addEvent('loadcomplete', function(resource) {
+            mindReady = resource == 'mind' ? true : mindReady;
+            if (mindReady) {
+
+                var editorProperties = {zoom:0.85,saveOnLoad:true,collab:'standalone',readOnly:true};
+                designer = buildDesigner(editorProperties);
+
+                var domDocument = core.Utils.createDocumentFromText(mapXml);
+                var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromDocument(domDocument);
+                var mindmap = serializer.loadFromDom(domDocument, mapId);
+
+                // Now, load the map ...
+                designer.loadMap(mindmap);
+
+                $('zoomIn').addEvent('click', function() {
+                    designer.zoomIn();
+                });
+
+                $('zoomOut').addEvent('click', function() {
+                    designer.zoomOut();
+                });
+            }
+        });
+    </script>
 </head>
 <body onload="setTimeout('print()', 5)">
-    <div id="printHeader">
-        <div id="printLogo"></div>
-        <div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;(<%=todayString%>)</span></div>
+
+<div id="waitDialog" style="display:none">
+    <div id="waitingContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            Loading ...
+        </div>
    </div>
-    <center>
-        <img src="${mapSvg}" alt="${mindmap.title}"/>
-    </center>
+</div>
+
+<div id="errorDialog" style="display:none">
+    <div id="errorContainer">
+        <div class="loadingIcon"></div>
+        <div class="loadingText">
+            Unexpected error loading your map :(
+        </div>
+    </div>
+</div>
+
+<div id="printHeader">
+    <div id="printLogo"></div>
+    <div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;(<%=todayString%>)</span></div>
+</div>
+<center>
+    <div id="mindplot"></div>
+</center>
+<script type="text/javascript" src="../js/editor.js"></script>
 </body>
-</html>
+</html>