Michael Metternich pushed to branch feature/CC-ESSENTIALS-1108 at cms-community
/ hippo-essentials
Commits:
f7bb51e1 by Michael Metternich at 2018-01-09T10:37:37+01:00
ESSENTIALS-1108 Change manage content tag for content plugin
- - - - -
4 changed files:
-
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
-
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
-
plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
- plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
Changes:
=====================================
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
=====================================
---
a/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
@@ -6,7 +6,7 @@
<div>
<#list pageable.items as item>
<div class="media has-edit-button">
- <@hst.manageContent templateQuery="new-content-document" document=item
defaultPath="content"/>
+ <@hst.manageContent document=item/>
<div class="media-body">
<h4 class="media-heading">
<@hst.link var="link" hippobean=item/>
@@ -23,6 +23,9 @@
</div>
</div>
</#list>
+ <div class="has-new-content-button">
+ <@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+ </div>
<#if cparam.showPagination>
<#include "../../include/pagination.ftl">
</#if>
@@ -31,6 +34,8 @@
<#elseif editMode>
<div>
<img src="<@hst.link
path='/images/essentials/catalog-component-icons/generic-list.png'/>"> Click to
edit Content list
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
+ <div class="has-new-content-button">
+ <@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+ </div>
</div>
</#if>
=====================================
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
=====================================
---
a/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
@@ -6,7 +6,7 @@
<div>
<#list pageable.items as item>
<article class="has-edit-button">
- <@hst.manageContent templateQuery="new-content-document" document=item
defaultPath="content"/>
+ <@hst.manageContent document=item/>
<@hst.link var="link" hippobean=item/>
<h3><a href="${link}">${item.title?html}</a></h3>
<#if item.publicationDate??>
@@ -19,6 +19,9 @@
</#if>
</article>
</#list>
+ <div class="has-new-content-button">
+ <@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+ </div>
<#if cparam.showPagination>
<#include "../include/pagination.ftl">
</#if>
@@ -27,6 +30,8 @@
<#elseif editMode>
<div>
<img src="<@hst.link
path='/images/essentials/catalog-component-icons/generic-list.png'/>"> Click to
edit Content list
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
+ <div class="has-new-content-button">
+ <@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+ </div>
</div>
</#if>
=====================================
plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
=====================================
---
a/plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
@@ -3,7 +3,7 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.ContentDocument" -->
<#if document??>
<article class="has-edit-button">
- <@hst.manageContent templateQuery="new-content-document" document=document
defaultPath="content"/>
+ <@hst.manageContent document=document/>
<h3>${document.title?html}
<#if document.publicationDate??>
<small><@fmt.formatDate value=document.publicationDate.time type="date"
dateStyle="medium"/></small>
@@ -14,10 +14,4 @@
</#if>
<@hst.html hippohtml=document.content/>
</article>
-<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
-<#elseif editMode>
-<div>
- <img src="<@hst.link
path="/images/essentials/catalog-component-icons/simple-content.png" />"> Click
to edit Simple Content
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
-</div>
</#if>
\ No newline at end of file
=====================================
plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
=====================================
--- a/plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
+++ b/plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
@@ -3,7 +3,7 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.ContentDocument" -->
<#if document??>
<article class="has-edit-button">
- <@hst.manageContent templateQuery="new-content-document" document=document
defaultPath="content"/>
+ <@hst.manageContent document=document />
<h3>${document.title?html}</h3>
<#if document.publicationDate??>
<p>
@@ -17,10 +17,4 @@
</#if>
<@hst.html hippohtml=document.content/>
</article>
-<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
-<#elseif editMode>
-<div>
- <img src="<@hst.link
path="/images/essentials/catalog-component-icons/simple-content.png" />"> Click
to edit Simple Content
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
-</div>
</#if>
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/f7bb51e1c1cf69b0da95325fc6a1ec1db218a336
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/f7bb51e1c1cf69b0da95325fc6a1ec1db218a336
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
