jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject [jspwiki] branch master updated: Adding FAVICON to the haddock template
Date Thu, 19 Apr 2018 17:33:42 GMT
This is an automated email from the ASF dual-hosted git repository.

brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new a4a518f  Adding FAVICON to the haddock template
a4a518f is described below

commit a4a518f10cbe4c8a5a97a6dc7b06a7e0ccc0fa50
Author: brushed <dirk.frederickx@gmail.com>
AuthorDate: Thu Apr 19 19:33:26 2018 +0200

    Adding FAVICON to the haddock template
---
 ChangeLog                                          |   4 ++
 .../src/main/java/org/apache/wiki/Release.java     |   2 +-
 jspwiki-war/src/main/webapp/Edit.jsp               |   2 +-
 .../webapp/favicons/android-chrome-192x192.png     | Bin 0 -> 10293 bytes
 .../webapp/favicons/android-chrome-512x512.png     | Bin 0 -> 32196 bytes
 .../src/main/webapp/favicons/apple-touch-icon.png  | Bin 0 -> 9767 bytes
 .../src/main/webapp/favicons/browserconfig.xml     |   9 +++++
 .../src/main/webapp/favicons/favicon-16x16.png     | Bin 0 -> 1284 bytes
 .../src/main/webapp/favicons/favicon-32x32.png     | Bin 0 -> 1720 bytes
 jspwiki-war/src/main/webapp/favicons/favicon.ico   | Bin 0 -> 15086 bytes
 .../webapp/favicons/feather-jspwiki-source-cut.png | Bin 0 -> 95061 bytes
 .../src/main/webapp/favicons/feather-source.png    | Bin 0 -> 138140 bytes
 .../src/main/webapp/favicons/mstile-150x150.png    | Bin 0 -> 3474 bytes
 .../src/main/webapp/favicons/safari-pinned-tab.svg |  43 +++++++++++++++++++++
 .../src/main/webapp/favicons/site.webmanifest      |  19 +++++++++
 .../src/main/webapp/templates/haddock/DiffTab.jsp  |   2 +-
 .../src/main/webapp/templates/haddock/Nav.jsp      |   4 +-
 .../webapp/templates/haddock/PreferencesTab.jsp    |   3 +-
 .../main/webapp/templates/haddock/commonheader.jsp |  32 ++++++++-------
 .../main/webapp/templates/reader/ViewTemplate.jsp  |  14 +++++--
 20 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cb10c4..4ece39f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-19  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.4-git-07 Adding a favicon to the haddock template
+
 2018-04-11  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.4-git-06  JSPWIKI-1069 i18n errors in german translation
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index f5bf8a3..35bca38 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of
diff --git a/jspwiki-war/src/main/webapp/Edit.jsp b/jspwiki-war/src/main/webapp/Edit.jsp
index 3727204..f25e772 100644
--- a/jspwiki-war/src/main/webapp/Edit.jsp
+++ b/jspwiki-war/src/main/webapp/Edit.jsp
@@ -69,7 +69,7 @@
     String append  = request.getParameter("append");
     String edit    = request.getParameter("edit");
     String author  = TextUtil.replaceEntities( findParam( pageContext, "author" ) );
-    String changenote = TextUtil.replaceEntities( findParam( pageContext, "changenote" )
);
+    String changenote = findParam( pageContext, "changenote" );
     String text    = EditorManager.getEditedText( pageContext );
     String link    = TextUtil.replaceEntities( findParam( pageContext, "link") );
     String spamhash = findParam( pageContext, SpamFilter.getHashFieldName(request) );
diff --git a/jspwiki-war/src/main/webapp/favicons/android-chrome-192x192.png b/jspwiki-war/src/main/webapp/favicons/android-chrome-192x192.png
new file mode 100644
index 0000000..0ac9935
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/android-chrome-192x192.png
differ
diff --git a/jspwiki-war/src/main/webapp/favicons/android-chrome-512x512.png b/jspwiki-war/src/main/webapp/favicons/android-chrome-512x512.png
new file mode 100644
index 0000000..8ea2659
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/android-chrome-512x512.png
differ
diff --git a/jspwiki-war/src/main/webapp/favicons/apple-touch-icon.png b/jspwiki-war/src/main/webapp/favicons/apple-touch-icon.png
new file mode 100644
index 0000000..7167d5f
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/apple-touch-icon.png differ
diff --git a/jspwiki-war/src/main/webapp/favicons/browserconfig.xml b/jspwiki-war/src/main/webapp/favicons/browserconfig.xml
new file mode 100644
index 0000000..ed5dd79
--- /dev/null
+++ b/jspwiki-war/src/main/webapp/favicons/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="favicon/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/jspwiki-war/src/main/webapp/favicons/favicon-16x16.png b/jspwiki-war/src/main/webapp/favicons/favicon-16x16.png
new file mode 100644
index 0000000..f47b1dd
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/favicon-16x16.png differ
diff --git a/jspwiki-war/src/main/webapp/favicons/favicon-32x32.png b/jspwiki-war/src/main/webapp/favicons/favicon-32x32.png
new file mode 100644
index 0000000..5b44eff
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/favicon-32x32.png differ
diff --git a/jspwiki-war/src/main/webapp/favicons/favicon.ico b/jspwiki-war/src/main/webapp/favicons/favicon.ico
new file mode 100644
index 0000000..db86a35
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/favicon.ico differ
diff --git a/jspwiki-war/src/main/webapp/favicons/feather-jspwiki-source-cut.png b/jspwiki-war/src/main/webapp/favicons/feather-jspwiki-source-cut.png
new file mode 100644
index 0000000..6b5989d
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/feather-jspwiki-source-cut.png
differ
diff --git a/jspwiki-war/src/main/webapp/favicons/feather-source.png b/jspwiki-war/src/main/webapp/favicons/feather-source.png
new file mode 100644
index 0000000..744b8d7
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/feather-source.png differ
diff --git a/jspwiki-war/src/main/webapp/favicons/mstile-150x150.png b/jspwiki-war/src/main/webapp/favicons/mstile-150x150.png
new file mode 100644
index 0000000..2143711
Binary files /dev/null and b/jspwiki-war/src/main/webapp/favicons/mstile-150x150.png differ
diff --git a/jspwiki-war/src/main/webapp/favicons/safari-pinned-tab.svg b/jspwiki-war/src/main/webapp/favicons/safari-pinned-tab.svg
new file mode 100644
index 0000000..e65c5a5
--- /dev/null
+++ b/jspwiki-war/src/main/webapp/favicons/safari-pinned-tab.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="757.000000pt" height="757.000000pt" viewBox="0 0 757.000000 757.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,757.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M5925 7544 c-72 -39 -268 -174 -295 -204 -3 -3 -34 -30 -70 -60 -124
+-104 -454 -427 -614 -600 -38 -41 -90 -97 -115 -125 -26 -27 -76 -84 -111
+-125 -36 -41 -72 -82 -80 -90 -8 -8 -40 -44 -69 -80 -30 -36 -61 -72 -70 -80
+-9 -9 -45 -51 -81 -95 -35 -44 -67 -82 -70 -85 -5 -5 -151 -182 -227 -276
+-257 -319 -621 -793 -859 -1119 -71 -96 -469 -657 -506 -711 -26 -38 -77 -112
+-113 -164 -62 -89 -568 -847 -647 -970 -19 -30 -83 -131 -143 -225 -59 -93
+-118 -186 -130 -205 -35 -53 -78 -123 -91 -145 -6 -11 -84 -139 -174 -285
+-166 -272 -302 -497 -309 -515 -2 -5 -21 -38 -42 -71 -39 -64 -242 -416 -298
+-518 -48 -85 -90 -159 -101 -176 -6 -8 -13 -22 -17 -30 -3 -8 -34 -64 -68
+-125 -34 -60 -82 -148 -107 -195 -25 -47 -68 -127 -96 -178 l-50 -92 923 0
+924 0 119 238 c214 426 470 920 572 1107 15 28 48 88 73 135 58 109 158 295
+184 340 11 20 39 71 62 114 23 43 51 92 61 109 10 18 39 68 63 112 419 757
+1006 1705 1450 2345 36 52 92 133 124 179 32 46 83 118 114 160 152 209 254
+346 259 351 3 3 41 52 85 110 108 142 360 459 439 551 17 19 40 46 51 60 54
+64 199 229 202 229 2 0 -31 -42 -72 -92 -72 -88 -416 -544 -498 -659 -21 -30
+-74 -106 -119 -169 -45 -63 -150 -218 -235 -345 -84 -126 -156 -235 -161 -241
+-4 -5 -13 -19 -19 -30 -7 -10 -45 -68 -84 -129 -39 -60 -101 -158 -137 -216
+-147 -232 -306 -491 -311 -503 -2 -6 -16 -29 -31 -51 -48 -71 -520 -880 -520
+-891 0 -2 -11 -21 -24 -42 -34 -54 -355 -639 -476 -867 -29 -55 -65 -122 -80
+-150 -15 -27 -54 -102 -87 -165 -34 -63 -87 -164 -118 -225 -69 -130 -557
+-1103 -632 -1258 l-52 -107 1568 0 1568 0 23 58 c117 299 204 557 226 667 2
+11 10 48 17 82 9 41 10 60 3 56 -6 -4 -29 -19 -52 -34 -58 -39 -202 -110 -313
+-153 -142 -56 -402 -137 -491 -152 -14 -3 -42 -9 -63 -15 -21 -6 -50 -12 -65
+-14 -15 -2 -49 -8 -77 -14 -27 -5 -51 -8 -52 -7 -2 1 34 20 79 42 130 62 296
+153 388 212 76 49 217 148 230 162 3 3 21 18 40 34 110 89 281 271 386 411 74
+99 299 439 377 570 7 11 26 42 43 70 37 58 187 315 231 395 73 132 94 171 153
+280 62 116 330 653 330 663 0 2 20 47 44 98 164 351 340 830 411 1121 35 144
+78 354 90 438 4 24 8 47 10 50 1 3 6 36 10 73 3 37 8 78 10 89 14 70 20 216
+20 463 0 276 -5 372 -26 490 -6 33 -13 72 -15 88 -6 49 -54 240 -80 322 -103
+315 -292 592 -565 824 -86 73 -105 87 -207 146 l-86 50 -306 3 -305 2 -50 -26z"/>
+</g>
+</svg>
diff --git a/jspwiki-war/src/main/webapp/favicons/site.webmanifest b/jspwiki-war/src/main/webapp/favicons/site.webmanifest
new file mode 100644
index 0000000..399831f
--- /dev/null
+++ b/jspwiki-war/src/main/webapp/favicons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "JSPWiki",
+    "short_name": "JSPWiki",
+    "icons": [
+        {
+            "src": "android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp b/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
index 0268701..f7986dc 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
@@ -64,7 +64,7 @@
     </div>
   </c:if>
 
-  <wiki:InsertDiff><i><fmt:message key="diff.nodiff"/></i></wiki:InsertDiff>
+  <wiki:InsertDiff><p></p><p class="warning"><fmt:message key="diff.nodiff"/></p></wiki:InsertDiff>
 
 </form>
 </wiki:PageExists>
\ No newline at end of file
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp b/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
index 8492081..9d01607 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
@@ -56,6 +56,7 @@
   <%-- attachment --%>
   <wiki:CheckRequestContext context='view|info|rename|diff|rename|edit|comment|conflict'>
   <wiki:PageExists>
+  <c:if test="${param.tab ne 'attach'}"><%-- context upload -> context view&tab=attach
... --%>
   <li id="attach"
    class="<wiki:Permission permission='!upload'>disabled</wiki:Permission>">
     <wiki:Link page="${page}" context="upload" accessKey="a" >
@@ -63,6 +64,7 @@
       <c:if test="${attachments > 0}"><span class="badge">${attachments}</span></c:if>
     </wiki:Link>
   </li>
+  </c:if>
   </wiki:PageExists>
   </wiki:CheckRequestContext>
 
@@ -129,7 +131,7 @@
   </wiki:CheckRequestContext>
   <wiki:CheckRequestContext context='edit|comment'>
   <li>
-    <a class="slimbox-link" href="<wiki:Link format='url' page='EditPageHelp' ><wiki:Param
name='skin' value='reader'/></wiki:Link>">
+    <a class="slimbox-link" href="<wiki:Link format='url' page='EditPageHelp' ></wiki:Link>">
       <fmt:message key="edit.tab.help" />
     </a>
     <%--
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp b/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
index 30523bd..bc15789 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
@@ -144,12 +144,11 @@
   </c:if>
 
   <c:if test='${not empty languages}'>
-  <c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>"
/></c:set>
   <div class="form-group">
     <label class="control-label form-col-20" for="prefLanguage"><fmt:message key="prefs.user.language"/></label>
     <select id="prefLanguage" name="prefLanguage" data-pref="Language">
       <c:forEach items='${languages}' var='lg'>
-        <option value="<c:out value='${lg.key}'/>" ${fn:startsWith(prefLanguage,lg.key)
? 'selected="selected"' : ''} >${lg.value}</option>
+        <option value="<c:out value='${lg.key}'/>" ${fn:startsWith(prefs.Language,lg.key)
? 'selected="selected"' : ''} >${lg.value}</option>
       </c:forEach>
     </select>
   </div>
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp b/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
index 2d3d1e0..7fc9668 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
@@ -42,10 +42,13 @@
 BOOTSTRAP, IE compatibility / http://getbootstrap.com/getting-started/#support-ie-compatibility-modes
 --%>
 <meta charset="<wiki:ContentEncoding />">
-<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />"
/>
 <meta http-equiv="x-ua-compatible" content="ie=edge" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
+<%-- COOKIE read client preferences --%>
+<%
+   Preferences.setupPreferences(pageContext);
+%>
 
 <%-- Localized JS; must come before any css, to avoid blocking immediate execution --%>
 <%-- var LocalizedStrings= { "javascript.<xx>":"...", etc. } --%>
@@ -69,16 +72,13 @@ String.I18N.PREFIX = "javascript.";
 
 
 
-<%-- COOKIE read client preferences --%>
-<%
-   Preferences.setupPreferences(pageContext);
-%>
 <meta name="wikiContext" content='<wiki:Variable var="requestcontext" />' />
 <wiki:Permission permission="edit"><meta name="wikiEditPermission" content="true"/></wiki:Permission>
 <meta name="wikiBaseUrl" content='<wiki:BaseURL />' />
 <meta name="wikiPageUrl" content='<wiki:Link format="url"  page="#$%"/>' />
 <meta name="wikiEditUrl" content='<wiki:EditLink format="url" page="#$%"/>' />
 <meta name="wikiCloneUrl" content='<wiki:EditLink format="url" page="#$%"/>&clone=<wiki:Variable
var="pagename" />' />
+<meta name="wikiAttachmentUrl" content='<wiki:Link format="url" page="#$%/#$%.#$%"/>'
/>
 <meta name="wikiJsonUrl" content='<%=  WikiContext.findContext(pageContext).getURL(
WikiContext.NONE, "ajax" ) %>' /><%--unusual pagename--%>
 <meta name="wikiPageName" content='<wiki:Variable var="pagename" />' /><%--pagename
without blanks--%>
 <meta name="wikiUserName" content='<wiki:UserName />' />
@@ -103,17 +103,21 @@ String.I18N.PREFIX = "javascript.";
     title='Search <wiki:Variable var="ApplicationName" />' />
 <link rel="help"   href="<wiki:LinkTo format='url' page='TextFormattingRules'/>"
     title="Help" />
-<%
-  WikiContext c = WikiContext.findContext( pageContext );
-  String frontpage = c.getEngine().getFrontPage();
-%>
-<link rel="start"  href="<wiki:LinkTo format='url' page='<%=frontpage%>' />"
-    title="Front page" />
+<c:set var="frontpage"><wiki:Variable var="jspwiki.frontPage" /></c:set>
+<link rel="start"  href="<wiki:Link page='${frontpage}' format='url' />" title="Front
page" />
 <link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='haddock.css'/>"
     title="Standard" />
-<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>"
/>
-<%-- ie6 needs next line --%>
-<link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>"
/>
+
+<%-- Generated by https://realfavicongenerator.net/ --%>
+<link rel="apple-touch-icon" sizes="180x180" href="favicons/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicons/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="favicons/favicon-16x16.png">
+<link rel="manifest" href="favicons/site.webmanifest">
+<link rel="mask-icon" href="favicons/safari-pinned-tab.svg" color="#da532c">
+<link rel="shortcut icon" href="favicons/favicon.ico">
+<meta name="msapplication-TileColor" content="#da532c">
+<meta name="msapplication-config" content="favicons/browserconfig.xml">
+<meta name="theme-color" content="#ffffff">
 
 <%-- Support for the universal edit button (www.universaleditbutton.org) --%>
 <wiki:CheckRequestContext context='view|info|diff|upload'>
diff --git a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
index 9532e60..ae1e7a5 100644
--- a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
@@ -59,9 +59,17 @@ String.I18N.PREFIX = "javascript.";
 <meta name="wikiXHRPreview" content='<wiki:Link format="url" templatefile="../default/AJAXPreview.jsp"
/>' />
 <meta name="wikiXHRCategories" content='<wiki:Link format="url" templatefile="../default/AJAXCategories.jsp"
/>' />
 
-<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>"
/>
-<%-- ie6 needs next line --%>
-<link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>"
/>
+<%-- Generated by https://realfavicongenerator.net/ --%>
+<link rel="apple-touch-icon" sizes="180x180" href="favicons/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicons/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="favicons/favicon-16x16.png">
+<link rel="manifest" href="favicons/site.webmanifest">
+<link rel="mask-icon" href="favicons/safari-pinned-tab.svg" color="#da532c">
+<link rel="shortcut icon" href="favicons/favicon.ico">
+<meta name="msapplication-TileColor" content="#da532c">
+<meta name="msapplication-config" content="favicons/browserconfig.xml">
+<meta name="theme-color" content="#ffffff">
+
 <meta name="robots" content="noindex,nofollow" />
 
 <%-- FIXME: for now, reuse haddock's stylesheet --%>

-- 
To stop receiving notification emails like this one, please contact
brushed@apache.org.

Mime
View raw message