Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2011-01-13 09:11:56
|
Revision: 3228
http://openutils.svn.sourceforge.net/openutils/?rev=3228&view=rev
Author: diego_schivo
Date: 2011-01-13 09:11:50 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 uuid search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java 2011-01-13 09:11:50 UTC (rev 3228)
@@ -0,0 +1,41 @@
+package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchFilterUUID extends SearchFilterAbstract
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+
+ if (values != null && values.length > 0)
+ {
+ String uuid = values[0];
+ if (StringUtils.isNotBlank(uuid))
+ {
+ criterionList.add(Restrictions.eq("@jcr:uuid", uuid));
+ }
+ }
+ return criterionList;
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 08:28:38 UTC (rev 3227)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:11:50 UTC (rev 3228)
@@ -681,5 +681,48 @@
</sv:node>
</sv:node>
</sv:node>
+ <sv:node sv:name="uuid">
+ <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>278d7b3a-e50a-4114-9d1d-15e123fdab9c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterUUID</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>input</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>config.search.filters.uuid</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>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T10:06:51.231+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 08:28:38 UTC (rev 3227)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:11:50 UTC (rev 3228)
@@ -152,4 +152,4 @@
config.search.filters.options.all=All
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
-
+config.search.filters.uuid=UUID
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 08:28:38 UTC (rev 3227)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:11:50 UTC (rev 3228)
@@ -155,3 +155,4 @@
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
config.search.filters.options.notpublished=Non pubblicati
+config.search.filters.uuid=UUID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-01-13 09:49:07
|
Revision: 3229
http://openutils.svn.sourceforge.net/openutils/?rev=3229&view=rev
Author: diego_schivo
Date: 2011-01-13 09:48:58 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 modified status search (does not work)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:11:50 UTC (rev 3228)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:48:58 UTC (rev 3229)
@@ -58,6 +58,12 @@
{
criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false));
}
+ if (!values[0].equals("ALL") && "MOD".equals(values[0]))
+ {
+ criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
+ // https://issues.apache.org/jira/browse/JCR-2271
+ criterionList.add(Restrictions.gt("MetaData/@mgnl:lastmodified", "MetaData/@mgnl:lastaction"));
+ }
}
return criterionList;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:11:50 UTC (rev 3228)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:48:58 UTC (rev 3229)
@@ -559,6 +559,46 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="modified">
+ <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>433e018a-acee-4699-8183-ff57367c1824</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>config.search.filters.options.modified</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>MOD</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T10:33:46.033+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
<sv:node sv:name="from">
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:11:50 UTC (rev 3228)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:48:58 UTC (rev 3229)
@@ -152,4 +152,5 @@
config.search.filters.options.all=All
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
+config.search.filters.options.modified=Modified
config.search.filters.uuid=UUID
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:11:50 UTC (rev 3228)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:48:58 UTC (rev 3229)
@@ -155,4 +155,5 @@
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
config.search.filters.options.notpublished=Non pubblicati
+config.search.filters.options.modified=Modificato
config.search.filters.uuid=UUID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-01-13 10:05:49
|
Revision: 3230
http://openutils.svn.sourceforge.net/openutils/?rev=3230&view=rev
Author: diego_schivo
Date: 2011-01-13 10:05:42 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 revert: modified status search (does not work)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Property Changed:
----------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 10:05:42 UTC (rev 3230)
@@ -58,12 +58,6 @@
{
criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false));
}
- if (!values[0].equals("ALL") && "MOD".equals(values[0]))
- {
- criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
- // https://issues.apache.org/jira/browse/JCR-2271
- criterionList.add(Restrictions.gt("MetaData/@mgnl:lastmodified", "MetaData/@mgnl:lastaction"));
- }
}
return criterionList;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 10:05:42 UTC (rev 3230)
@@ -559,46 +559,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="modified">
- <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>433e018a-acee-4699-8183-ff57367c1824</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>config.search.filters.options.modified</sv:value>
- </sv:property>
- <sv:property sv:name="value" sv:type="String">
- <sv:value>MOD</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>2010-02-18T15:38:57.738+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-01-13T10:33:46.033+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
</sv:node>
<sv:node sv:name="from">
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:05:42 UTC (rev 3230)
@@ -152,5 +152,4 @@
config.search.filters.options.all=All
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
-config.search.filters.options.modified=Modified
config.search.filters.uuid=UUID
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:05:42 UTC (rev 3230)
@@ -155,5 +155,4 @@
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
config.search.filters.options.notpublished=Non pubblicati
-config.search.filters.options.modified=Modificato
config.search.filters.uuid=UUID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-01-13 10:47:48
|
Revision: 3232
http://openutils.svn.sourceforge.net/openutils/?rev=3232&view=rev
Author: diego_schivo
Date: 2011-01-13 10:47:41 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 modified status search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-13 10:21:11 UTC (rev 3231)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-13 10:47:41 UTC (rev 3232)
@@ -80,7 +80,7 @@
{
cal.set(
Integer.parseInt(dateMatcher.group(1)),
- Integer.parseInt(dateMatcher.group(2)),
+ Integer.parseInt(dateMatcher.group(2)) - 1,
Integer.parseInt(dateMatcher.group(3)));
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:21:11 UTC (rev 3231)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:47:41 UTC (rev 3232)
@@ -153,3 +153,4 @@
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
config.search.filters.uuid=UUID
+config.search.filters.modified=Modified since
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:21:11 UTC (rev 3231)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:47:41 UTC (rev 3232)
@@ -156,3 +156,4 @@
config.search.filters.options.published=Pubblicati
config.search.filters.options.notpublished=Non pubblicati
config.search.filters.uuid=UUID
+config.search.filters.modified=Modificato dal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-01-13 17:41:36
|
Revision: 3240
http://openutils.svn.sourceforge.net/openutils/?rev=3240&view=rev
Author: diego_schivo
Date: 2011-01-13 17:41:29 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 sorting
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 17:41:29 UTC (rev 3240)
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode;
/**
@@ -36,4 +37,6 @@
String getBasePath(String parameter, HttpServletRequest request);
List<Criterion> getCriterionList(String parameter, HttpServletRequest request);
+
+ SortMode getSorting(String parameter, HttpServletRequest request);
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 17:41:29 UTC (rev 3240)
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode;
import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang.StringUtils;
@@ -83,6 +84,14 @@
}
/**
+ * {@inheritDoc}
+ */
+ public SortMode getSorting(String parameter, HttpServletRequest request)
+ {
+ return null;
+ }
+
+ /**
* Returns the type.
* @return the type
*/
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-13 17:41:29 UTC (rev 3240)
@@ -0,0 +1,31 @@
+package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+
+import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchFilterSorting extends SearchFilterOptionProvider
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public SortMode getSorting(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+ SortMode sortMode = null;
+ if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0]))
+ {
+ sortMode = SortMode.valueOf(values[0]);
+ }
+ return sortMode;
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 17:41:29 UTC (rev 3240)
@@ -132,6 +132,11 @@
{
c.add(criterion);
}
+ SortMode s = filter.getSorting(key, request);
+ if (s != null)
+ {
+ sorting = s;
+ }
}
// base path
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 17:41:29 UTC (rev 3240)
@@ -810,5 +810,285 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="sorting">
+ <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>35660c98-836b-4b9b-afc9-e4c81188102d</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterSorting</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>radio</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>config.search.filters.sorting</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>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:24:03.324+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="options">
+ <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>04df9407-4a4f-4ae3-84b3-485a0d1447a9</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: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-02-18T15:38:47.391+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:16:55.733+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="score">
+ <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>4fb64a66-fd01-4b2a-a3b5-b77384928c92</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultValue" sv:type="String">
+ <sv:value>true</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.sorting.score</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>score</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:27:45.480+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="dateasc">
+ <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>e90110b7-088a-4e4c-a442-3b6a5dc08c05</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.sorting.date.asc</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>CREATIONDATE_ASC</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:29:34.076+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="datedesc">
+ <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>ff93da80-13b1-4540-a986-88e1d00f9910</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.sorting.date.desc</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>CREATIONDATE_DESC</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:29:57.510+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="nameasc">
+ <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>c4403c34-da6e-4f94-96e2-ae335c0dbe28</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.sorting.name.asc</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>FILENAME_ASC</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:30:23.868+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="namedesc">
+ <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>ba28c1d8-5fe5-4ad6-b981-1c114200ae4f</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.sorting.name.desc</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>FILENAME_DESC</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>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-13T18:30:40.241+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 17:41:29 UTC (rev 3240)
@@ -156,3 +156,4 @@
config.search.filters.uuid=UUID
config.search.filters.modified=Modified since
config.search.filters.path=Path
+config.search.filters.sorting=Sorting
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 15:22:33 UTC (rev 3239)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 17:41:29 UTC (rev 3240)
@@ -159,3 +159,4 @@
config.search.filters.uuid=UUID
config.search.filters.modified=Modificato dal
config.search.filters.path=Percorso
+config.search.filters.sorting=Ordinamento
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-01-14 15:57:27
|
Revision: 3246
http://openutils.svn.sourceforge.net/openutils/?rev=3246&view=rev
Author: diego_schivo
Date: 2011-01-14 15:57:20 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
MEDIA-203 Playlist details: give the possibility to configure links similar to the xspf one
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistLinks.xspf.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-14 10:41:44 UTC (rev 3245)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-14 15:57:20 UTC (rev 3246)
@@ -34,6 +34,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
+import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistLink;
import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
import org.slf4j.Logger;
@@ -75,6 +76,8 @@
private List playlistTrackExtensionContributors = new ArrayList();
+ private List playlistLinks = new ArrayList();
+
/**
* Constructor
*/
@@ -265,4 +268,27 @@
this.playlistTrackExtensionContributors.add(contributor);
}
+
+ /**
+ * Returns the playlistLinks.
+ * @return the playlistLinks
+ */
+ public List getPlaylistLinks()
+ {
+ return playlistLinks;
+ }
+
+ /**
+ * Sets the playlistLinks.
+ * @param playlistLinks the playlistLinks to set
+ */
+ public void setPlaylistLinks(List playlistLinks)
+ {
+ this.playlistLinks = playlistLinks;
+ }
+
+ public void addPlaylistLink(PlaylistLink playlistLink)
+ {
+ this.playlistLinks.add(playlistLink);
+ }
}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java 2011-01-14 15:57:20 UTC (rev 3246)
@@ -0,0 +1,75 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import info.magnolia.cms.core.Content;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public abstract class AbstractPlaylistLink implements PlaylistLink
+{
+
+ private String text;
+
+ private String icon;
+
+ private boolean external;
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getText()
+ {
+ return text;
+ }
+
+ /**
+ * Sets the text.
+ * @param text the text to set
+ */
+ public void setText(String text)
+ {
+ this.text = text;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getIcon()
+ {
+ return icon;
+ }
+
+ /**
+ * Sets the icon.
+ * @param icon the icon to set
+ */
+ public void setIcon(String icon)
+ {
+ this.icon = icon;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public abstract String url(PlaylistBean playlist);
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isExternal()
+ {
+ return external;
+ }
+
+ /**
+ * Sets the external.
+ * @param external the external to set
+ */
+ public void setExternal(boolean external)
+ {
+ this.external = external;
+ }
+
+}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java 2011-01-14 15:57:20 UTC (rev 3246)
@@ -0,0 +1,60 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import info.magnolia.cms.core.Content;
+
+import java.text.MessageFormat;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class MessageFormatPlaylistLink extends AbstractPlaylistLink
+{
+
+ private static final Logger log = LoggerFactory.getLogger(MessageFormatPlaylistLink.class);
+
+ private String urlFormat;
+
+ private MessageFormat urlMessageFormat;
+
+ /**
+ * Returns the urlFormat.
+ * @return the urlFormat
+ */
+ public String getUrlFormat()
+ {
+ return urlFormat;
+ }
+
+ /**
+ * Sets the urlFormat.
+ * @param urlFormat the urlFormat to set
+ */
+ public void setUrlFormat(String urlFormat)
+ {
+ this.urlFormat = urlFormat;
+ try
+ {
+ urlMessageFormat = new MessageFormat(this.urlFormat);
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.error("Invalid \"sdpUrlPattern\" (check your magnolia.properties)", e);
+ urlMessageFormat = null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String url(PlaylistBean playlist)
+ {
+ return urlMessageFormat.format(new Object[] { playlist.getHandle() });
+ }
+
+}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java 2011-01-14 15:57:20 UTC (rev 3246)
@@ -0,0 +1,19 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public interface PlaylistLink
+{
+
+ String getText();
+
+ String getIcon();
+
+ String url(PlaylistBean playlist);
+
+ boolean isExternal();
+}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistLinks.xspf.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistLinks.xspf.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistLinks.xspf.xml 2011-01-14 15:57:20 UTC (rev 3246)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="xspf" 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:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7338cdf4-3031-4aed-9239-5043d087fdff</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.MessageFormatPlaylistLink</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/media/icons/16/xspf.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>playlist.xspf.export</sv:value>
+ </sv:property>
+ <sv:property sv:name="urlFormat" sv:type="String">
+ <sv:value>/playlists{0}.xspf</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>2011-01-14T14:42:38.829+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-14T16:42:37.040+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css 2011-01-14 10:41:44 UTC (rev 3245)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css 2011-01-14 15:57:20 UTC (rev 3246)
@@ -2,15 +2,14 @@
white-space: normal;
}
-#xspfLink {
- background-image: url("../icons/16/xspf.png");
+.playlistLink {
background-repeat: no-repeat;
background-position: left;
padding-left: 20px;
color: #000;
}
-#xspfLinkBox {
+.playlistLinkBox {
width: 100%;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-01-14 10:41:44 UTC (rev 3245)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-01-14 15:57:20 UTC (rev 3246)
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
[#setting url_escaping_charset="UTF-8"]
[#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
+[#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/ext-all.css" />
@@ -188,6 +189,22 @@
}
});
+ var detailItems = [
+ playlistForm
+ [#list mediaEl.module().playlistLinks as item]
+ ,
+ {
+ xtype: 'panel',
+ bodyStyle: 'padding:0 35px;',
+ html: '<a id="playlistLink${item_index}" href="#" class="x-form-item playlistLink" [#if item.icon?exists]style="background-image: url(\'${this.request.contextPath}${item.icon}\')"[/#if]>${item.text}</a>'
+ },
+ {
+ xtype: 'panel',
+ bodyStyle: 'padding:0 35px;',
+ html: '<input id="playlistLink${item_index}Box" value="[#if this.playlist?exists][#if !item.external]${mgnlEl.baseUrl()}[/#if]${item.url(this.playlist)}[/#if]" class="x-form-item playlistLinkBox hidden" readonly="readonly"/>'
+ }
+ [/#list]
+ ];
playlistView = new Ext.Panel({
id: 'playlistView',
frame: true,
@@ -224,30 +241,22 @@
}
},{
columnWidth: 0.4,
- items: [
- playlistForm,
- {
- xtype: 'panel',
- bodyStyle: 'padding:0 35px;',
- html: '<a id="xspfLink" href="${mgnlEl.baseUrl()}' + '/playlists' + playlist.handle + '.xml' + '" class="x-form-item">${this.msgs.get('playlist.xspf.export')}</a>'
- },
- {
- xtype: 'panel',
- bodyStyle: 'padding:0 35px;',
- html: '<input id="xspfLinkBox" class="hidden" value="${mgnlEl.baseUrl()}' + '/playlists' + playlist.handle + '.xspf' + '" class="x-form-item" readonly="readonly"/>'
- }
- ]
+ items: detailItems
}],
renderTo: Ext.getBody()
});
grid = Ext.getCmp('playlistEntries');
- var xspfLink = Ext.get('xspfLink');
- xspfLink.on('click', function() {
- Ext.get('xspfLinkBox').toggleClass('hidden');
- Ext.get('xspfLinkBox').dom.select();
- }, xspfLink, {stopEvent:true});
+ var playlistLink;
+ [#list mediaEl.module().playlistLinks as item]
+ playlistLink = Ext.get('playlistLink${item_index}');
+ playlistLink.on('click', function() {
+ var box = Ext.get('playlistLink${item_index}Box');
+ box.toggleClass('hidden');
+ box.dom.select();
+ }, playlistLink, {stopEvent:true});
+ [/#list]
dd.on('beforerowmove', function(dropTarget, i1, i2){
if (i2 > i1 && i2 == grid.store.data.length - 1) return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 07:49:50
|
Revision: 3309
http://openutils.svn.sourceforge.net/openutils/?rev=3309&view=rev
Author: diego_schivo
Date: 2011-02-08 07:49:44 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-08 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -28,9 +28,11 @@
import info.magnolia.freemarker.FreemarkerUtil;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Set;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -247,6 +249,9 @@
public String saveAsPlaylist()
{
+ Set<String> excludeParamNames = new HashSet<String>();
+ excludeParamNames.add("saveAsPlaylist");
+ excludeParamNames.add("command");
try
{
HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
@@ -257,6 +262,10 @@
for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
{
String paramName = (String) paramNames.nextElement();
+ if (excludeParamNames.contains(paramName))
+ {
+ continue;
+ }
String[] paramValues = request.getParameterValues(paramName);
Content paramNode = requestNode.createContent(
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -0,0 +1,81 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchPlaylistDialogMVC extends ConfiguredDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SearchPlaylistDialogMVC.class);
+
+ /**
+ *
+ */
+ public SearchPlaylistDialogMVC(
+ String name,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Content configNode)
+ {
+ super(name, request, response, configNode);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void configureSaveHandler(SaveHandler saveHandler)
+ {
+ super.configureSaveHandler(saveHandler);
+ saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPreSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPreSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPostSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPostSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ // TODO Auto-generated method stub
+ super.renderHtml(view);
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -234,7 +234,7 @@
{
Content requestNode = node.getContent(requestNodeName);
Collection<Content> paramNodes = requestNode.getChildren(ItemType.CONTENTNODE);
- final Map<String, String[]> map = new HashMap<String, String[]>();
+ final Map<String, Object> map = new HashMap<String, Object>();
for (Content paramNode : paramNodes)
{
String paramName = NodeDataUtil.getString(paramNode, "name");
@@ -244,7 +244,14 @@
{
paramValues[i] = jcrValues[i].getString();
}
- map.put(paramName, paramValues);
+ if (paramValues.length == 1)
+ {
+ map.put(paramName, paramValues[0]);
+ }
+ else if (paramValues.length > 1)
+ {
+ map.put(paramName, paramValues);
+ }
}
AdvancedResult searchResult = MediaEl
.module()
@@ -252,7 +259,7 @@
.search(
new CustomParamsRequest(request, map, false),
null,
- null,
+ "/",
true,
SortMode.SCORE,
0,
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 07:49:44 UTC (rev 3309)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="search-playlist" 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>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistDialogMVC</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>Playlist</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>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:25.314+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>301b55cd-e68f-47f3-85a3-9a1b3507b45f</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>Playlist</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>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parentFolder">
+ <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>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</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>Parent folder</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>media</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>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T21:10:12.830+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="playlistName">
+ <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>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</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>Playlist name</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>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:49:08.823+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:49:44 UTC (rev 3309)
@@ -32,7 +32,10 @@
<div class="row">
<input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit"/>
+ <!--
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
+ -->
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=media&mgnlCK=' + (new Date()).getTime()); return false;"/>
<input type="hidden" name="command" value="" />
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 09:59:30
|
Revision: 3310
http://openutils.svn.sourceforge.net/openutils/?rev=3310&view=rev
Author: diego_schivo
Date: 2011-02-08 09:59:24 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 09:59:24 UTC (rev 3310)
@@ -46,6 +46,8 @@
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ saveHandler.setNodeName(form.getParameter("playlistName"));
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 09:59:24 UTC (rev 3310)
@@ -97,7 +97,7 @@
<sv:value>Parent folder</sv:value>
</sv:property>
<sv:property sv:name="repository" sv:type="String">
- <sv:value>media</sv:value>
+ <sv:value>playlists</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -116,7 +116,7 @@
<sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-07T21:10:12.830+01:00</sv:value>
+ <sv:value>2011-02-08T10:56:37.939+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 09:59:24 UTC (rev 3310)
@@ -35,7 +35,7 @@
<!--
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
-->
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=media&mgnlCK=' + (new Date()).getTime()); return false;"/>
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
<input type="hidden" name="command" value="" />
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 10:46:46
|
Revision: 3313
http://openutils.svn.sourceforge.net/openutils/?rev=3313&view=rev
Author: diego_schivo
Date: 2011-02-08 10:46:39 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:30:09 UTC (rev 3312)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:46:39 UTC (rev 3313)
@@ -48,6 +48,7 @@
super.configureSaveHandler(saveHandler);
saveHandler.setPath(form.getParameter("parentFolder"));
saveHandler.setNodeName(form.getParameter("playlistName"));
+ saveHandler.setRepository(PlaylistConstants.REPO);
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:30:09 UTC (rev 3312)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:46:39 UTC (rev 3313)
@@ -48,7 +48,7 @@
},
openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime());
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 10:58:46
|
Revision: 3314
http://openutils.svn.sourceforge.net/openutils/?rev=3314&view=rev
Author: diego_schivo
Date: 2011-02-08 10:58:39 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,62 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.core.Content;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class DialogHiddenParameters extends ConfigurableFreemarkerDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(DialogHiddenParameters.class);
+
+ /**
+ * {@inheritDoc}
+ */
+
+ @Override
+ public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+ throws RepositoryException
+ {
+ super.init(request, response, websiteNode, configNode);
+ }
+
+ @Override
+ protected String getPath()
+ {
+ return "dialog/hiddenParameters.ftl";
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -1,3 +1,22 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -1,3 +1,22 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
import info.magnolia.cms.core.Content;
Added: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,5 @@
+[#list request.parameterNames as pName]
+[#list request.getParameterValues(pName) as pValue]
+<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
+[/#list]
+[/#list]
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="hiddenParameters" 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>bf533b67-3270-4f41-8c34-ead4b005dc97</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogHiddenParameters</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:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" 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>2008-06-26T16:13:12.696Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-26T16:13:35.061Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T11:54:51.262+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 10:58:39 UTC (rev 3314)
@@ -163,5 +163,42 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="request">
+ <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>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</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: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-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T11:55:44.769+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 11:12:07
|
Revision: 3315
http://openutils.svn.sourceforge.net/openutils/?rev=3315&view=rev
Author: diego_schivo
Date: 2011-02-08 11:12:00 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 10:58:39 UTC (rev 3314)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 11:12:00 UTC (rev 3315)
@@ -26,7 +26,9 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+import net.sourceforge.openutils.mgnlmedia.media.save.HiddenParametersSaveHandler;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +54,10 @@
throws RepositoryException
{
super.init(request, response, websiteNode, configNode);
+ if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+ {
+ setConfig("saveHandler", HiddenParametersSaveHandler.class.getName());
+ }
}
@Override
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
@@ -0,0 +1,77 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.save;
+
+import info.magnolia.cms.beans.runtime.MultipartForm;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.FieldSaveHandler;
+
+import java.util.Enumeration;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class HiddenParametersSaveHandler implements FieldSaveHandler
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(HiddenParametersSaveHandler.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
+ int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
+ {
+ Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
+ HttpServletRequest request = MgnlContext.getWebContext().getRequest();
+ for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+ {
+ String paramName = (String) paramNames.nextElement();
+ String[] paramValues = request.getParameterValues(paramName);
+
+ Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
+ paramNode.setNodeData("name", paramName);
+ Value[] jcrValues = new Value[paramValues.length];
+ for (int i = 0; i < paramValues.length; i++)
+ {
+ jcrValues[i] = NodeDataUtil.createValue(paramValues[i], PropertyType.STRING);
+ }
+ paramNode.setNodeData("value", jcrValues);
+ }
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 10:58:39 UTC (rev 3314)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:12:00 UTC (rev 3315)
@@ -1,5 +1,5 @@
[#list request.parameterNames as pName]
[#list request.getParameterValues(pName) as pValue]
-<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
+<input type="hidden" id="${name}_${pName}" name="${name}_${pName}" value="${pValue!''}" />
[/#list]
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 11:34:09
|
Revision: 3316
http://openutils.svn.sourceforge.net/openutils/?rev=3316&view=rev
Author: diego_schivo
Date: 2011-02-08 11:34:02 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
@@ -35,6 +35,7 @@
import javax.jcr.Value;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,11 +59,14 @@
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
- HttpServletRequest request = MgnlContext.getWebContext().getRequest();
- for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+ for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
{
String paramName = (String) paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
+ if (!StringUtils.startsWith(paramName, name + "_"))
+ {
+ continue;
+ }
+ String[] paramValues = form.getParameterValues(paramName);
Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
paramNode.setNodeData("name", paramName);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
@@ -41,5 +41,7 @@
protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
AccessDeniedException
{
+ // TODO Auto-generated method stub
+ super.processSaveInfo(node, saveInfo);
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:34:02 UTC (rev 3316)
@@ -1,5 +1,7 @@
[#list request.parameterNames as pName]
+[#if pName?starts_with('${name}_')]
[#list request.getParameterValues(pName) as pValue]
-<input type="hidden" id="${name}_${pName}" name="${name}_${pName}" value="${pValue!''}" />
+<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
[/#list]
+[/#if]
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 11:34:02 UTC (rev 3316)
@@ -48,7 +48,7 @@
},
openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&${name?js_string}=${value?js_string}[/#list][/#list]');
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&request_${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 11:48:54
|
Revision: 3317
http://openutils.svn.sourceforge.net/openutils/?rev=3317&view=rev
Author: diego_schivo
Date: 2011-02-08 11:48:48 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:48:48 UTC (rev 3317)
@@ -25,7 +25,6 @@
import info.magnolia.cms.core.Path;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.FieldSaveHandler;
import java.util.Enumeration;
@@ -33,7 +32,6 @@
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java 2011-02-08 11:48:48 UTC (rev 3317)
@@ -0,0 +1,69 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
+import info.magnolia.cms.gui.control.FunctionBarItem;
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.cms.gui.control.TreeColumn;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.module.admininterface.AbstractTreeConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFoldersTreeConfiguration extends AbstractTreeConfiguration
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ tree.addSeparator();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ final Messages msgs = getMessages();
+
+ tree.addItemType(PlaylistConstants.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
+
+ TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.playlists.column"), true);
+ column0.setWidth(3);
+ tree.addColumn(column0);
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:34:02 UTC (rev 3316)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:48:48 UTC (rev 3317)
@@ -99,8 +99,8 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Parent folder</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
- <sv:value>playlists</sv:value>
+ <sv:property sv:name="tree" sv:type="String">
+ <sv:value>playlist-folders</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -119,7 +119,7 @@
<sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T10:56:37.939+01:00</sv:value>
+ <sv:value>2011-02-08T12:46:20.865+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml 2011-02-08 11:48:48 UTC (rev 3317)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlist-folders" 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:uuid" sv:type="String">
+ <sv:value>fd9b4693-e7e6-4673-8952-6f4e42f162e6</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.AdminTreeMVCHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="configurationClass" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.tree.PlaylistFoldersTreeConfiguration</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>playlists</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>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" 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>2005-05-06T16:18:38.686+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-18T16:32:32.987Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T12:46:27.524+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 14:28:37
|
Revision: 3320
http://openutils.svn.sourceforge.net/openutils/?rev=3320&view=rev
Author: diego_schivo
Date: 2011-02-08 14:28:30 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 14:28:30 UTC (rev 3320)
@@ -20,16 +20,19 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.misc.Sources;
import info.magnolia.module.admininterface.SaveHandler;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
import java.io.IOException;
+import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +100,19 @@
@Override
public void renderHtml(String view) throws IOException
{
- // TODO Auto-generated method stub
- super.renderHtml(view);
+ if (VIEW_CLOSE_WINDOW.equals(view))
+ {
+ PrintWriter out = this.getResponse().getWriter();
+
+ out.println("<html>"); //$NON-NLS-1$
+ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
+ out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
+ out.println("parent.location.href = '/open/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
+ out.println("</script></html>"); //$NON-NLS-1$
+ }
+ else
+ {
+ super.renderHtml(view);
+ }
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java 2011-02-08 14:28:30 UTC (rev 3320)
@@ -24,7 +24,10 @@
import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @author dschivo
*/
@@ -32,10 +35,35 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(PlaylistsBrowserPage.class);
+
+ private String openPath;
+
+ /**
*
*/
public PlaylistsBrowserPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
}
+
+ /**
+ * Returns the openPath.
+ * @return the openPath
+ */
+ public String getOpenPath()
+ {
+ return openPath;
+ }
+
+ /**
+ * Sets the openPath.
+ * @param openPath the openPath to set
+ */
+ public void setOpenPath(String openPath)
+ {
+ this.openPath = openPath;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2011-02-08 14:28:30 UTC (rev 3320)
@@ -10,6 +10,7 @@
<script type="text/javascript">
// <![CDATA[
var viewport;
+var openPath = "${this.openPath!''}";
Ext.onReady(function(){
viewport = new Ext.Viewport({
@@ -45,8 +46,8 @@
]
});
setTimeout(function() {
- frames['playlistTreeView'].location.href = '${this.request.contextPath}/.magnolia/trees/playlists.html?mgnlCK=' + (new Date()).getTime();
- frames['playlistView'].location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?mgnlCK=' + (new Date()).getTime();
+ frames['playlistTreeView'].location.href = '${this.request.contextPath}/.magnolia/trees/playlists.html?pathOpen=' + openPath + '&pathCurrent=' + openPath + '&pathSelected=' + openPath + '&mgnlCK=' + (new Date()).getTime();
+ frames['playlistView'].location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?path=' + openPath + '&mgnlCK=' + (new Date()).getTime();
}, 100);
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 17:48:41
|
Revision: 3322
http://openutils.svn.sourceforge.net/openutils/?rev=3322&view=rev
Author: diego_schivo
Date: 2011-02-08 17:48:33 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist from search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,47 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.save;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.module.admininterface.UUIDSaveHandler;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFromSearchSaveHandler extends UUIDSaveHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
+ AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+ super.processSaveInfo(node, saveInfo);
+ }
+}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,118 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.misc.Sources;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFromSearchDialogMVC extends ConfiguredDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(PlaylistFromSearchDialogMVC.class);
+
+ /**
+ *
+ */
+ public PlaylistFromSearchDialogMVC(
+ String name,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Content configNode)
+ {
+ super(name, request, response, configNode);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void configureSaveHandler(SaveHandler saveHandler)
+ {
+ super.configureSaveHandler(saveHandler);
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ saveHandler.setNodeName(form.getParameter("playlistName"));
+ saveHandler.setRepository(PlaylistConstants.REPO);
+ saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPreSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPreSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPostSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPostSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ if (VIEW_CLOSE_WINDOW.equals(view))
+ {
+ PrintWriter out = this.getResponse().getWriter();
+
+ out.println("<html>"); //$NON-NLS-1$
+ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
+ out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
+ out.println("parent.location.href = '/open/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
+ out.println("</script></html>"); //$NON-NLS-1$
+ }
+ else
+ {
+ super.renderHtml(view);
+ }
+ }
+}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,118 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.gui.misc.Sources;
-import info.magnolia.module.admininterface.SaveHandler;
-import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class SearchPlaylistDialogMVC extends ConfiguredDialog
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(SearchPlaylistDialogMVC.class);
-
- /**
- *
- */
- public SearchPlaylistDialogMVC(
- String name,
- HttpServletRequest request,
- HttpServletResponse response,
- Content configNode)
- {
- super(name, request, response, configNode);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void configureSaveHandler(SaveHandler saveHandler)
- {
- super.configureSaveHandler(saveHandler);
- saveHandler.setPath(form.getParameter("parentFolder"));
- saveHandler.setNodeName(form.getParameter("playlistName"));
- saveHandler.setRepository(PlaylistConstants.REPO);
- saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPreSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPreSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPostSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPostSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void renderHtml(String view) throws IOException
- {
- if (VIEW_CLOSE_WINDOW.equals(view))
- {
- PrintWriter out = this.getResponse().getWriter();
-
- out.println("<html>"); //$NON-NLS-1$
- out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
- out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
- out.println("parent.location.href = '/open/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
- out.println("</script></html>"); //$NON-NLS-1$
- }
- else
- {
- super.renderHtml(view);
- }
- }
-}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,47 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.module.admininterface.UUIDSaveHandler;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class SearchPlaylistSaveHandler extends UUIDSaveHandler
-{
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
- AccessDeniedException
- {
- // TODO Auto-generated method stub
- super.processSaveInfo(node, saveInfo);
- }
-}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -38,6 +38,8 @@
private List<PlaylistEntryBean> entries;
+ private boolean readOnly;
+
/**
* Returns the uuid.
* @return the uuid
@@ -127,4 +129,24 @@
{
this.entries = entries;
}
+
+
+ /**
+ * Returns the readOnly.
+ * @return the readOnly
+ */
+ public boolean isReadOnly()
+ {
+ return readOnly;
+ }
+
+
+ /**
+ * Sets the readOnly.
+ * @param readOnly the readOnly to set
+ */
+ public void setReadOnly(boolean readOnly)
+ {
+ this.readOnly = readOnly;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -227,12 +227,11 @@
}
}
- String requestNodeName = "search";
try
{
- if (node.hasContent(requestNodeName))
+ if (node.hasContent("search"))
{
- Content requestNode = node.getContent(requestNodeName);
+ Content requestNode = node.getContent("search");
Collection<Content> paramNodes = requestNode.getChildren(ItemType.CONTENTNODE);
final Map<String, Object> map = new HashMap<String, Object>();
for (Content paramNode : paramNodes)
@@ -275,10 +274,18 @@
}
catch (RepositoryException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // should never happen
}
playlist.setEntries(entries);
+
+ try
+ {
+ playlist.setReadOnly(node.hasContent("search"));
+ }
+ catch (RepositoryException e)
+ {
+ // should never happen
+ }
}
else
{
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlistAsSearch" 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>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</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>Playlist</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveHandler" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.save.PlaylistFromSearchSaveHandler</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>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T18:43:46.422+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>301b55cd-e68f-47f3-85a3-9a1b3507b45f</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>Playlist</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>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parentFolder">
+ <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>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</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>Parent folder</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="tree" sv:type="String">
+ <sv:value>playlist-folders</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>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T14:47:19.599+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="playlistName">
+ <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>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</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>Playlist name</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</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>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T14:47:30.384+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="maxResults">
+ <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>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</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>Max results</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Long</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>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T14:48:01.729+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="search">
+ <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>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</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: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-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T11:55:44.769+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="search-playlist" 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>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistDialogMVC</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>Playlist</sv:value>
- </sv:property>
- <sv:property sv:name="saveHandler" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistSaveHandler</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>2010-02-04T16:31:25.515+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T11:08:14.971+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>301b55cd-e68f-47f3-85a3-9a1b3507b45f</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>Playlist</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>2010-02-04T16:31:50.312+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parentFolder">
- <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>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>link</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>Parent folder</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="tree" sv:type="String">
- <sv:value>playlist-folders</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>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T14:47:19.599+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="playlistName">
- <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>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</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>Playlist name</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</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>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T14:47:30.384+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="maxResults">
- <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>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</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>Max results</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>Long</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>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T14:48:01.729+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="search">
- <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>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>hiddenParameters</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: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-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T11:55:44.769+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -33,9 +33,6 @@
<div class="row">
<input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
- <!--
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
- -->
<input type="hidden" name="command" value="" />
</div>
</form>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -39,7 +39,7 @@
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
[#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
- this.openSearchPlaylistDialog();
+ this.openPlaylistFromSearchDialog();
[/#if]
},
@@ -47,8 +47,8 @@
$('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px');
},
- openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
+ openPlaylistFromSearchDialog: function(){
+ parent.openWindow('.magnolia/dialogs/playlistAsSearch.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -52,6 +52,7 @@
text: playlist.msgs.addEntry,
icon: contextPath + '/.resources/media/icons/ico16-add.png',
iconCls: 'button-add',
+ disabled: playlist.readOnly,
handler: function(){
var mgnlWin = parent.parent;
mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
@@ -76,6 +77,7 @@
text: playlist.msgs.addEntries,
icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
iconCls: 'button-addmany',
+ disabled: playlist.readOnly,
handler: function(){
var mgnlWin = parent.parent;
parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
@@ -287,7 +289,7 @@
});
});
grid.getSelectionModel().on('selectionchange', function(sm){
- Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
+ Ext.getCmp('removeEntryBtn').setDisabled(playlist.readOnly || sm.getCount() < 1);
Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
});
@@ -390,7 +392,8 @@
addManyEntriesProgressStart: '${this.msgs.get('playlist.entries.addMany.msgBox.progressStart')?js_string}',
addManyEntriesProgressEnd: '${this.msgs.get('playlist.entries.addMany.msgBox.progressEnd')?js_string}',
addManyEntriesProgress: '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'
- }
+ },
+ readOnly: ${(this.playlist.readOnly)?string}
};
initPlaylistView();
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-16 17:17:27
|
Revision: 3339
http://openutils.svn.sourceforge.net/openutils/?rev=3339&view=rev
Author: diego_schivo
Date: 2011-02-16 17:17:21 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
MEDIA-218 search-based property
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java 2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java 2011-02-16 17:17:21 UTC (rev 3339)
@@ -38,7 +38,7 @@
private List<PlaylistEntryBean> entries;
- private boolean readOnly;
+ private boolean searchBased;
/**
* Returns the uuid.
@@ -130,23 +130,22 @@
this.entries = entries;
}
-
/**
- * Returns the readOnly.
- * @return the readOnly
+ * Returns the searchBased.
+ * @return the searchBased
*/
- public boolean isReadOnly()
+ public boolean isSearchBased()
{
- return readOnly;
+ return searchBased;
}
-
/**
- * Sets the readOnly.
- * @param readOnly the readOnly to set
+ * Sets the searchBased.
+ * @param searchBased the searchBased to set
*/
- public void setReadOnly(boolean readOnly)
+ public void setSearchBased(boolean searchBased)
{
- this.readOnly = readOnly;
+ this.searchBased = searchBased;
}
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-16 17:17:21 UTC (rev 3339)
@@ -239,7 +239,7 @@
try
{
- playlist.setReadOnly(node.hasContent("search"));
+ playlist.setSearchBased(node.hasContent("search"));
}
catch (RepositoryException e)
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-16 17:17:21 UTC (rev 3339)
@@ -48,11 +48,11 @@
]);
var tbar = [
+[#if (!this.playlist.searchBased)]
{
text: playlist.msgs.addEntry,
icon: contextPath + '/.resources/media/icons/ico16-add.png',
iconCls: 'button-add',
- disabled: playlist.readOnly,
handler: function(){
var mgnlWin = parent.parent;
mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
@@ -77,7 +77,6 @@
text: playlist.msgs.addEntries,
icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
iconCls: 'button-addmany',
- disabled: playlist.readOnly,
handler: function(){
var mgnlWin = parent.parent;
parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
@@ -99,6 +98,7 @@
});
}
},
+[/#if]
{
id: 'editMediaBtn',
text: playlist.msgs.editMedia,
@@ -249,8 +249,10 @@
autoSizeColumns: true,
enableColLock: false,
tbar: tbar,
- stripeRows: true,
- plugins: !playlist.readOnly ? [dd] : []
+ stripeRows: true
+[#if (!this.playlist.searchBased)]
+ , plugins: [dd]
+[/#if]
}
},{
columnWidth: 0.4,
@@ -289,7 +291,7 @@
});
});
grid.getSelectionModel().on('selectionchange', function(sm){
- Ext.getCmp('removeEntryBtn').setDisabled(playlist.readOnly || sm.getCount() < 1);
+ Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
});
@@ -393,7 +395,7 @@
addManyEntriesProgressEnd: '${this.msgs.get('playlist.entries.addMany.msgBox.progressEnd')?js_string}',
addManyEntriesProgress: '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'
},
- readOnly: ${(this.playlist.readOnly)?string}
+ searchBased: ${(this.playlist.searchBased)?string}
};
initPlaylistView();
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-16 19:11:51
|
Revision: 3343
http://openutils.svn.sourceforge.net/openutils/?rev=3343&view=rev
Author: diego_schivo
Date: 2011-02-16 19:11:45 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
MEDIA-218 search parameters
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-16 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-16 19:11:45 UTC (rev 3343)
@@ -24,13 +24,17 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.zip.ZipFile;
import javax.jcr.RepositoryException;
@@ -42,6 +46,7 @@
import net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporterException;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -83,6 +88,8 @@
private String playlistUUID;
+ private String playlistSearch;
+
/**
* @param name command name
* @param request
@@ -115,6 +122,28 @@
log.warn("Error retrieving media {}", actMedia);
}
}
+ if (!StringUtils.isEmpty(playlistUUID))
+ {
+ Content playlistContent = ContentUtil.getContentByUUID(PlaylistConstants.REPO, playlistUUID);
+ try
+ {
+ if (playlistContent.hasContent("search"))
+ {
+ List<String> params = new ArrayList<String>();
+ for (Content content : playlistContent.getContent("search").getChildren())
+ {
+ String paramName = NodeDataUtil.getString(content, "name");
+ String paramValue = NodeDataUtil.getString(content, "value");
+ params.add(paramName + "=" + paramValue);
+ }
+ playlistSearch = StringUtils.join(params, '&');
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // should never happen
+ }
+ }
}
/**
@@ -345,6 +374,24 @@
}
/**
+ * Returns the playlistSearch.
+ * @return the playlistSearch
+ */
+ public String getPlaylistSearch()
+ {
+ return playlistSearch;
+ }
+
+ /**
+ * Sets the playlistSearch.
+ * @param playlistSearch the playlistSearch to set
+ */
+ public void setPlaylistSearch(String playlistSearch)
+ {
+ this.playlistSearch = playlistSearch;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-16 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-16 19:11:45 UTC (rev 3343)
@@ -137,7 +137,7 @@
setTimeout(function() {
setTreeCollapsed(false);
frames['mediaTreeView'].location.href = getTreeUrl();
- frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&query=hello&type=video&type=document";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&${this.playlistSearch!''}";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 10:54:47
|
Revision: 3348
http://openutils.svn.sourceforge.net/openutils/?rev=3348&view=rev
Author: diego_schivo
Date: 2011-02-17 10:54:41 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 playlist handle
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -40,7 +40,7 @@
private Map<String, SearchFilter> filters;
- private String playlistUUID;
+ private String playlistHandle;
/**
* Returns the selectMedia.
@@ -81,20 +81,20 @@
}
/**
- * Returns the playlistUUID.
- * @return the playlistUUID
+ * Returns the playlistHandle.
+ * @return the playlistHandle
*/
- public String getPlaylistUUID()
+ public String getPlaylistHandle()
{
- return playlistUUID;
+ return playlistHandle;
}
/**
- * Sets the playlistUUID.
- * @param playlistUUID the playlistUUID to set
+ * Sets the playlistHandle.
+ * @param playlistHandle the playlistHandle to set
*/
- public void setPlaylistUUID(String playlistUUID)
+ public void setPlaylistHandle(String playlistHandle)
{
- this.playlistUUID = playlistUUID;
+ this.playlistHandle = playlistHandle;
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -86,7 +86,7 @@
private Document zipFile;
- private String playlistUUID;
+ private String playlistHandle;
private String playlistSearch;
@@ -122,9 +122,9 @@
log.warn("Error retrieving media {}", actMedia);
}
}
- if (!StringUtils.isEmpty(playlistUUID))
+ if (!StringUtils.isEmpty(playlistHandle))
{
- Content playlistContent = ContentUtil.getContentByUUID(PlaylistConstants.REPO, playlistUUID);
+ Content playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
try
{
if (playlistContent.hasContent("search"))
@@ -356,21 +356,21 @@
}
/**
- * Returns the playlistUUID.
- * @return the playlistUUID
+ * Returns the playlistHandle.
+ * @return the playlistHandle
*/
- public String getPlaylistUUID()
+ public String getPlaylistHandle()
{
- return playlistUUID;
+ return playlistHandle;
}
/**
- * Sets the playlistUUID.
- * @param playlistUUID the playlistUUID to set
+ * Sets the playlistHandle.
+ * @param playlistHandle the playlistHandle to set
*/
- public void setPlaylistUUID(String playlistUUID)
+ public void setPlaylistHandle(String playlistHandle)
{
- this.playlistUUID = playlistUUID;
+ this.playlistHandle = playlistHandle;
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -56,6 +56,10 @@
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
+ if (parentNode.hasContent(name))
+ {
+ parentNode.getContent(name).delete();
+ }
Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -32,6 +32,7 @@
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,9 +68,14 @@
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
- saveHandler.setPath(form.getParameter("parentFolder"));
- saveHandler.setNodeName(form.getParameter("playlistName"));
- saveHandler.setRepository(PlaylistConstants.REPO);
+ if (!StringUtils.isEmpty(form.getParameter("parentFolder")))
+ {
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ }
+ if (!StringUtils.isEmpty(form.getParameter("playlistName")))
+ {
+ saveHandler.setNodeName(form.getParameter("playlistName"));
+ }
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -16,12 +16,12 @@
var form = $('mediaSearchForm');
form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
new Event(e).stop();
- [#if this.playlistUUID?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ [#if this.playlistHandle?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
});
function saveAsPlaylist(update){
form.getElement('input[name=command]').set('value', 'saveAsPlaylist');
- form.getElement('input[name=playlistUUID]').set('value', update ? "${this.playlistUUID!''}" : '');
+ form.getElement('input[name=playlistHandle]').set('value', update ? "${this.playlistHandle!''}" : '');
form.submit();
}
});
@@ -49,7 +49,7 @@
<input type="submit" name="search" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" />
<input type="hidden" name="command" value="" />
- <input type="hidden" name="playlistUUID" value="" />
+ <input type="hidden" name="playlistHandle" value="" />
</div>
</form>
</body>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -120,7 +120,7 @@
animFloat: false,
stateful: true,
deferredRender:false,
- activeTab:[#if (this.playlistUUID?has_content)]1[#else]0[/#if],
+ activeTab:[#if (this.playlistHandle?has_content)]1[#else]0[/#if],
items:[{
contentEl:'mediaTreeView',
title: 'Browse'
@@ -137,7 +137,7 @@
setTimeout(function() {
setTreeCollapsed(false);
frames['mediaTreeView'].location.href = getTreeUrl();
- frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&${this.playlistSearch!''}";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -48,7 +48,7 @@
},
openPlaylistFromSearchDialog: function(){
- parent.openWindow('.magnolia/dialogs/playlistAsSearch.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#if !['selectMedia','saveAsPlaylist','command']?seq_contains(name)][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#if][/#list]');
+ parent.openWindow('.magnolia/dialogs/updateSearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=/samples/hello&mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#if !['selectMedia','saveAsPlaylist','command']?seq_contains(name)][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#if][/#list]');
}
});
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -55,7 +55,7 @@
icon: contextPath + '/.resources/media/icons/ico16-edit.png',
iconCls: 'button-edit-search',
handler: function(){
- parent.location.href = '${this.request.contextPath}/.magnolia/pages/mediaBrowser.html?playlistUUID=${this.playlist.uuid}';
+ parent.location.href = '${this.request.contextPath}/.magnolia/pages/mediaBrowser.html?playlistHandle=${this.playlist.handle}';
}
},
[#else]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 10:30:37
|
Revision: 3384
http://openutils.svn.sourceforge.net/openutils/?rev=3384&view=rev
Author: fgiust
Date: 2011-03-13 10:30:31 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-175 standardize command names
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2011-03-13 10:30:31 UTC (rev 3384)
@@ -24,9 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.Command;
-
/**
* Extends {@link AdminTreeMVCHandler} to include custom js and to route activate command to activateMedia command
* @author molaschi
@@ -69,20 +67,4 @@
return MediaModuleTree.class.getName();
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected Command findCommand(String commandName)
- {
- String cmdName = commandName;
- if ("activate".equals(cmdName))
- {
- cmdName = "activateMedia";
- }
-
- Command cmd = super.findCommand(cmdName);
- return cmd;
- }
-
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2011-03-13 10:30:31 UTC (rev 3384)
@@ -29,7 +29,6 @@
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,19 +92,6 @@
* {@inheritDoc}
*/
@Override
- protected Command findCommand(String commandName)
- {
- if ("activate".equals(commandName))
- {
- commandName = "activatePlaylist";
- }
- return super.findCommand(commandName);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public String pasteNode(String pathOrigin, String pathSelected, int pasteType, int action)
throws ExchangeException, RepositoryException
{
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="activateMedia" 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:uuid" sv:type="String">
- <sv:value>d921e616-3ea9-48ae-a3d5-5abe0aaea59f</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaActivationCommand</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</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:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-12T18:21:29.563+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="activatePlaylist" 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:uuid" sv:type="String">
- <sv:value>72d1551b-7f81-4733-be5d-d57a73ac519a</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.admininterface.commands.ActivationCommand</sv:value>
- </sv:property>
- <sv:property sv:name="itemTypes" sv:type="String">
- <sv:value>mgnl:playlistentry</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:activatorid" 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>2006-03-19T19:18:55.094+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-03T10:07:01.421+01:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="activate" 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:uuid" sv:type="String">
+ <sv:value>d921e616-3ea9-48ae-a3d5-5ace0aaea59f</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaActivationCommand</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</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:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2008-08-12T18:21:29.563+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="activate" 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:uuid" sv:type="String">
+ <sv:value>72d1551b-7f81-4733-ce5d-d57a73ac519a</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.commands.ActivationCommand</sv:value>
+ </sv:property>
+ <sv:property sv:name="itemTypes" sv:type="String">
+ <sv:value>mgnl:playlistentry</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:activatorid" 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>2006-03-19T19:18:55.094+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-03T10:07:01.421+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 14:05:42
|
Revision: 3388
http://openutils.svn.sourceforge.net/openutils/?rev=3388&view=rev
Author: fgiust
Date: 2011-03-13 14:05:35 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-184 cleaning up search filters when changing the active folder
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2011-03-13 14:05:35 UTC (rev 3388)
@@ -36,7 +36,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.lang.StringUtils;
@@ -235,11 +234,11 @@
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
- ContextMenuItem search = new ContextMenuItem("search");
- search.setLabel(getMessages().get("media.menu.search"));
- search.setIcon(request.getContextPath() + "/.resources/icons/24/view.gif");
- search.setOnclick("parent.search()");
- tree.addFunctionBarItem(new FunctionBarItem(search));
+ // ContextMenuItem search = new ContextMenuItem("search");
+ // search.setLabel(getMessages().get("media.menu.search"));
+ // search.setIcon(request.getContextPath() + "/.resources/icons/24/view.gif");
+ // search.setOnclick("parent.search()");
+ // tree.addFunctionBarItem(new FunctionBarItem(search));
}
/**
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt 2011-03-13 14:05:35 UTC (rev 3388)
@@ -0,0 +1,5 @@
+You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
+http://led24.de/iconset/ or http://led24.de/ would be appreciated.
+
+Follow us on twitter http://twitter.com/gasyoun or email le...@gm...
+512 icons 20/05/2009
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-13 14:05:35 UTC (rev 3388)
@@ -234,8 +234,14 @@
var url = frames['mediaFolderView'].location.pathname;
- var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+ var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+
+ var querystring = {};
+ if (!querystringoriginal['search']){
+ querystring = querystringoriginal;
+ }
+
if (isbrowse || url == "") {
url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 12:37:56
|
Revision: 3393
http://openutils.svn.sourceforge.net/openutils/?rev=3393&view=rev
Author: diego_schivo
Date: 2011-03-23 12:37:50 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 mediafolderpath cookie
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 12:27:33 UTC (rev 3392)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 12:37:50 UTC (rev 3393)
@@ -86,6 +86,8 @@
protected String sorting;
+ protected String mediaFolderPath;
+
protected boolean selectMedia;
protected String actMediaHandle;
@@ -155,6 +157,7 @@
bgSelector = null;
pagesizeSelector = null;
sorting = null;
+ mediaFolderPath = null;
for (Cookie cookie : request.getCookies())
{
if ("bgselector".equals(cookie.getName()))
@@ -169,6 +172,10 @@
{
sorting = cookie.getValue();
}
+ else if ("mediafolderpath".equals(cookie.getName()))
+ {
+ mediaFolderPath = cookie.getValue();
+ }
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
@@ -619,6 +626,15 @@
}
/**
+ * Returns the mediaFolderPath.
+ * @return the mediaFolderPath
+ */
+ public String getMediaFolderPath()
+ {
+ return mediaFolderPath;
+ }
+
+ /**
* Returns the writable.
* @return the writable
*/
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:27:33 UTC (rev 3392)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:37:50 UTC (rev 3393)
@@ -18,7 +18,7 @@
var viewport;
var nodeid = "${this.nodeid!''}";
var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!Cookie.read('mediafolder')!''}";
+var openPath = "${this.openPath!this.mediaFolderPath!''}";
var actMediaHandle = "${this.actMediaHandle!''}";
var mediaType = "${this.mediaType!''}"; // get tree url
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-12 15:44:44
|
Revision: 3457
http://openutils.svn.sourceforge.net/openutils/?rev=3457&view=rev
Author: fgiust
Date: 2011-05-12 15:44:36 +0000 (Thu, 12 May 2011)
Log Message:
-----------
update extension list for mp4
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-05-06 15:57:15 UTC (rev 3456)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-05-12 15:44:36 UTC (rev 3457)
@@ -207,6 +207,20 @@
"jpg,jpeg,gif,png",
"jpg,jpeg,gif,png,ico"));
+ // add mp4
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/video",
+ "extensions",
+ "flv,swf",
+ "flv,swf,mp4,m4v"));
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/dialogs/mediaVideoDlg/tabVideo/original",
+ "extensions",
+ "flv,swf",
+ "flv,swf,mp4,m4v"));
+
// install stk support
if (isModuleInstalled("standard-templating-kit"))
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml 2011-05-06 15:57:15 UTC (rev 3456)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml 2011-05-12 15:44:36 UTC (rev 3457)
@@ -16,7 +16,7 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="extensions" sv:type="String">
- <sv:value>flv,swf</sv:value>
+ <sv:value>flv,swf,mp4,m4v</sv:value>
</sv:property>
<sv:property sv:name="i18nBasename" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-20 14:04:30
|
Revision: 3545
http://openutils.svn.sourceforge.net/openutils/?rev=3545&view=rev
Author: fgiust
Date: 2011-06-20 14:04:24 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
MEDIA-236 Better freemarker support (also without STK/ETK renderers)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2011-06-20 14:04:24 UTC (rev 3545)
@@ -33,10 +33,11 @@
/**
- * Paragraph renderer that wraps support functions
+ * deprecated after http://jira.openmindlab.com/browse/MEDIA-236
* @author Ernst Bunders
* @author fgiust
*/
+@Deprecated
public class SktSimpleMediaParagraphRenderer extends STKParagraphRenderer
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2011-06-20 14:04:24 UTC (rev 3545)
@@ -33,10 +33,11 @@
/**
- * Template renderer that wraps support functions
+ * deprecated after http://jira.openmindlab.com/browse/MEDIA-236
* @author Ernst Bunders
* @author fgiust
*/
+@Deprecated
public class SktSimpleMediaTemplateRenderer extends STKTemplateRenderer
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-06-20 14:04:24 UTC (rev 3545)
@@ -222,7 +222,7 @@
"flv,swf",
"flv,swf,mp4,m4v"));
- // install stk support
+ // REVERT old stk support for magnolia < 4.3
if (isModuleInstalled("standard-templating-kit"))
{
tasks.add(new BootstrapMissingNodesTask("media-stk"));
@@ -232,16 +232,16 @@
ContentRepository.CONFIG,
"/modules/standard-templating-kit/template-renderers/stk",
"renderer",
- "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
- "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
+ "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer",
+ "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer"));
// extended paragraph renderer
tasks.add(new ChangeExistingPropertyTask(
ContentRepository.CONFIG,
"/modules/standard-templating-kit/paragraph-renderers/stk",
"class",
- "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer",
- "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer"));
+ "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer",
+ "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer"));
}
// install etk support
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-06-20 14:04:24 UTC (rev 3545)
@@ -82,7 +82,10 @@
private static final String[] EMPTY_STRING_ARRAY = new String[]{};
- private MediaEl()
+ /**
+ * Public constructor. Needed for freemarker support
+ */
+ public MediaEl()
{
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml 2011-06-20 14:04:24 UTC (rev 3545)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media" 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>3d601ae5-229d-46ff-8b0f-aafd88af65f3</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</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: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>2011-06-19T22:47:12.877+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-06-19T23:18:59.835+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-07-03 14:11:53
|
Revision: 3568
http://openutils.svn.sourceforge.net/openutils/?rev=3568&view=rev
Author: fgiust
Date: 2011-07-03 14:11:45 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
MEDIA-230 process CMYK images also if not marked as CMYK - fixes "Color conversion error during thumbnail creation"
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2011-07-01 18:55:18 UTC (rev 3567)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2011-07-03 14:11:45 UTC (rev 3568)
@@ -829,10 +829,7 @@
if (image.getContentLength() == 0)
{
- throw new RuntimeException("Invalid image nodedata "
- + image.getHandle()
- + ", size "
- + image.getContentLength());
+ throw new ZeroSizeImageException(image.getHandle());
}
String extension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);
@@ -937,6 +934,11 @@
}
return false;
}
+ catch (ZeroSizeImageException ex)
+ {
+ log.error(ex.getMessage());
+ return false;
+ }
catch (RuntimeException ex)
{
log.error(ClassUtils.getShortClassName(ex.getClass())
@@ -1141,6 +1143,26 @@
return result;
}
+ catch (IllegalArgumentException e)
+ {
+ // java.lang.IllegalArgumentException: Numbers of source Raster bands and source color space components do
+ // not match
+ // at java.awt.image.ColorConvertOp.filter(ColorConvertOp.java:460)
+ // at com.sun.imageio.plugins.jpeg.JPEGImageReader.acceptPixels(JPEGImageReader.java:1169)
+ // at com.sun.imageio.plugins.jpeg.JPEGImageReader.readImage(Native Method)
+ // at com.sun.imageio.plugins.jpeg.JPEGImageReader.readInternal(JPEGImageReader.java:1137)
+ // at com.sun.imageio.plugins.jpeg.JPEGImageReader.read(JPEGImageReader.java:948)
+ BufferedImage result = JpegUtils.processNonStandardImage(image);
+
+ if (result == null)
+ {
+ // throw the original exception back
+ throw new BadImageFormatException("Unable to handle " + image.getHandle(), e);
+ }
+ return result;
+
+ }
+
finally
{
IOUtils.closeQuietly(is);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2011-07-01 18:55:18 UTC (rev 3567)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2011-07-03 14:11:45 UTC (rev 3568)
@@ -44,6 +44,7 @@
import com.drew.imaging.jpeg.JpegProcessingException;
import com.drew.imaging.jpeg.JpegSegmentReader;
+import com.sun.image.codec.jpeg.ImageFormatException;
/**
@@ -147,6 +148,7 @@
*/
public static BufferedImage processNonStandardImage(NodeData image)
{
+ log.debug("Processing {}", image.getHandle());
InputStream is2 = image.getStream();
try
{
@@ -209,16 +211,24 @@
if (ycckProfile)
{
+ // CMYK/YCCK image, need to process it manually
return createJPEG4(raster, ycckProfile);
}
else
{
+ // may be either an RGB or CMYK image, try and see if it's RGB first
InputStream is4 = image.getStream();
try
{
// see MEDIA-72, we need the sun codec to make this work properly
return com.sun.image.codec.jpeg.JPEGCodec.createJPEGDecoder(is4).decodeAsBufferedImage();
}
+ catch (ImageFormatException ife)
+ {
+ // ImageFormatException: Can't construct a BufferedImage for given COLOR_ID
+ // try also with CMYK?
+ return createJPEG4(raster, ycckProfile);
+ }
finally
{
IOUtils.closeQuietly(is4);
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java 2011-07-03 14:11:45 UTC (rev 3568)
@@ -0,0 +1,43 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+/**
+ * Exception for images with an empty content (0 bytes)
+ * @author fgiust
+ * @version $Id$
+ */
+public class ZeroSizeImageException extends RuntimeException
+{
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * @param message
+ */
+ public ZeroSizeImageException(String message)
+ {
+ super("Invalid image data (0 bytes) for " + message);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-07-01 18:55:18 UTC (rev 3567)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-07-03 14:11:45 UTC (rev 3568)
@@ -163,3 +163,5 @@
config.search.filters.modified=Modified since
config.search.filters.path=Path
config.search.filters.sorting=Sorting
+
+media.info.media_originalpath=Original path: {0}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-07-01 18:55:18 UTC (rev 3567)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-07-03 14:11:45 UTC (rev 3568)
@@ -166,3 +166,5 @@
config.search.filters.modified=Modificato dal
config.search.filters.path=Percorso
config.search.filters.sorting=Ordinamento
+
+media.info.media_originalpath=Posizione originale: {0}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-07-03 15:35:25
|
Revision: 3574
http://openutils.svn.sourceforge.net/openutils/?rev=3574&view=rev
Author: fgiust
Date: 2011-07-03 15:35:14 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
MEDIA-245 Remove private functions from MediaEL
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-07-03 15:35:14 UTC (rev 3574)
@@ -30,7 +30,6 @@
import info.magnolia.module.ModuleRegistry;
import java.awt.Point;
-import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -53,7 +52,6 @@
import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
-import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
@@ -832,15 +830,6 @@
return resolutions;
}
- public static void writePlaylistTrackExtension(Content media, PrintWriter writer)
- {
- for (Object item : module().getPlaylistTrackExtensionContributors())
- {
- PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
- contributor.addMediaAttributes(media, writer);
- }
- }
-
/**
* @param obj
* @return
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-07-03 15:35:14 UTC (rev 3574)
@@ -24,8 +24,10 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.io.IOException;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -436,4 +438,14 @@
return metas;
}
+ public void writePlaylistTrackExtension(Content media, PrintWriter writer)
+ {
+ MediaModule module = (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+ for (Object item : module.getPlaylistTrackExtensionContributors())
+ {
+ PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
+ contributor.addMediaAttributes(media, writer);
+ }
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2011-07-03 15:26:14 UTC (rev 3573)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2011-07-03 15:35:14 UTC (rev 3574)
@@ -42,7 +42,7 @@
[/#if]
<extension application="http://www.openmindlab.com/media">
<media:locale code="${mediaLocale}" />
- ${mediaEl.writePlaylistTrackExtension(mediaNode, freemarkerEnv.getCurrentEnvironment().out)}
+ ${this.writePlaylistTrackExtension(mediaNode, freemarkerEnv.getCurrentEnvironment().out)}
</extension>
</track>
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X