Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4392] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-20 08:31:46
|
Revision: 4392
http://openutils.svn.sourceforge.net/openutils/?rev=4392&view=rev
Author: fgiust
Date: 2013-10-20 08:31:41 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
working node wrapping, refactored list of references in media interface
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,10 +1,11 @@
package info.magnolia.module.development;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.NodeSortTask;
@@ -28,7 +29,8 @@
{
List<Task> tasks = new ArrayList<Task>();
- boolean develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ boolean develop = Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.develop");
if (develop)
{
@@ -37,12 +39,13 @@
"/server/activation/subscribers/magnoliaPublic8080",
"active",
"false"));
-
}
// I hate spending time in looking through the unsorted list of modules...
tasks.add(new NodeSortTask(RepositoryConstants.CONFIG, "/modules"));
+ // tasks.add(new SetPropertyTask("config", "/server/1i8n/content", "enabled", "true"));
+
return tasks;
}
}
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -68,6 +68,8 @@
private Map<String, AdvancedResult> usedInNodes = new HashMap<String, AdvancedResult>();
+ private Integer numberOfReferences;
+
private boolean canPublish;
private boolean writable;
@@ -409,4 +411,15 @@
{
this.icon = icon;
}
+
+ public Integer getNumberOfReferences()
+ {
+ return numberOfReferences;
+ }
+
+ public void setNumberOfReferences(Integer numberOfReferences)
+ {
+ this.numberOfReferences = numberOfReferences;
+ }
+
}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -108,6 +108,13 @@
mb.setUsedInWebPages(workspacePaths.get(RepositoryConstants.WEBSITE));
mb.setUsedInNodes(workspacePaths);
+ int count = 0;
+ for (AdvancedResult wp : workspacePaths.values())
+ {
+ count += wp.getTotalSize();
+ }
+ mb.setNumberOfReferences(count);
+
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -33,6 +33,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
+import info.magnolia.templating.functions.TemplatingFunctions;
import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
@@ -511,7 +512,9 @@
{
return null;
}
- MediaTypeConfiguration mtc = Components.getComponent(MediaConfigurationManager.class).getMediaTypeConfigurationFromMedia(media);
+ MediaTypeConfiguration mtc = Components
+ .getComponent(MediaConfigurationManager.class)
+ .getMediaTypeConfigurationFromMedia(media);
String url = mtc.getHandler().getUrl(media);
String filename = mtc.getHandler().getFullFilename(media);
@@ -896,4 +899,9 @@
{
return MediaEl.module().getVersion();
}
+
+ public String link(Node node)
+ {
+ return Components.getComponent(TemplatingFunctions.class).link(node);
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>60c72833-f536-47e1-949e-9056d9df234b</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -45,6 +51,9 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>tab</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -52,6 +61,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -82,8 +94,11 @@
<sv:value>f18a9c1e-3318-469b-ba2a-32304dee949b</sv:value>
</sv:property>
<sv:property sv:name="controlType" sv:type="String">
- <sv:value>mediaSelection</sv:value>
+ <sv:value>media</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -94,6 +109,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -113,7 +131,7 @@
<sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2009-12-30T16:10:29.544+01:00</sv:value>
+ <sv:value>2013-10-19T23:54:25.789+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>fc6446c7-1f4a-4256-9435-d0fb708abad8</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -45,6 +51,9 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>tab</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -52,6 +61,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -82,8 +94,11 @@
<sv:value>5bdc5aea-5de8-4ef4-9a80-0aa7140241c0</sv:value>
</sv:property>
<sv:property sv:name="controlType" sv:type="String">
- <sv:value>mediaSelection</sv:value>
+ <sv:value>media</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -97,6 +112,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -116,7 +134,7 @@
<sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-18T16:41:03.781+01:00</sv:value>
+ <sv:value>2013-10-19T23:54:19.766+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-10-20 08:31:41 UTC (rev 4392)
@@ -5,7 +5,7 @@
<title>${this.path!?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion}" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion!}" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/mooSelecta.css" />
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
@@ -537,18 +537,21 @@
[/#if]
</ul>
</div>
- [#if media.usedInWebPages?size = 0]
+ [#if media.numberOfReferences = 0]
<span>${this.msgs.get('media.nopages')}</span>
[#else]
- <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
+ <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages.totalSize})</span>
<div class="pages menu" style="display: none;">
<ul class="mediamenu medialinks">
- [#list media.usedInUris as uri]
- <li>
- <a href="${this.request.contextPath}${uri}" target="_blank">
- ${uri}
- </a>
- </li>
+ [#list media.usedInNodes?keys as key]
+ [#list media.usedInNodes?values[key_index].items as node]
+ <li>
+ [#assign link = this.link(node)]
+ <a href="${this.request.contextPath}${link}" target="_blank">
+ ${link}
+ </a>
+ </li>
+ [/#list]
[/#list]
</ul>
</div>
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="tags" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/</sv:value>
+ </sv:property>
+ <sv:property sv:name="propertyName" sv:type="String">
+ <sv:value>tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>website</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="clouds" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>4730afb7-3548-4026-997b-0f2df4ad8357</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-03-09T16:04:19.602+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:04:23.928+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tags">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="path" sv:type="String">
- <sv:value>/</sv:value>
- </sv:property>
- <sv:property sv:name="propertyName" sv:type="String">
- <sv:value>tags</sv:value>
- </sv:property>
- <sv:property sv:name="repository" sv:type="String">
- <sv:value>website</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-tagcloud" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>800</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>General</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>800</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Properties</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="title">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d5003a4c-76fd-4b4d-8aba-e471ff7fee80</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18n" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Title</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-10-19T23:59:00.811+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-20T00:00:01.025+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="tags">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tagcloud</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Start insert your tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="tagCloudName" sv:type="String">
+ <sv:value>tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>300</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-03-26T11:53:31.667+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-09T17:20:33.703+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="dialogs" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>51b6bd61-5dde-49fb-b548-7dbfa3edacf5</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-03-09T16:26:39.067+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:34:38.761+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="sample-tagcloud">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>800</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>General</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>800</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tabGeneral">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>tab</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Properties</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tags">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>tagcloud</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Start insert your tags</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Tags</sv:value>
- </sv:property>
- <sv:property sv:name="tagCloudName" sv:type="String">
- <sv:value>tags</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>300</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-03-26T11:53:31.667+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T17:20:33.703+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -19,13 +19,18 @@
package it.openutils.mgnlutils.api;
+import info.magnolia.cms.core.AggregationState;
import info.magnolia.cms.core.Path;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.decoration.ContentDecoratorUtil;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
import java.util.regex.Pattern;
@@ -208,10 +213,40 @@
{
return null;
}
- // TODO introduce configured wrapping
+ node = wrapWithChannelVisibilityWrapper(node);
+ if (!NodeUtil.isWrappedWith(node, I18nNodeWrapper.class))
+ {
+ node = new I18nNodeWrapper(node);
+ }
+ if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
+ {
+ node = new HTMLEscapingNodeWrapper(node, true);
+ }
+
return node;
}
+ private static Node wrapWithChannelVisibilityWrapper(Node content)
+ {
+ if (ContentDecoratorUtil.isDecoratedWith(content, ChannelVisibilityContentDecorator.class)
+ || !MgnlContext.isWebContext())
+ {
+ return content;
+ }
+
+ AggregationState aggregationState = MgnlContext.getAggregationState();
+ if (aggregationState == null)
+ {
+ return content;
+ }
+ String channel = aggregationState.getChannel().getName();
+ if (StringUtils.isEmpty(channel) || StringUtils.equalsIgnoreCase(channel, "all"))
+ {
+ return content;
+ }
+ return new ChannelVisibilityContentDecorator(channel).wrapNode(content);
+ }
+
public static String getBinaryPath(Node node)
{
if (node == null)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
