You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2022/07/14 18:00:06 UTC

[jspwiki] 05/07: add default application name on element to templates' templates</h1><pre>This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git commit fb705250c96ac2129d431b059242821ccd646b6a Author: Juan Pablo Santos Rodríguez <ju...@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="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://jspwiki.apache.org"> <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><hr/> </body> </html>