Improve public view

2024-11-21 21:57:56 +01:00 · 2021-12-26 09:23:51 -08:00 · 2021-12-26 09:23:51 -08:00 · 955a363ce5
commit 955a363ce5
parent fbc9a978f2
57 changed files with 75 additions and 91 deletions
--- a/wise-webapp/src/main/webapp/css/header.less
+++ b/wise-webapp/src/main/webapp/css/header.less
@ -90,17 +90,6 @@ div#headerNotifier {

@import "toolbar.less";

-div#embFooter {
-    position: absolute;
-    height: 35px;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid black;
-    background: #E5E5E5;
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-}
-
 /* FIXME: duplicate in mindmapList
 ---------------------------- Scrollbar --------------------------------- */
 ::-webkit-scrollbar {
--- a/wise-webapp/src/main/webapp/css/viewonly.less
+++ b/wise-webapp/src/main/webapp/css/viewonly.less
@ -27,14 +27,21 @@ div#footer {
 }

 div#footerLogo {
-    width: 114px;
-    height: 56px;
    position: absolute;
    display: list-item;
-    list-style-image: url(../../images/logo-xsmall.png);
+    list-style-image: url(../../images/pwrdby-white.svg);
    list-style-position: inside;
-    right: 10px;
-    top: -30px;
+    right: 5px;
+    top: 5px;
+}
+
+div#embFooter {
+    position: absolute;
+    height: 55px;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background: rgb(249, 168, 38)
 }

 div#zoomIn {
@ -69,9 +76,9 @@ div#zoomIn {

 div#mapDetails {
    float: right;
-    padding-top: 10px;
+    padding-top: 20px;
    margin-right: 130px;
-
+    font-size: 15px;
 }

 div#mapDetails .title {
@ -98,7 +105,6 @@ div#infoPanel .textNode {
    background-color: #E0E5EF;
    height: 20px;
    width: 80px;
-    border: 3px #023BB9 solid;
    padding: 4px;
    cursor: move
 }
--- a/wise-webapp/src/main/webapp/images/editor/ajax-loader.gif
+++ b/wise-webapp/src/main/webapp/images/editor/ajax-loader.gif
--- a/wise-webapp/src/main/webapp/images/editor/alert-sign.png
+++ b/wise-webapp/src/main/webapp/images/editor/alert-sign.png
--- a/wise-webapp/src/main/webapp/images/editor/btn-bg-hover.png
+++ b/wise-webapp/src/main/webapp/images/editor/btn-bg-hover.png
--- a/wise-webapp/src/main/webapp/images/editor/btn-bg-normal.png
+++ b/wise-webapp/src/main/webapp/images/editor/btn-bg-normal.png
--- a/wise-webapp/src/main/webapp/images/editor/btne-bg-hover.png
+++ b/wise-webapp/src/main/webapp/images/editor/btne-bg-hover.png
--- a/wise-webapp/src/main/webapp/images/editor/btne-bg-normal.png
+++ b/wise-webapp/src/main/webapp/images/editor/btne-bg-normal.png
--- a/wise-webapp/src/main/webapp/images/editor/btne-bg-selected.png
+++ b/wise-webapp/src/main/webapp/images/editor/btne-bg-selected.png
--- a/wise-webapp/src/main/webapp/images/editor/discard.png
+++ b/wise-webapp/src/main/webapp/images/editor/discard.png
--- a/wise-webapp/src/main/webapp/images/editor/editortoolbar.png
+++ b/wise-webapp/src/main/webapp/images/editor/editortoolbar.png
--- a/wise-webapp/src/main/webapp/images/editor/export.png
+++ b/wise-webapp/src/main/webapp/images/editor/export.png
--- a/wise-webapp/src/main/webapp/images/editor/favicon.ico
+++ b/wise-webapp/src/main/webapp/images/editor/favicon.ico
--- a/wise-webapp/src/main/webapp/images/editor/font-bold.png
+++ b/wise-webapp/src/main/webapp/images/editor/font-bold.png
--- a/wise-webapp/src/main/webapp/images/editor/font-color.png
+++ b/wise-webapp/src/main/webapp/images/editor/font-color.png
--- a/wise-webapp/src/main/webapp/images/editor/font-italic.png
+++ b/wise-webapp/src/main/webapp/images/editor/font-italic.png
--- a/wise-webapp/src/main/webapp/images/editor/font-size.png
+++ b/wise-webapp/src/main/webapp/images/editor/font-size.png
--- a/wise-webapp/src/main/webapp/images/editor/font-type.png
+++ b/wise-webapp/src/main/webapp/images/editor/font-type.png
--- a/wise-webapp/src/main/webapp/images/editor/history.png
+++ b/wise-webapp/src/main/webapp/images/editor/history.png
--- a/wise-webapp/src/main/webapp/images/editor/links.png
+++ b/wise-webapp/src/main/webapp/images/editor/links.png
--- a/wise-webapp/src/main/webapp/images/editor/logo-135x135.png
+++ b/wise-webapp/src/main/webapp/images/editor/logo-135x135.png
--- a/wise-webapp/src/main/webapp/images/editor/logo-head-only.png
+++ b/wise-webapp/src/main/webapp/images/editor/logo-head-only.png
--- a/wise-webapp/src/main/webapp/images/editor/logo-medium.png
+++ b/wise-webapp/src/main/webapp/images/editor/logo-medium.png
--- a/wise-webapp/src/main/webapp/images/editor/logo-small.png
+++ b/wise-webapp/src/main/webapp/images/editor/logo-small.png
--- a/wise-webapp/src/main/webapp/images/editor/logo-xsmall.png
+++ b/wise-webapp/src/main/webapp/images/editor/logo-xsmall.png
--- a/wise-webapp/src/main/webapp/images/editor/notes.png
+++ b/wise-webapp/src/main/webapp/images/editor/notes.png
--- a/wise-webapp/src/main/webapp/images/editor/print.png
+++ b/wise-webapp/src/main/webapp/images/editor/print.png
--- a/wise-webapp/src/main/webapp/images/editor/public.png
+++ b/wise-webapp/src/main/webapp/images/editor/public.png
--- a/wise-webapp/src/main/webapp/images/editor/redo.png
+++ b/wise-webapp/src/main/webapp/images/editor/redo.png
--- a/wise-webapp/src/main/webapp/images/editor/save.png
+++ b/wise-webapp/src/main/webapp/images/editor/save.png
--- a/wise-webapp/src/main/webapp/images/editor/shape-circle.png
+++ b/wise-webapp/src/main/webapp/images/editor/shape-circle.png
--- a/wise-webapp/src/main/webapp/images/editor/shape-line.png
+++ b/wise-webapp/src/main/webapp/images/editor/shape-line.png
--- a/wise-webapp/src/main/webapp/images/editor/shape-rectangle-round.png
+++ b/wise-webapp/src/main/webapp/images/editor/shape-rectangle-round.png
--- a/wise-webapp/src/main/webapp/images/editor/shape-rectangle.png
+++ b/wise-webapp/src/main/webapp/images/editor/shape-rectangle.png
--- a/wise-webapp/src/main/webapp/images/editor/share.png
+++ b/wise-webapp/src/main/webapp/images/editor/share.png
--- a/wise-webapp/src/main/webapp/images/editor/tag.png
+++ b/wise-webapp/src/main/webapp/images/editor/tag.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-add.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-add.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-border.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-border.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-color.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-color.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-delete.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-delete.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-icon.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-icon.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-link.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-link.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-note.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-note.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-relation.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-relation.png
--- a/wise-webapp/src/main/webapp/images/editor/topic-shape.png
+++ b/wise-webapp/src/main/webapp/images/editor/topic-shape.png
--- a/wise-webapp/src/main/webapp/images/editor/undo.png
+++ b/wise-webapp/src/main/webapp/images/editor/undo.png
--- a/wise-webapp/src/main/webapp/images/editor/zoom-in.png
+++ b/wise-webapp/src/main/webapp/images/editor/zoom-in.png
--- a/wise-webapp/src/main/webapp/images/editor/zoom-out.png
+++ b/wise-webapp/src/main/webapp/images/editor/zoom-out.png
--- a/wise-webapp/src/main/webapp/images/pwrdby-white.svg
+++ b/wise-webapp/src/main/webapp/images/pwrdby-white.svg
--- a/wise-webapp/src/main/webapp/jsp/commonPageHeader.jsf
+++ b/wise-webapp/src/main/webapp/jsp/commonPageHeader.jsf
@ -0,0 +1,23 @@
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="theme-color" content="#000000" />
+
+    <meta name="author" content="WiseMapping">
+    <meta name="publisher" content="WiseMapping">
+    <meta name="keywords"
+          content="mindmap,mind map,mind maps,mindmaps,ideas,brainstorming,organize,thoughts,structure,collaboration,free,fast,simple,online,tool,knowledge,share,sharing,publish">
+    <meta name="description"
+          content="WiseMapping is a free, fast and simple online mind mapping editor for individuals and business. Sign up to start organizing and sharing your ideas and thoughts.">
+
+    <meta property="og:title" content="WiseMapping"/>
+    <meta property="og:type" content="website"/>
+    <meta property="og:url" content="http://www.wisemapping.com"/>
+    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
+    <meta property="og:site_name" content="WiseMapping.com"/>
+
+    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
+    <link rel="apple-touch-icon" href="../../favicon.png" />
+    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <link rel="manifest" href="../../manifest.json" />
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
@ -3,8 +3,4 @@
 <c:if test="${requestScope['google.analytics.enabled']}">


-      ga('create', '${requestScope['google.analytics.account']}', 'wisemapping.com');
-      ga('send', 'pageview');
-
-    </script>
 </c:if>
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@ -16,8 +16,7 @@
    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
    <link rel="stylesheet/less" type="text/css" href="../../css/editor.less"/>
    <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+    <%@ include file="/jsp/commonPageHeader.jsf" %>

    <script type="text/javascript">
        var mapId = '${mindmap.id}';
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@ -7,13 +7,12 @@
 <html>
 <head>
    <base href="${requestScope['site.baseurl']}/static/mindplot/">
-    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
+    <title><spring:message code="SITE.TITLE"/> | Edit ${mindmap.title} </title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
-    <link rel="stylesheet/less" type="text/css" href="../../css/embedded.less"/>
+    <link rel="stylesheet/less" type="text/css" href="../../css/viewonly.less"/>
    <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <%@ include file="/jsp/commonPageHeader.jsf" %>

   <script type="text/javascript">
          var mapId = '${mindmap.id}';
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@ -7,14 +7,13 @@

 <html>
 <head>
-    <base href="${requestScope['site.baseurl']}/static/mindplot/">
-    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
-    <link rel="stylesheet/less" type="text/css" href="../../css/embedded.less"/>
+    <base href="${requestScope['site.baseurl']}/static/mindplot/">
+    <title><spring:message code="SITE.TITLE"/> | ${mindmap.title} </title>
+    <link rel="stylesheet/less" type="text/css" href="../../css/viewonly.less"/>
    <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <%@ include file="/jsp/commonPageHeader.jsf" %>

   <script type="text/javascript">
          var mapId = '${mindmap.id}';
--- a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
+++ b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
@ -6,15 +6,11 @@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <meta charset="utf-8" />
    <base href="${requestScope['site.baseurl']}/static/webapp/">
-    <link rel="icon" href="favicon.ico" />
    <link rel="preconnect" href="https://fonts.gstatic.com" />
    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;400;600&display=swap" rel="stylesheet" />

-    <meta name="viewport" content="width=device-width" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="WiseMapping" />
-    <link rel="apple-touch-icon" href="favicon.png" />
-    <link rel="manifest" href="manifest.json" />
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
+
    <title>Loading | WiseMapping</title>

    <script>
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@ -10,22 +10,8 @@

 <html>
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <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"
-          content="mindmap,mind map,mind maps,mindmaps,ideas,brainstorming,organize,thoughts,structure,collaboration,free,fast,simple,online,tool,knowledge,share,sharing,publish">
-    <meta name="description"
-          content="WiseMapping is a free, fast and simple online mind mapping editor for individuals and business. Sign up to start organizing and sharing your ideas and thoughts.">
-    <meta property="og:title" content="WiseMapping"/>
-    <meta property="og:type" content="website"/>
-    <meta property="og:url" content="http://www.wisemapping.com"/>
-    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
-    <meta property="og:site_name" content="WiseMapping.com"/>
-    <link rel="icon" href="favicon.ico?v=2" />
-
    <title>
        <spring:message code="SITE.TITLE"/>-
        <c:choose>
@ -37,15 +23,8 @@
            </c:otherwise>
        </c:choose>
    </title>
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
    <link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
-
-    <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" language="javascript" src="js/jquery.js"></script>
-
-    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
-    <script src="js/less.js" type="text/javascript"></script>
-    <script src='https://www.google.com/recaptcha/api.js'></script>
 </head>
 <body>

@ -57,34 +36,8 @@
                    <tiles:insertAttribute name="body"/>
                </div>
            </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>
 </div>
 </body>
 </html>
--- a/wise-webapp/src/main/webapp/manifest.json
+++ b/wise-webapp/src/main/webapp/manifest.json
@ -0,0 +1,19 @@
+{
+  "short_name": "WiseMapping",
+  "name": "WiseMapping",
+  "icons": [{
+    "src": "favicon.ico",
+    "sizes": "64x64 32x32 24x24 16x16",
+    "type": "image/x-icon"
+  },
+    {
+      "src": "favicon.png",
+      "type": "image/png",
+      "sizes": "1024x1024"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}