Commit 77e4da70 authored by Joeri de Gooijer's avatar Joeri de Gooijer

HIPPLUG-1401 Reintegrate branch 'bugfix/HIPPLUG-1401'

parents 73f4de64 291cd8e8
......@@ -204,7 +204,7 @@
<sv:value>Add New Content Item</sv:value>
</sv:property>
<sv:property sv:name="compoundList" sv:type="String">
<sv:value>videoblock, imageblock, textblock</sv:value>
<sv:value>videoblock, imageblock, textblock, hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="contentPickerType" sv:type="String">
<sv:value>links</sv:value>
......@@ -216,7 +216,7 @@
<sv:value>contentblocks</sv:value>
</sv:property>
<sv:property sv:name="hint" sv:type="String">
<sv:value>Add a video, image or textblock</sv:value>
<sv:value>Add a video, image, textblock or regular HTML field</sv:value>
</sv:property>
<sv:property sv:name="mode" sv:type="String">
<sv:value>${mode}</sv:value>
......
......@@ -117,7 +117,7 @@
<sv:value>frontend:plugin</sv:value>
</sv:property>
<sv:property sv:name="caption" sv:type="String">
<sv:value>Text</sv:value>
<sv:value>Text Caption</sv:value>
</sv:property>
<sv:property sv:name="field" sv:type="String">
<sv:value>hippostd_html</sv:value>
......
......@@ -302,12 +302,20 @@
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;p&gt;This document has the content blocks added to the docment type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See step 2.2a&amp;nbsp;in the&amp;nbsp;
&lt;a href="http://content-blocks.forge.onehippo.org/cmsconfiguration.html" target="_blank"&gt;CMS Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
<sv:value>&lt;p&gt;This document has content blocks added to the document type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See the &lt;a href="https://www.onehippo.org/library/concepts/plugins/content-blocks/configuration.html" target="_blank"&gt;Content
Blocks Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<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;p&gt;This is not a Text Block compound but a standard Rich Text Editor, &lt;strong&gt;showing no caption!&lt;/strong&gt;&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>contentblocksdemo:videoblock</sv:value>
......@@ -401,12 +409,20 @@
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;p&gt;This document has the content blocks added to the docment type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See step 2.2a&amp;nbsp;in the&amp;nbsp;
&lt;a href="http://content-blocks.forge.onehippo.org/cmsconfiguration.html" target="_blank"&gt;CMS Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
<sv:value>&lt;p&gt;This document has content blocks added to the document type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See the &lt;a href="https://www.onehippo.org/library/concepts/plugins/content-blocks/configuration.html" target="_blank"&gt;Content
Blocks Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<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;p&gt;This is not a Text Block compound but a standard Rich Text Editor, &lt;strong&gt;showing no caption!&lt;/strong&gt;&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>contentblocksdemo:videoblock</sv:value>
......@@ -502,12 +518,20 @@
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;p&gt;This document has the content blocks added to the docment type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See step 2.2a&amp;nbsp;in the&amp;nbsp;
&lt;a href="http://content-blocks.forge.onehippo.org/cmsconfiguration.html" target="_blank"&gt;CMS Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
<sv:value>&lt;p&gt;This document has content blocks added to the document type using a list of comma separated strings.&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See the &lt;a href="https://www.onehippo.org/library/concepts/plugins/content-blocks/configuration.html" target="_blank"&gt;Content
Blocks Configuration page&lt;/a&gt;&amp;nbsp;in the documentation for more information.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<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;p&gt;This is not a Text Block compound but a standard Rich Text Editor, &lt;strong&gt;showing no caption!&lt;/strong&gt;&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="contentblocksdemo:contentblocksitem">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>contentblocksdemo:videoblock</sv:value>
......@@ -614,9 +638,9 @@
<sv:value>hippostd:html</sv:value>
</sv:property>
<sv:property sv:name="hippostd:content" sv:type="String">
<sv:value>&lt;p&gt;This document has the content blocks added to the docment type using a compound provider (which is a compound).&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See step 2.2b in the
&lt;a href="http://content-blocks.forge.onehippo.org/cmsconfiguration.html" target="_blank"&gt;CMS Configuration page&lt;/a&gt; in the documentation for more information.&lt;/p&gt;</sv:value>
<sv:value>&lt;p&gt;This document has the content blocks added to the docment type using a compound provider (which is a compound).&amp;nbsp;&lt;/p&gt;
&lt;p&gt;See step 2.2b in the
&lt;a href="http://content-blocks.forge.onehippo.org/cmsconfiguration.html" target="_blank"&gt;CMS Configuration page&lt;/a&gt; in the documentation for more information.&lt;/p&gt;</sv:value>
</sv:property>
</sv:node>
</sv:node>
......
......@@ -59,15 +59,15 @@
<wicket:fragment wicket:id="edit-fragment">
<div class="hippo-editor-field">
<div class="hippo-editor-field-subfield-controls" wicket:id="controls">
<a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a>
<a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a>
<a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a>
</div>
<div class="content-block-title">
<span wicket:id="itemTitle">[ item title ]</span>
</div>
<div class="hippo-editor-field-subfield contentpicker-blocks">
<div class="hippo-editor-field-subfield-controls" wicket:id="controls">
<a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a>
<a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a>
<a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a>
</div>
<div wicket:id="item"></div>
</div>
</div>
......
/*
* Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com)
* Copyright 2010-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.
......@@ -14,10 +14,14 @@
* limitations under the License.
*/
.hippo-editor-field-subfield:hover > .contentpicker-blocks > .hippo-editor-field-subfield-controls {
.hippo-editor-field:hover > .hippo-editor-field-subfield-controls {
opacity: 1;
}
.hippo-editor-field > .hippo-editor-field-subfield-controls {
padding: 4px;
}
.contentpicker-blocks div.hippo-diff-added {
float: none;
}
......
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