[jspwiki] 05/07: add default application name on element to templates' templates</span></a></span> </h1> <p class="darkgray font13"> <span class="sender pipe"><a href="/search?l=commits@jspwiki.apache.org&q=from:%22juanpablo%22" rel="nofollow"><span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">juanpablo</span></span></a></span> <span class="date"><a href="/search?l=commits@jspwiki.apache.org&q=date:20220714" rel="nofollow">Thu, 14 Jul 2022 11:00:13 -0700</a></span> </p> </div> <div itemprop="articleBody" class="msgBody"> <!--X-Body-of-Message--> <pre>This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository <a rel="nofollow" href="https://gitbox.apache.org/repos/asf/jspwiki.git">https://gitbox.apache.org/repos/asf/jspwiki.git</a></pre><pre> commit fb705250c96ac2129d431b059242821ccd646b6a Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com> AuthorDate: Thu Jul 14 19:46:46 2022 +0200 add default application name on <title> element to templates' templates --- jspwiki-war/src/main/webapp/Captcha.jsp | 2 +- jspwiki-war/src/main/webapp/Error.jsp | 2 +- jspwiki-war/src/main/webapp/admin/Admin.jsp | 2 +- jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jspwiki-war/src/main/webapp/Captcha.jsp b/jspwiki-war/src/main/webapp/Captcha.jsp index ed33fdf10..a594f8007 100644 --- a/jspwiki-war/src/main/webapp/Captcha.jsp +++ b/jspwiki-war/src/main/webapp/Captcha.jsp @@ -75,7 +75,7 @@ <html lang="<c:out value='${prefs.Language}' default='en'/>" name="top"> <head> - <title><wiki:Variable var="applicationname" />: <wiki:PageName /></title> + <title><wiki:Variable var="applicationname" default="Apache JSPWiki" />: <wiki:PageName /></title> <%-- <wiki:Include page="commonheader.jsp"/> --%> <meta name="robots" content="noindex,nofollow" /> <script type="text/javascript"> diff --git a/jspwiki-war/src/main/webapp/Error.jsp b/jspwiki-war/src/main/webapp/Error.jsp index 8e30ba85f..fae593237 100644 --- a/jspwiki-war/src/main/webapp/Error.jsp +++ b/jspwiki-war/src/main/webapp/Error.jsp @@ -70,7 +70,7 @@ <!doctype html> <html lang="<c:out value='${prefs.Language}' default='en'/>" name="top"> <head> - <title><wiki:Variable var="applicationname" />: ERROR Page</title> + <title><wiki:Variable var="applicationname" default="Apache JSPWiki" />: ERROR Page</title> </head> <body> diff --git a/jspwiki-war/src/main/webapp/admin/Admin.jsp b/jspwiki-war/src/main/webapp/admin/Admin.jsp index f1d52f0e9..1fc32bd4f 100644 --- a/jspwiki-war/src/main/webapp/admin/Admin.jsp +++ b/jspwiki-war/src/main/webapp/admin/Admin.jsp @@ -49,7 +49,7 @@ <!doctype html> <html lang="en"> <head> - <title><wiki:Variable var="applicationname" />: ADMIN UI</title> + <title><wiki:Variable var="applicationname" default="Apache JSPWiki" />: ADMIN UI</title> <base href="../"/> <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/> <wiki:IncludeResources type="stylesheet"/> diff --git a/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp b/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp index 5c1526903..220fab589 100644 --- a/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp +++ b/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp @@ -51,7 +51,7 @@ { %> <head> - <title><wiki:Variable var="applicationname" />: JSPWiki Security Configuration Verifier</title> + <title><wiki:Variable var="applicationname" default="Apache JSPWiki" />: JSPWiki Security Configuration Verifier</title> <base href="../"/> <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/> <wiki:IncludeResources type="stylesheet"/> @@ -77,7 +77,7 @@ %> <head> - <title><wiki:Variable var="applicationname" />: JSPWiki Security Configuration Verifier</title> + <title><wiki:Variable var="applicationname" default="Apache JSPWiki" />: JSPWiki Security Configuration Verifier</title> <base href="../"/> <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/> <wiki:IncludeResources type="stylesheet"/> diff --git a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp index 38d399dd1..91a8e2f1e 100644 --- a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp @@ -29,13 +29,13 @@ <title> <wiki:CheckRequestContext context="edit"> <fmt:message key="edit.title.edit"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </wiki:CheckRequestContext> <wiki:CheckRequestContext context="comment"> <fmt:message key="comment.title.comment"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp index 816df0f7c..04f091716 100644 --- a/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp @@ -36,7 +36,7 @@ <html lang="en" id="top" xmlns="<a rel="nofollow" href="http://www.w3.org/1999/xhtml"">http://www.w3.org/1999/xhtml"</a>; xmlns:jspwiki="<a rel="nofollow" href="http://jspwiki.apache.org"">http://jspwiki.apache.org"</a>;> <head> - <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></title> + <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname" default="Apache JSPWiki"/></fmt:param></fmt:message></title> <wiki:Include page="commonheader.jsp"/> <meta name="robots" content="noindex,nofollow" /> </head> diff --git a/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp index 451dbefa2..8decfc2f6 100644 --- a/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp @@ -28,7 +28,7 @@ <head> <title> <fmt:message key="view.title.view"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </title> diff --git a/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp index 2b6f10eee..87cb3a2e7 100644 --- a/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp @@ -28,13 +28,13 @@ <title> <wiki:CheckRequestContext context="edit"> <fmt:message key="edit.title.edit"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </wiki:CheckRequestContext> <wiki:CheckRequestContext context="comment"> <fmt:message key="comment.title.comment"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp index 5f1a7d2b5..1b3f00829 100644 --- a/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp @@ -28,7 +28,7 @@ <html lang="${prefs.Language}" name="top"> <head> - <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></title> + <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname" default="Apache JSPWiki"/></fmt:param></fmt:message></title> <wiki:Include page="commonheader.jsp"/> <meta name="robots" content="noindex,nofollow" /> </head> diff --git a/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp index 0f860d1eb..50c902d7b 100644 --- a/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp @@ -29,7 +29,7 @@ <title> <fmt:message key="view.title.view"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </title> diff --git a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp index ce41eb902..fc28259b4 100644 --- a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp +++ b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp @@ -28,7 +28,7 @@ <meta charset="<wiki:ContentEncoding />"> <title> <fmt:message key="view.title.view"> - <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param> + <fmt:param><wiki:Variable var="ApplicationName" default="Apache JSPWiki" /></fmt:param> <fmt:param><wiki:PageName /></fmt:param> </fmt:message> </title> </pre> </div> <div class="msgButtons margintopdouble"> <ul class="overflow"> <li class="msgButtonItems"><a class="button buttonleft " accesskey="p" href="msg04060.html">Previous message</a></li> <li class="msgButtonItems textaligncenter"><a class="button" accesskey="c" href="index.html#04061">View by thread</a></li> <li class="msgButtonItems textaligncenter"><a class="button" accesskey="i" href="maillist.html#04061">View by date</a></li> <li class="msgButtonItems textalignright"><a class="button buttonright " accesskey="n" href="msg04064.html">Next message</a></li> </ul> </div> <a name="tslice"></a> <div class="tSliceList margintopdouble"> <ul class="icons monospace"> <li class="icons-email"><span class="subject"><a href="msg04059.html">[jspwiki] branch master updated (52274290c -> 7d6097994)</a></span> <span class="sender italic">juanpablo</span></li> <li><ul> <li class="icons-email"><span class="subject"><a href="msg04058.html">[jspwiki] 01/07: Bring CSRF protection to group management ...</a></span> <span class="sender italic">juanpablo</span></li> <li class="icons-email"><span class="subject"><a href="msg04060.html">[jspwiki] 07/07: 2.11.3-git-10</a></span> <span class="sender italic">juanpablo</span></li> <li class="icons-email tSliceCur"><span class="subject">[jspwiki] 05/07: add default application name on <title&...</span> <span class="sender italic">juanpablo</span></li> <li class="icons-email"><span class="subject"><a href="msg04064.html">[jspwiki] 06/07: Main as default frontpage if none is defin...</a></span> <span class="sender italic">juanpablo</span></li> <li class="icons-email"><span class="subject"><a href="msg04065.html">[jspwiki] 03/07: Dependency updates</a></span> <span class="sender italic">juanpablo</span></li> <li class="icons-email"><span class="subject"><a href="msg04062.html">[jspwiki] 04/07: Update LICENSE's versions</a></span> <span class="sender italic">juanpablo</span></li> <li class="icons-email"><span class="subject"><a href="msg04063.html">[jspwiki] 02/07: use log placeholders</a></span> <span class="sender italic">juanpablo</span></li> </ul> </ul> </div> <div class="overflow msgActions margintopdouble"> <div class="msgReply" > <h2> Reply via email to </h2> <form method="POST" action="/mailto.php"> <input type="hidden" name="subject" value="[jspwiki] 05/07: add default application name on <title> element to templates' templates"> <input type="hidden" name="msgid" value="20220714180001.B6E6644029F@gitbox2-he-fi.apache.org"> <input type="hidden" name="relpath" value="commits@jspwiki.apache.org/msg04061.html"> <input type="submit" value=" juanpablo "> </form> </div> </div> </div> <div class="aside" role="complementary"> <div class="logo"> <a href="/"><img src="/logo.png" width=247 height=88 alt="The Mail Archive"></a> </div> <form class="overflow" action="/search" method="get"> <input type="hidden" name="l" value="commits@jspwiki.apache.org"> <label class="hidden" for="q">Search the site</label> <input class="submittext" type="text" id="q" name="q" placeholder="Search commits"> <input class="submitbutton" name="submit" type="image" src="/submit.png" alt="Submit"> </form> <div class="nav margintop" id="nav" role="navigation"> <ul class="icons font16"> <li class="icons-home"><a href="/">The Mail Archive home</a></li> <li class="icons-list"><a href="/commits@jspwiki.apache.org/">commits - all messages</a></li> <li class="icons-about"><a href="/commits@jspwiki.apache.org/info.html">commits - about the list</a></li> <li class="icons-expand"><a href="/search?l=commits@jspwiki.apache.org&q=subject:%22%5C%5Bjspwiki%5C%5D+05%5C%2F07%5C%3A+add+default+application+name+on+%3Ctitle%3E+element+to+templates%27+templates%22&o=newest&f=1" title="e" id="e">Expand</a></li> <li class="icons-prev"><a href="msg04060.html" title="p">Previous message</a></li> <li class="icons-next"><a href="msg04064.html" title="n">Next message</a></li> </ul> </div> <div class="listlogo margintopdouble"> </div> <div class="margintopdouble"> </div> </div> </div> <div class="footer" role="contentinfo"> <ul> <li><a href="/">The Mail Archive home</a></li> <li><a href="/faq.html#newlist">Add your mailing list</a></li> <li><a href="/faq.html">FAQ</a></li> <li><a href="/faq.html#support">Support</a></li> <li><a href="/faq.html#privacy">Privacy</a></li> <li class="darkgray">20220714180001.B6E6644029F@gitbox2-he-fi.apache.org</li> </ul> </div> </body> </html> <script>(function(){function c(){var b=a.contentDocument||a.contentWindow.document;if(b){var d=b.createElement('script');d.innerHTML="window.__CF$cv$params={r:'9cd925c14bcd51a8',t:'MTc3MTAzNjI2Nw=='};var a=document.createElement('script');a.src='/cdn-cgi/challenge-platform/scripts/jsd/main.js';document.getElementsByTagName('head')[0].appendChild(a);";b.getElementsByTagName('head')[0].appendChild(d)}}if(document.body){var a=document.createElement('iframe');a.height=1;a.width=1;a.style.position='absolute';a.style.top=0;a.style.left=0;a.style.border='none';a.style.visibility='hidden';document.body.appendChild(a);if('loading'!==document.readyState)c();else if(window.addEventListener)document.addEventListener('DOMContentLoaded',c);else{var e=document.onreadystatechange||function(){};document.onreadystatechange=function(b){e(b);'loading'!==document.readyState&&(document.onreadystatechange=e,c())}}}})();</script>