[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1150 Better handling of 404 page

[Sergey Shepelevich]

Sergey Shepelevich pushed to branch master at cms-community / hippo-essentials


Commits:
bbdd9c7f by Sergey Shepelevich at 2018-01-15T14:15:44+01:00
ESSENTIALS-1150 Better handling of 404 page

- - - - -


3 changed files:

- 
plugins/skeleton-package/src/main/resources/instructions/content/pagenotfound-labels.xml
- 
plugins/skeleton-package/src/main/resources/instructions/freemarker/pagenotfound-main.ftl
- 
plugins/skeleton-package/src/main/resources/instructions/jsp/pagenotfound-main.jsp


Changes:

=====================================
plugins/skeleton-package/src/main/resources/instructions/content/pagenotfound-labels.xml
=====================================
--- 
a/plugins/skeleton-package/src/main/resources/instructions/content/pagenotfound-labels.xml
+++ 
b/plugins/skeleton-package/src/main/resources/instructions/content/pagenotfound-labels.xml
@@ -71,7 +71,7 @@
     </sv:property>
     <sv:property sv:multiple="true" sv:name="resourcebundle:messages" 
sv:type="String">
       <sv:value>Page not found (404)</sv:value>
-      <sv:value>The page you requested was not found. - [This text can be 
edited &lt;a 
href="http://localhost:8080/cms/?1&amp;path=/content/documents/administration/labels/pagenotfound";
 target="_blank"&gt;here&lt;/a&gt;.]</sv:value>
+      <sv:value>The page you requested was not found. - [This text can be 
edited here: 
http://localhost:8080/cms/?1&amp;path=/content/documents/administration/labels/pagenotfound]</sv:value>
     </sv:property>
   </sv:node>
 </sv:node>


=====================================
plugins/skeleton-package/src/main/resources/instructions/freemarker/pagenotfound-main.ftl
=====================================
--- 
a/plugins/skeleton-package/src/main/resources/instructions/freemarker/pagenotfound-main.ftl
+++ 
b/plugins/skeleton-package/src/main/resources/instructions/freemarker/pagenotfound-main.ftl
@@ -3,7 +3,7 @@
 <@hst.setBundle basename="essentials.pagenotfound"/>
 <div>
   <h1><@fmt.message key="pagenotfound.title" var="title"/>${title?html}</h1>
-  <p><@fmt.message key="pagenotfound.text"/><#--Skip XML escaping--></p>
+  <p><@fmt.message key="pagenotfound.text" var="text"/>${text?html}</p>
 </div>
 <div>
   <@hst.include ref="container"/>


=====================================
plugins/skeleton-package/src/main/resources/instructions/jsp/pagenotfound-main.jsp
=====================================
--- 
a/plugins/skeleton-package/src/main/resources/instructions/jsp/pagenotfound-main.jsp
+++ 
b/plugins/skeleton-package/src/main/resources/instructions/jsp/pagenotfound-main.jsp
@@ -3,7 +3,7 @@
 <hst:setBundle basename="essentials.pagenotfound"/>
 <div>
   <h1><fmt:message key="pagenotfound.title" var="title"/><c:out 
value="${title}"/></h1>
-  <p><fmt:message key="pagenotfound.text"/><%--Skip XML escaping--%></p>
+  <p><fmt:message key="pagenotfound.text" var="text"/><c:out 
value="${text}"/></p>
 </div>
 <div>
   <hst:include ref="container"/>



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/bbdd9c7fc9f6047efd510200372e8573a1106b81

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/bbdd9c7fc9f6047efd510200372e8573a1106b81
You're receiving this email because of your account on code.onehippo.org.

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn