Woonsan Ko pushed to branch feature/spaplus at cms-community / hippo-testsuite
Commits:
ebdc76a2 by Peter Centgraf at 2018-02-09T15:12:17+01:00
HSTTWO-1003 ignore api-docs/target
- - - - -
8b146dad by Woonsan Ko at 2018-02-22T15:49:14+01:00
HSTTWO-4220: Adding drop down list annotation in ChannelInfo example.
- - - - -
f3bc2214 by Woonsan Ko at 2018-02-22T11:06:38-05:00
HSTTWO-4227: Merge branch 'master' into feature/spaplus
- - - - -
3b9c24fc by Woonsan Ko at 2018-02-22T12:02:03-05:00
HSTTWO-4227: replacing the deprecated hst:cmseditlink tags by hst:manageContent
tags
- - - - -
13 changed files:
- .gitignore
- components/src/main/java/org/hippoecm/hst/demo/channel/DemoChannelInfo.java
-
components/src/main/resources/org/hippoecm/hst/demo/channel/DemoChannelInfo.properties
- intranet/src/main/webapp/WEB-INF/jsp/base/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/base/main/list.jsp
- intranet/src/main/webapp/WEB-INF/jsp/home/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/news/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/search/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/subsite/home/main/content.jsp
- intranet/src/main/webapp/WEB-INF/jsp/subsite/standard/main/content.jsp
- resources/src/main/webapp/WEB-INF/ftl/components/main/detailpage.ftl
- resources/src/main/webapp/WEB-INF/jsp/components/main/detailpage.jsp
Changes:
=====================================
.gitignore
=====================================
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ api/.classpath
api/.project
api/.settings
api/target
+api-docs/target/
cms/.classpath
cms/.project
cms/.settings
=====================================
components/src/main/java/org/hippoecm/hst/demo/channel/DemoChannelInfo.java
=====================================
---
a/components/src/main/java/org/hippoecm/hst/demo/channel/DemoChannelInfo.java
+++
b/components/src/main/java/org/hippoecm/hst/demo/channel/DemoChannelInfo.java
@@ -16,14 +16,16 @@
package org.hippoecm.hst.demo.channel;
import org.hippoecm.hst.configuration.channel.ChannelInfo;
+import org.hippoecm.hst.core.parameters.DropDownList;
import org.hippoecm.hst.core.parameters.FieldGroup;
import org.hippoecm.hst.core.parameters.FieldGroupList;
import org.hippoecm.hst.core.parameters.Parameter;
+import org.hippoecm.hst.demo.components.CssDisplayValueListProvider;
@FieldGroupList({
@FieldGroup(
titleKey = "fields.demochannel",
- value = { "exampleValue" }
+ value = { "exampleValue", "theme", "defaultCssDisplay" }
)
})
public interface DemoChannelInfo extends ChannelInfo {
@@ -31,4 +33,12 @@ public interface DemoChannelInfo extends ChannelInfo {
@Parameter(name = "exampleValue")
String getExampleValue();
+ @Parameter(name = "theme", defaultValue = "default")
+ @DropDownList({"default", "metal", "warm"})
+ String getTheme();
+
+ @Parameter(name = "defaultCssDisplay")
+ @DropDownList(valueListProvider = CssDisplayValueListProvider.class)
+ String getDefaultCssDisplay();
+
}
=====================================
components/src/main/resources/org/hippoecm/hst/demo/channel/DemoChannelInfo.properties
=====================================
---
a/components/src/main/resources/org/hippoecm/hst/demo/channel/DemoChannelInfo.properties
+++
b/components/src/main/resources/org/hippoecm/hst/demo/channel/DemoChannelInfo.properties
@@ -1,3 +1,7 @@
fields.demochannel=Channel properties
exampleValue=Example Value
exampleValue.help=Example string value shown on the home page
+theme=Theme
+theme.help=Select the theme of the site.
+defaultCssDisplay=Default CSS Display
+defaultCssDisplay.help=Select the default CSS display option.
=====================================
intranet/src/main/webapp/WEB-INF/jsp/base/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/base/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/base/main/content.jsp
@@ -29,7 +29,7 @@
</c:if>
<article class="well well-large">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
<header>
<h2>${fn:escapeXml(document.title)}</h2>
<p>${fn:escapeXml(document.summary)}</p>
=====================================
intranet/src/main/webapp/WEB-INF/jsp/base/main/list.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/base/main/list.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/base/main/list.jsp
@@ -27,7 +27,7 @@
<c:forEach var="item" items="${result.hippoBeans}" varStatus="status">
<hst:link var="link" hippobean="${item}"/>
<article class="well well-large"
style="background-color:${info.bgColor};">
- <hst:cmseditlink hippobean="${item}"/>
+ <hst:manageContent hippobean="${item}"/>
<c:if test="${status.first and hst:isReadable(item,
'image.thumbnail')}">
<hst:link var="img" hippobean="${item.image.thumbnail}"/>
<figure style="float:left;margin:0 10px 0 0;">
=====================================
intranet/src/main/webapp/WEB-INF/jsp/home/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/home/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/home/main/content.jsp
@@ -30,7 +30,7 @@
</c:if>
<article class="well well-large">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
<header>
<h2>${fn:escapeXml(document.title)}</h2>
<p>${fn:escapeXml(document.summary)}</p>
=====================================
intranet/src/main/webapp/WEB-INF/jsp/news/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/news/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/news/main/content.jsp
@@ -28,7 +28,7 @@
</c:if>
<article class="well well-large">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
<header>
<h2>${fn:escapeXml(document.title)}</h2>
<c:if test="${hst:isReadable(document, 'date.time')}">
=====================================
intranet/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp
@@ -39,7 +39,7 @@
<c:forEach var="item" items="${result.hippoBeans}">
<hst:link var="link" hippobean="${item}"/>
<article class="well well-large">
- <hst:cmseditlink hippobean="${item}"/>
+ <hst:manageContent hippobean="${item}"/>
<h3><a href="${link}">${fn:escapeXml(item.title)}</a></h3>
<c:if test="${hst:isReadable(item, 'date.time')}">
<p class="badge badge-info">
=====================================
intranet/src/main/webapp/WEB-INF/jsp/search/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/search/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/search/main/content.jsp
@@ -39,7 +39,7 @@
<c:forEach var="item" items="${result.hippoBeans}">
<hst:link var="link" hippobean="${item}"/>
<article class="well well-large">
- <hst:cmseditlink hippobean="${item}"/>
+ <hst:manageContent hippobean="${item}"/>
<h3><a href="${link}">${fn:escapeXml(item.title)}</a></h3>
<c:if test="${hst:isReadable(item, 'date.time')}">
<p class="badge badge-info">
=====================================
intranet/src/main/webapp/WEB-INF/jsp/subsite/home/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/subsite/home/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/subsite/home/main/content.jsp
@@ -30,7 +30,7 @@
</c:if>
<article class="well well-large">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
<header>
<h2>${fn:escapeXml(document.title)}</h2>
<p>${fn:escapeXml(document.summary)}</p>
=====================================
intranet/src/main/webapp/WEB-INF/jsp/subsite/standard/main/content.jsp
=====================================
--- a/intranet/src/main/webapp/WEB-INF/jsp/subsite/standard/main/content.jsp
+++ b/intranet/src/main/webapp/WEB-INF/jsp/subsite/standard/main/content.jsp
@@ -29,7 +29,7 @@
</c:if>
<article class="well well-large">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
<header>
<h2>${fn:escapeXml(document.title)}</h2>
<p>${fn:escapeXml(document.summary)}</p>
=====================================
resources/src/main/webapp/WEB-INF/ftl/components/main/detailpage.ftl
=====================================
--- a/resources/src/main/webapp/WEB-INF/ftl/components/main/detailpage.ftl
+++ b/resources/src/main/webapp/WEB-INF/ftl/components/main/detailpage.ftl
@@ -55,7 +55,7 @@ ${document.title}
</p>
<div id="editable_cont" class="inline-editor-editable-container">
<h2>${document.title}</h2>
- <@hst.cmseditlink hippobean=document/>
+ <@hst.manageContent hippobean=document/>
<p>
<#if isPreview>
<span class="editable"
id="demosite:summary">${document.summary}</span>
=====================================
resources/src/main/webapp/WEB-INF/jsp/components/main/detailpage.jsp
=====================================
--- a/resources/src/main/webapp/WEB-INF/jsp/components/main/detailpage.jsp
+++ b/resources/src/main/webapp/WEB-INF/jsp/components/main/detailpage.jsp
@@ -50,7 +50,7 @@
<div class="yui-u">
<c:if test="${isPreview}">
- <hst:cmseditlink hippobean="${document}"/>
+ <hst:manageContent hippobean="${document}"/>
</c:if>
<p>
<hst:componentRenderingURL var="componentRenderingURL"/>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/compare/ccef77f8c7d09842c7b147ce27067dc2637e01ce...3b9c24fcc87e099cda186f5eced09fc620d8ac7b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/compare/ccef77f8c7d09842c7b147ce27067dc2637e01ce...3b9c24fcc87e099cda186f5eced09fc620d8ac7b
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
