Commit 061f89bf authored by Oscar Scholten's avatar Oscar Scholten

ESSENTIALS-1011 reintegrate 'feature/ESSENTIALS-1011'

parents ff451f0d 26c7ebdc
......@@ -58,7 +58,7 @@ public interface EssentialsCarouselComponentInfo {
@Parameter(name = "carouselWidth", defaultValue = "700", required = true, displayName = "Carousel width")
Integer getCarouselWidth();
@Parameter(name = "interval", defaultValue = "5000", required = true, displayName = "Carousel interval (milli seconds)")
@Parameter(name = "interval", defaultValue = "3000", required = true, displayName = "Carousel interval (milli seconds)")
Integer getInterval();
@Color
......
......@@ -57,8 +57,8 @@
<instructionSet group="extraTemplates">
<freemarker action="copy"
source="freemarker/essentials-banner-with-description.ftl"
target="{{freemarkerRoot}}/hstdefault/essentials-banner/with-description.ftl"/>
source="freemarker/essentials-banner-without-description.ftl"
target="{{freemarkerRoot}}/hstdefault/essentials-banner/without-description.ftl"/>
<file action="copy"
source="freemarker/essentials-banner.properties"
target="{{freemarkerRoot}}/hstdefault/essentials-banner.properties"/>
......
......@@ -2,20 +2,11 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.Banner" -->
<#if document??>
<div>
<figure>
<a href="<@hst.link hippobean=document.link />">
<img src="<@hst.link hippobean=document.image />" alt="${document.title?html}"/>
</a>
<figcaption>
<#if document.title??>
<h4>${document.title?html}</h4>
</#if>
<@hst.html hippohtml=document.content/>
</figcaption>
</figure>
</div>
<div>
<a href="<@hst.link hippobean=document.link />">
<figure><img src="<@hst.link hippobean=document.image />" alt="${document.title?html}"/></figure>
</a>
</div>
<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
<#elseif editMode>
<img src="<@hst.link path='/images/essentials/catalog-component-icons/banner.png'/>"> Click to edit Banner
......
......@@ -3,7 +3,17 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.Banner" -->
<#if document??>
<div>
<a href="<@hst.link hippobean=document.link />"><img src="<@hst.link hippobean=document.image />" alt="${document.title?html}"/></a>
<a href="<@hst.link hippobean=document.link />">
<figure style="position: relative">
<img src="<@hst.link hippobean=document.image />" alt="${document.title?html}"/>
<figcaption style="position:absolute; top:20px; left:20px; z-index:100; color:white; background: rgba(51, 122, 183, 0.7); width:60%; padding:0 20px 20px 20px; text-shadow: 0 1px 2px rgba(0, 0, 0, .6);">
<#if document.title??>
<h3>${document.title?html}</h3>
</#if>
<@hst.html hippohtml=document.content/>
</figcaption>
</figure>
</a>
</div>
<#elseif editMode>
<img src="<@hst.link path='/images/essentials/catalog-component-icons/banner.png'/>"> Click to edit Banner
......
essentials-banner.ftl= Default template
with-description.ftl= With description
without-description.ftl= Without description
essentials-banner.ftl= Standardtemplate
with-description.ftl= Mit Beschreibung
without-description.ftl= Ohne Beschreibung
essentials-banner.ftl= Mod\u00E8le standard
with-description.ftl= Avec description
without-description.ftl= Sans description
essentials-banner.ftl= Standaardtemplate
with-description.ftl= Met beschrijving
without-description.ftl= Zonder beschrijving
......@@ -58,6 +58,7 @@
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
z-index: 10;
background: rgba(51, 122, 183, 0.7);
}
/* Declare heights because of positioning of img element */
......
......@@ -2,8 +2,19 @@
<%--@elvariable id="document" type="{{beansPackage}}.Banner"--%>
<div>
<a href="<hst:link hippobean="${requestScope.document.link}" />"><img src="<hst:link hippobean="${requestScope.document.image}" />" alt="${fn:escapeXml(requestScope.document.title)}"/></a>
<a href="<hst:link hippobean="${requestScope.document.link}" />">
<figure style="position: relative">
<img src="<hst:link hippobean="${requestScope.document.image}"/>" alt="${fn:escapeXml(requestScope.document.title)}"/>
<figcaption style="position:absolute; top:20px; left:20px; z-index:100; color:white; background: rgba(51, 122, 183, 0.7); width:60%; padding:0 20px 20px 20px; text-shadow: 0 1px 2px rgba(0, 0, 0, .6);">
<c:if test="${not empty requestScope.document.title}">
<h3>${requestScope.document.title}</h3>
</c:if>
<hst:html hippohtml="${requestScope.document.content}"/>
</figcaption>
</figure>
</a>
</div>
<%--@elvariable id="editMode" type="java.lang.Boolean"--%>
<c:if test="${requestScope.editMode && (requestScope.document eq null)}">
<img src="<hst:link path='/images/essentials/catalog-component-icons/banner.png'/>"> Click to edit Banner
......
......@@ -54,6 +54,7 @@
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
z-index: 10;
background: rgba(51, 122, 183, 0.7);
}
/* Declare heights because of positioning of img element */
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -70,19 +70,12 @@
<sv:property sv:name="hippotranslation:locale" sv:type="String">
<sv:value>en</sv:value>
</sv:property>
<sv:node sv:name="{{namespace}}:content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;html&gt;
&lt;body&gt;
&lt;p&gt;Banner description&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</sv:value>
<sv:value>&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="{{namespace}}:image">
......@@ -90,7 +83,7 @@
<sv:value>hippogallerypicker:imagelink</sv:value>
</sv:property>
<sv:property sv:name="hippo:docbase" sv:type="String">
<sv:value>b89d576f-680a-4bbf-9c27-2dced9da3d6c</sv:value>
<sv:value>9e440e6d-e93a-4d5f-913b-9c3b0867c812</sv:value>
</sv:property>
<sv:property sv:multiple="true" sv:name="hippo:facets" sv:type="String"/>
<sv:property sv:multiple="true" sv:name="hippo:modes" sv:type="String"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -74,19 +74,12 @@
<sv:property sv:name="hippotranslation:locale" sv:type="String">
<sv:value>en</sv:value>
</sv:property>
<sv:node sv:name="{{namespace}}:content">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;html&gt;
&lt;body&gt;
&lt;p&gt;Banner description&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</sv:value>
<sv:value>&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="{{namespace}}:image">
......@@ -94,7 +87,7 @@
<sv:value>hippogallerypicker:imagelink</sv:value>
</sv:property>
<sv:property sv:name="hippo:docbase" sv:type="String">
<sv:value>db5907cc-e507-460e-b54d-de5d5c784e0a</sv:value>
<sv:value>dc6c2247-d3f4-4be0-976e-749b69927eee</sv:value>
</sv:property>
<sv:property sv:multiple="true" sv:name="hippo:facets" sv:type="String"/>
<sv:property sv:multiple="true" sv:name="hippo:modes" sv:type="String"/>
......
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