From a141414b4b26905197e28a262372f2303b93b744 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Thu, 5 Apr 2012 14:18:13 -0300 Subject: [PATCH] Improve and fix print. Support for jetty:run fixed. Several minor fixes. --- wise-webapp/src/license.txt => license.txt | 0 mindplot/src/main/javascript/widget/Menu.js | 3 +- wise-editor/src/main/webapp/css/embedded.less | 81 ++++++++- wise-webapp/pom.xml | 9 + .../controller/MindmapEditorController.java | 2 - .../java/com/wisemapping/model/MindMap.java | 2 +- .../ncontroller/MindmapController.java | 26 ++- .../WEB-INF/classes/messages.properties | 3 +- .../webapp/WEB-INF/wisemapping-security.xml | 2 +- .../webapp/WEB-INF/wisemapping-servlet.xml | 7 +- wise-webapp/src/main/webapp/css/embedded.less | 1 + wise-webapp/src/main/webapp/css/print.css | 23 --- wise-webapp/src/main/webapp/css/viewmode.css | 117 ------------- .../src/main/webapp/images/logo-xsmall.png | Bin 0 -> 13314 bytes wise-webapp/src/main/webapp/jsp/login.jsp | 17 +- .../src/main/webapp/jsp/mindmapEditor.jsp | 5 +- .../src/main/webapp/jsp/mindmapExport.jsp | 53 +++--- .../src/main/webapp/jsp/mindmapList.jsp | 2 +- .../src/main/webapp/jsp/mindmapPrint.jsp | 155 +++++++++++------- .../src/main/webapp/jsp/userRegistration.jsp | 20 +-- wise-webapp/webdefault.xml | 15 ++ 21 files changed, 269 insertions(+), 274 deletions(-) rename wise-webapp/src/license.txt => license.txt (100%) create mode 120000 wise-webapp/src/main/webapp/css/embedded.less delete mode 100644 wise-webapp/src/main/webapp/css/print.css delete mode 100644 wise-webapp/src/main/webapp/css/viewmode.css create mode 100644 wise-webapp/src/main/webapp/images/logo-xsmall.png create mode 100644 wise-webapp/webdefault.xml diff --git a/wise-webapp/src/license.txt b/license.txt similarity index 100% rename from wise-webapp/src/license.txt rename to license.txt diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 3752575d..ee3261c7 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -209,8 +209,9 @@ mindplot.widget.Menu = new Class({ this._addButton('print', false, false, function() { - printMap(); + window.open('c/print.htm?mapId=' + mapId) }); + this._registerTooltip('print', "Print"); this._addButton('zoomIn', false, false, function() { diff --git a/wise-editor/src/main/webapp/css/embedded.less b/wise-editor/src/main/webapp/css/embedded.less index 507d6d4a..98c761c4 100644 --- a/wise-editor/src/main/webapp/css/embedded.less +++ b/wise-editor/src/main/webapp/css/embedded.less @@ -23,10 +23,81 @@ div#footer { } div#footerLogo { - height: 65px; - width: 80px; + width: 114px; + height: 56px; position: absolute; - background: url(../images/logo-small.png) no-repeat right top; + display: list-item; + list-style-image: url(../images/logo-xsmall.png); + list-style-position: inside; right: 10px; - top: -50px; -} \ No newline at end of file + top: -30px; +} + +div#zoomIn { + background: url(../images/zoom-in.png) no-repeat left top; + margin-top: 10px; + margin-left: 10px; +} + +#zoomOut { + background: url(../images/zoom-out.png) no-repeat left top;; + margin-top: 10px; + margin-left: 5px; +} + + +.button { + width: 20px; + height: 20px; + float: left; + cursor: pointer; + white-space: nowrap; + margin: 1px; +} + +.button:hover { + float: left; + cursor: pointer; + border: 1px solid black; + border-top-color: white; + border-left-color: white; + margin: 0; +} + +div#mapDetails { + float: right; + padding-top: 10px; + margin-right: 130px; + +} + +div#mapDetails .title { + font-weight: bold; + margin-left: 10px; + margin-right: 3px; +} + +div#infoPanel { + border: 2px black solid; + position: absolute; + background: gray; + width: 100px; + height: 300px; + z-index: 100; + padding: 5px; + border-radius: 8px; + top: 150px; + right: 10px; + text-align: center; +} + +div#infoPanel .textNode { + background-color: #E0E5EF; + height: 20px; + width: 80px; + border: 3px #023BB9 solid; + padding: 4px; + cursor: move +} + + diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index d8c6c918..68eecd27 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -467,6 +467,15 @@ 9999 ${project.build.directory}/wisemapping.war automatic + + webdefault.xml + + + + org.mortbay.util.FileResource.checkAliases + false + + diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java index 95a35c19..106d775f 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java @@ -58,8 +58,6 @@ public class MindmapEditorController extends BaseMultiActionController { view.addObject("editorTryMode", false); final boolean showHelp = isWelcomeMap(mindmap); view.addObject("showHelp", showHelp); - final String xmlMap = mindmap.getXmlAsJsLiteral(); - view.addObject(MAP_XML_PARAM, xmlMap); view.addObject("user", Utils.getUser()); } return view; diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java index 3212eb19..93a8c278 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java @@ -225,7 +225,7 @@ public class MindMap { result.append(""); result.append(""); + result.append("\"/>"); return result.toString(); } diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java index cefa7e2b..18f32c1d 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java @@ -33,14 +33,8 @@ public class MindmapController { return new ModelAndView("mindmapExport", "mindmap", modelObject); } - @RequestMapping(value = "edit") - public ModelAndView edit(@RequestParam(required = true) long mapId) { - final MindMapBean modelObject = findMindmapBean(mapId); - return new ModelAndView("mindmapEditor", "wisemapsList", modelObject); - } - @RequestMapping(value = "collaborator") - public ModelAndView collaborator(@RequestParam(required = true) long mapId) { + public ModelAndView showCollaborator(@RequestParam(required = true) long mapId) { final MindMapBean modelObject = findMindmapBean(mapId); return new ModelAndView("mindmapCollaborator", "mindmap", modelObject); } @@ -52,13 +46,21 @@ public class MindmapController { } @RequestMapping(value = "detail") - public ModelAndView detail(@RequestParam(required = true) long mapId) { + public ModelAndView showDetails(@RequestParam(required = true) long mapId) { final MindMapBean modelObject = findMindmapBean(mapId); final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", modelObject); view.addObject("user", Utils.getUser()); return view; } + @RequestMapping(value = "print") + public ModelAndView showPrintPage(@RequestParam(required = true) long mapId) { + final MindMap mindmap = findMindmap(mapId); + final ModelAndView view = new ModelAndView("mindmapPrint", "mindmap", mindmap); + view.addObject("user", Utils.getUser()); + return view; + } + @RequestMapping(value = "changeStatus") public ModelAndView changeStatus(@RequestParam(required = true) long mapId) throws WiseMappingException { final MindMap mindmap = findMindmap(mapId); @@ -68,14 +70,6 @@ public class MindmapController { return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap)); } - @RequestMapping(value = "editMindmap") - public ModelAndView editMindmap(@RequestParam(required = true) long mapId) throws WiseMappingException { - final MindMapBean mindmap = findMindmapBean(mapId); - final ModelAndView view = new ModelAndView("editMindmap", "mindmap", mindmap); - view.addObject("user", Utils.getUser()); - return view; - } - @RequestMapping(value = "mymaps") public ModelAndView list(@NotNull HttpServletRequest request) { final HttpSession session = request.getSession(false); diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index df59bb32..307fc8ac 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -330,4 +330,5 @@ INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here INVALID_EMAIL_ERROR = The e-mail was not verified BROWSER_NOT_SUPPOERTED= Current Browser is not supported. -CHECK_BROWSERS= You can check supported browser at \ No newline at end of file +CHECK_BROWSERS= You can check supported browser at +NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml index 035ad00a..60e8564c 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml @@ -43,7 +43,7 @@ diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index a11f4af7..2369b033 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -13,10 +13,9 @@ - - + + + diff --git a/wise-webapp/src/main/webapp/css/embedded.less b/wise-webapp/src/main/webapp/css/embedded.less new file mode 120000 index 00000000..f71cb6bf --- /dev/null +++ b/wise-webapp/src/main/webapp/css/embedded.less @@ -0,0 +1 @@ +../../../../../wise-editor/src/main/webapp/css/embedded.less \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/print.css b/wise-webapp/src/main/webapp/css/print.css deleted file mode 100644 index 58c7f6c9..00000000 --- a/wise-webapp/src/main/webapp/css/print.css +++ /dev/null @@ -1,23 +0,0 @@ -@import "../css/common.css"; - -div#printHeader { - background-color: black; - height: 55px; - color: white; -} - -div#printFooter { - height: 60px; - width: 100%; - background: #E5E5E5; - border-top: 1px solid #bbb4d6; -} - -div#printLogo { - height: 80px; - width: 170px; - float: right; - margin: 1px; - background: url(../images/logo-medium.png) no-repeat right top; -} - diff --git a/wise-webapp/src/main/webapp/css/viewmode.css b/wise-webapp/src/main/webapp/css/viewmode.css deleted file mode 100644 index ef5a90eb..00000000 --- a/wise-webapp/src/main/webapp/css/viewmode.css +++ /dev/null @@ -1,117 +0,0 @@ -html { - overflow: hidden; -} - -#waitDialog { - position: absolute; - top: 10px; - left: 10px; - height: 100px; -} - -#loadingContainer { - position: relative; - top: 80px; - height: 120px; - background: #FEFEFE; - opacity: .99; - padding: 15px; - width: 100%; - border: 1px solid; - border-color: #a9a9a9; - -} - -#loadingContainer .loadingText { - position: relative; - top: 50%; - margin-top: -35px; - font-size: 30px; - font-weight: bold; - vertical-align: text-bottom; - height: 30px; - float: left; -} - -#loadingContainer .loadingIcon { - position: relative; - background: url(../images/ajax-loader2.gif) no-repeat; - top: 25px; - height: 100px; - width: 70px; - float: left; - clear: both; -} - -/* ------------- Footer Styles -------------------------*/ -div# - { - position: absolute; - height: 35px; - width: 100%; - bottom: 0; - left: 0; - border-top: 1px solid black; - background: #E5E5E5; - font-family: Arial; -} - -div#logo { - height: 65px; - width: 80px; - position: absolute; - background: url(../images/logo-small.png) no-repeat right top; - right: 10px; - top: -10px; -} - -.button { - width: 20px; - height: 20px; - float: left; - cursor: pointer; - white-space: nowrap; - margin: 1px; -} - -.button:hover { - float: left; - cursor: pointer; - border: 1px solid black; - border-top-color: white; - border-left-color: white; - margin: 0; - -} - -div#zoomIn { - background: url(../images/zoom-in.png) no-repeat left top; - margin-top: 10px; - margin-left: 10px; -} - -#zoomOut { - background: url(../images/zoom-out.png) no-repeat left top;; - margin-top: 10px; - margin-left: 5px; -} - -div#mindplot { - position: relative; - top: 0; - left: 0; - width: 100%; -} - -div#mapDetails { - float: right; - padding-top: 10px; - margin-right: 100px; - -} - -div#mapDetails .title { - font-weight: bold; - margin-left: 10px; - margin-right: 3px; -} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/images/logo-xsmall.png b/wise-webapp/src/main/webapp/images/logo-xsmall.png new file mode 100644 index 0000000000000000000000000000000000000000..98ee18dfaf83afa96e361e27df7b172723cbb873 GIT binary patch literal 13314 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 - : + @@ -47,7 +47,7 @@ - : + @@ -58,7 +58,7 @@ - + @@ -79,9 +79,7 @@ - - diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 82e60502..d4652375 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -2,7 +2,8 @@ <%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%> <%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%> -<%--@elvariable id="user" type="com.wisemapping.model.User"--%> +<%--@elvariable id="editorTryMode" type="java.lang.String"--%> +<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%> <%@ include file="/jsp/init.jsp" %> @@ -32,7 +33,7 @@ $(document).addEvent('loadcomplete', function(resource) { var mapId = '${mindmap.id}'; - var mapXml = '${mapXml}'; + var mapXml = '${mindmap.xmlAsJsLiteral}'; // Configure designer options ... var options = loadDesignerOptions(); diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp index 1abf5e56..0532510a 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp @@ -13,37 +13,43 @@ - - - + - - - + - - - + @@ -55,17 +61,18 @@ - -

- -

+ " class="btn-primary"> " class="btn-secondary" - onclick=""> + onclick="MooDialog.Request.active.close()"> diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 13ca74b1..b269512f 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -79,7 +79,7 @@
- "> + ">
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp index 8a4db9e9..dcfc7f8c 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp @@ -1,7 +1,15 @@ + + +<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%> +<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%> +<%--@elvariable id="editorTryMode" type="java.lang.String"--%> +<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%> + <%@ page import="java.text.DateFormat" %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.Calendar" %> + <%@ include file="/jsp/init.jsp" %> <% @@ -10,82 +18,119 @@ DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale()); String todayString = dateFormat.format(calendar.getTime()); %> - + + <spring:message code="SITE.TITLE"/> - ${mindmap.title} + + - <spring:message code="SITE.TITLE"/> - ${mindmap.title} - - - - + + + + + + + - - - - - - + + - + - - - - -
- -
${mindmap.title} (<%=todayString%>)
-
-
+
+ <%--
--%> + <%--
--%> + <%--
--%>
-
+ + +
+ + + + +
+
+ +
+ :${mindmap.creator} + :${mindmap.title} +
+
+
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp index a6873fa0..56833fc4 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp @@ -2,15 +2,13 @@
-
+

- -

- +

@@ -18,7 +16,7 @@ diff --git a/wise-webapp/webdefault.xml b/wise-webapp/webdefault.xml new file mode 100644 index 00000000..a7b4a6b6 --- /dev/null +++ b/wise-webapp/webdefault.xml @@ -0,0 +1,15 @@ + + + + + default + org.eclipse.jetty.servlet.DefaultServlet + + aliases + true + + + \ No newline at end of file
* - : + @@ -28,7 +26,7 @@
* - : + @@ -38,7 +36,7 @@
* - : + @@ -48,7 +46,7 @@
* - : + @@ -58,7 +56,7 @@
* - : + @@ -68,7 +66,7 @@
* - : + @@ -81,7 +79,7 @@ - ${requestScope.captchaHtml} + ${requestScope.captchaHtml}