Commit e8191746 authored by Bert Leunis's avatar Bert Leunis

ESSENTIALS-1033 all containers to type hst.markup. included containers may...

ESSENTIALS-1033 all containers to type hst.markup. included containers may have no siblings in parent template.
parent 718e66fd
......@@ -27,7 +27,7 @@
<sv:value>Blog List Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Blog List Sidebar</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -30,7 +30,7 @@
<sv:value>Blog Page Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Blog Page Sidebar</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="blogauthorposts">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Event List Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="eventslist">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Event Page Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -26,7 +26,7 @@
<sv:value>Faq Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
</sv:node>
</sv:node>
......@@ -27,7 +27,7 @@
<sv:value>News List Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="newslist">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>News Page Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Content List Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="contentlist">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
......@@ -27,7 +27,7 @@
<sv:value>Content Page Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
<sv:node sv:name="content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
......
<#include "../include/imports.ftl">
<@hst.setBundle basename="essentials.global"/>
<@hst.include ref="container"/>
<div>
<@hst.include ref="container"/>
</div>
<hr/>
<div class="text-center">
<sub><@fmt.message key="footer.text" var="footer"/>${footer?html}</sub>
......
<!doctype html>
<#include "../include/imports.ftl">
<html lang="en">
<head>
<head>
<meta charset="utf-8"/>
<link rel="stylesheet" href="<@hst.webfile path="/css/bootstrap.css"/>" type="text/css"/>
<#if hstRequest.requestContext.cmsRequest>
<link rel="stylesheet" href="<@hst.webfile path="/css/cms-request.css"/>" type="text/css"/>
</#if>
<@hst.headContributions categoryExcludes="htmlBodyEnd, scripts" xhtml=true/>
</head>
<body>
<div class="container">
<div class="row">
<@hst.headContributions categoryExcludes="htmlBodyEnd, scripts" xhtml=true/>
</head>
<body>
<div class="container">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<@hst.include ref="top"/>
<@hst.include ref="menu"/>
<@hst.include ref="top"/>
</div>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<@hst.include ref="menu"/>
</div>
</div>
<div class="row">
<@hst.include ref="main"/>
</div>
<div class="row">
</div>
<div class="row">
<@hst.include ref="footer"/>
</div>
</div>
</div>
<@hst.headContributions categoryIncludes="htmlBodyEnd, scripts" xhtml=true/>
</body>
<@hst.headContributions categoryIncludes="htmlBodyEnd, scripts" xhtml=true/>
</body>
</html>
\ No newline at end of file
......@@ -4,10 +4,13 @@
<div>
<h1><@fmt.message key="homepage.title" var="title"/>${title?html}</h1>
<p><@fmt.message key="homepage.text" var="text"/>${text?html}</p>
<#if !hstRequest.requestContext.cmsRequest>
<p>
[This text can be edited <a href="http://localhost:8080/cms/?1&path=/content/documents/administration/labels/homepage" target="_blank">here</a>.]
</p>
</#if>
<#if !hstRequest.requestContext.cmsRequest>
<p>
[This text can be edited
<a href="http://localhost:8080/cms/?1&path=/content/documents/administration/labels/homepage" target="_blank">here</a>.]
</p>
</#if>
</div>
<@hst.include ref="container"/>
<div>
<@hst.include ref="container"/>
</div>
\ No newline at end of file
......@@ -5,4 +5,6 @@
<h1><@fmt.message key="pagenotfound.title" var="title"/>${title?html}</h1>
<p><@fmt.message key="pagenotfound.text"/><#--Skip XML escaping--></p>
</div>
<@hst.include ref="container"/>
<div>
<@hst.include ref="container"/>
</div>
<%@ include file="/WEB-INF/jsp/include/imports.jsp" %>
<hst:setBundle basename="essentials.global"/>
<hst:include ref="container"/>
<div>
<hst:include ref="container"/>
</div>
<hr/>
<div class="text-center">
<sub><fmt:message key="footer.text" var="footer"/><c:out value="${footer}"/></sub>
......
<!doctype html>
<%@ include file="/WEB-INF/jsp/include/imports.jsp" %>
<html lang="en">
<head>
<meta charset="utf-8"/>
<link rel="stylesheet" href="<hst:webfile path="/css/bootstrap.css"/>" type="text/css"/>
<c:if test="${hstRequest.requestContext.cmsRequest}">
<link rel="stylesheet" href="<hst:webfile path="/css/cms-request.css"/>" type="text/css"/>
</c:if>
<hst:headContributions categoryExcludes="htmlBodyEnd, scripts" xhtml="true"/>
</head>
<body>
<div class="container">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<hst:include ref="top"/>
<hst:include ref="menu"/>
<head>
<meta charset="utf-8"/>
<link rel="stylesheet" href="<hst:webfile path="/css/bootstrap.css"/>" type="text/css"/>
<c:if test="${hstRequest.requestContext.cmsRequest}">
<link rel="stylesheet" href="<hst:webfile path="/css/cms-request.css"/>" type="text/css"/>
</c:if>
<hst:headContributions categoryExcludes="htmlBodyEnd, scripts" xhtml="true"/>
</head>
<body>
<div class="container">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<hst:include ref="top"/>
</div>
<div class="col-md-6 col-md-offset-3">
<hst:include ref="menu"/>
</div>
</div>
<div class="row">
<hst:include ref="main"/>
</div>
<div class="row">
<hst:include ref="footer"/>
</div>
</div>
</div>
<div class="row">
<hst:include ref="main"/>
</div>
<div class="row">
<hst:include ref="footer"/>
</div>
</div>
<hst:headContributions categoryIncludes="htmlBodyEnd, scripts" xhtml="true"/>
</body>
<hst:headContributions categoryIncludes="htmlBodyEnd, scripts" xhtml="true"/>
</body>
</html>
\ No newline at end of file
......@@ -10,4 +10,6 @@
</p>
</c:if>
</div>
<hst:include ref="container"/>
<div>
<hst:include ref="container"/>
</div>
\ No newline at end of file
......@@ -5,4 +5,6 @@
<h1><fmt:message key="pagenotfound.title" var="title"/><c:out value="${title}"/></h1>
<p><fmt:message key="pagenotfound.text"/><%--Skip XML escaping--%></p>
</div>
<hst:include ref="container"/>
<div>
<hst:include ref="container"/>
</div>
......@@ -27,7 +27,7 @@
<sv:value>Top</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.span</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="footer">
......@@ -38,7 +38,7 @@
<sv:value>Footer</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
</sv:node>
</sv:node>
\ No newline at end of file
......@@ -27,7 +27,7 @@
<sv:value>Home Page Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
</sv:node>
</sv:node>
\ No newline at end of file
......@@ -27,7 +27,7 @@
<sv:value>Page-Not-Found Main</sv:value>
</sv:property>
<sv:property sv:name="hst:xtype" sv:type="String">
<sv:value>hst.vbox</sv:value>
<sv:value>hst.nomarkup</sv:value>
</sv:property>
</sv:node>
</sv:node>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment