Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2010-05-01 16:33:20
|
Revision: 2322
http://openutils.svn.sourceforge.net/openutils/?rev=2322&view=rev
Author: fgiust
Date: 2010-05-01 16:33:13 +0000 (Sat, 01 May 2010)
Log Message:
-----------
MEDIA-112 dam configuration also for ETK
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-stk/
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/
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 2010-04-30 16:18:48 UTC (rev 2321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-05-01 16:33:13 UTC (rev 2322)
@@ -146,35 +146,46 @@
Boolean.TRUE));
// install stk support
- try
+ if (isModuleInstalled("standard-templating-kit"))
{
- if (ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null)
- {
- // adding the "-dam" in addiction to the standard bootstrap directory
- tasks.add(new BootstrapMissingNodesTask("media-dam"));
+ tasks.add(new BootstrapMissingNodesTask("media-stk"));
- // extended template renderer
- tasks.add(new ChangeExistingPropertyTask(
- ContentRepository.CONFIG,
- "/modules/standard-templating-kit/template-renderers/stk",
- "renderer",
- "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
- "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
+ // extended template renderer
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/standard-templating-kit/template-renderers/stk",
+ "renderer",
+ "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
+ "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
- // 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"));
- }
+ // 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"));
}
- catch (IllegalArgumentException e)
+
+ // install etk support
+ if (isModuleInstalled("extended-templating-kit"))
{
- log.debug("Standard templating kit not installed {}", e.getMessage());
+ tasks.add(new BootstrapMissingNodesTask("media-etk"));
}
return tasks;
}
+
+ private boolean isModuleInstalled(String module)
+ {
+ try
+ {
+ return ModuleRegistry.Factory.getInstance().getDefinition(module) != null;
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.debug("Module {} not installed ({} {})", new Object[]{module, e.getClass().getName(), e.getMessage() });
+ }
+ return false;
+ }
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml 2010-05-01 16:33:13 UTC (rev 2322)
@@ -0,0 +1,136 @@
+<?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:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d60c696b-fb70-4f6e-af10-b12d1aac0f32</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.dam.SimpleMediaContentHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="damSelectorOptionLabel" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" 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:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-04-28T11:06:28.122+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-25T18:54:03.791+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="controls">
+ <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>36208289-c865-47ea-b4c1-a331556c96d5</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>2009-05-08T09:09:15.183+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-19T08:40:57.194+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="MediaUUID">
+ <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>7e7e053d-9dbe-4b0a-b720-abc433259ac7</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaSelection</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>stk.dam.mediauuid.description</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang</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>stk.dam.mediauuid.label</sv:value>
+ </sv:property>
+ <sv:property sv:name="mediaType" sv:type="String">
+ <sv:value>image</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Binary</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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-01T21:48:07.894+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-12T15:29:53.127+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.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...> - 2010-05-11 19:51:04
|
Revision: 2392
http://openutils.svn.sourceforge.net/openutils/?rev=2392&view=rev
Author: fgiust
Date: 2010-05-11 19:50:55 +0000 (Tue, 11 May 2010)
Log Message:
-----------
MEDIA-142 playlist xml view (spf)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
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 2010-05-11 19:45:29 UTC (rev 2391)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-11 19:50:55 UTC (rev 2392)
@@ -1,3 +1,4 @@
+// MEDIA-142 da portare su media
/**
*
* Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
@@ -23,10 +24,14 @@
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -61,6 +66,14 @@
private String description;
+ private static final String VIEW_RESULTS_XML = "-xml";
+
+ private String locale;
+
+ private List<Content> mediaContentList;
+
+ private Calendar dateRequest;
+
/**
*
*/
@@ -184,4 +197,96 @@
}
return null;
}
+
+ public String xmlView() throws IOException
+ {
+ this.show();
+ if (this.getPlaylist() == null)
+ {
+ this.response.sendError(404);
+ return this.show();
+ }
+ else
+ {
+ // Set mediaContent
+ mediaContentList = new ArrayList<Content>();
+ for (PlaylistEntryBean plb : this.getPlaylist().getEntries())
+ {
+ try
+ {
+ mediaContentList.add(MgnlContext.getHierarchyManager("media").getContentByUUID(plb.getMedia()));
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error retrieving media {}", e);
+ }
+ }
+
+ // Set date
+ this.dateRequest = Calendar.getInstance();
+
+ // Get locale
+ if (StringUtils.isEmpty(locale))
+ {
+ locale = Locale.getDefault().toString();
+ }
+
+ this.response.setContentType("text/xml");
+ }
+ return VIEW_RESULTS_XML;
+ }
+
+ /**
+ * Returns the locale.
+ * @return the locale
+ */
+ public String getLocale()
+ {
+ return locale;
+ }
+
+ /**
+ * Sets the locale.
+ * @param locale the locale to set
+ */
+ public void setLocale(String locale)
+ {
+ this.locale = locale;
+ }
+
+ /**
+ * Returns the mediaContentList.
+ * @return the mediaContentList
+ */
+ public List<Content> getMediaContentList()
+ {
+ return mediaContentList;
+ }
+
+ /**
+ * Sets the mediaContentList.
+ * @param mediaContentList the mediaContentList to set
+ */
+ public void setMediaContentList(List<Content> mediaContentList)
+ {
+ this.mediaContentList = mediaContentList;
+ }
+
+ /**
+ * Returns the dateRequest.
+ * @return the dateRequest
+ */
+ public Calendar getDateRequest()
+ {
+ return dateRequest;
+ }
+
+ /**
+ * Sets the dateRequest.
+ * @param dateRequest the dateRequest to set
+ */
+ public void setDateRequest(Calendar dateRequest)
+ {
+ this.dateRequest = dateRequest;
+ }
}
Added: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-11 19:50:55 UTC (rev 2392)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<playlist version="1" xmlns="http://xspf.org/ns/0/" xmlns:media="http://www.openmindlab.com/media">
+ [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
+ [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
+ [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
+ [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
+ <title><![CDATA[${this.playlist.title}]]></title>
+ <meta rel="media:locale">${this.locale}</meta>
+ <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
+ <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
+ <date>${dateUtils.getXsdDate(this.dateRequest)}</date>
+ <trackList>
+ [#list this.mediaContentList as mediaDetail]
+ [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
+ <track>
+ <location><![CDATA[${mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))}]]></location>
+ <identifier>media:${mediaDetail.@uuid}</identifier>
+ [#if (mediaDetail['title_' + this.locale])?exists]<title><![CDATA[${mediaDetail['title_' + this.locale]}]]></title>[/#if]
+ [#assign resolution = systemProperty.getProperty("thumbresolution") ]
+ [#if mediaEl.type(mediaNode) == 'image']
+ <image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaNode, resolution)}</image>
+ [#else]
+ [#if (mediaDetail.image)?exists]<image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaDetail, resolution)}</image>[/#if]
+ [/#if]
+ [#if (mediaDetail['description_' + this.locale])?exists]<annotation><![CDATA[${mediaDetail['description_' + this.locale]}]]></annotation>[/#if]
+ [#if (mediaDetail.media_duration)?exists]<duration>${(mediaDetail.media_duration * 1000)?string.computer}</duration>[/#if]
+ <extension application="http://www.openmindlab.com/media">
+ <media:locale code="${this.locale}" />
+ <media:type>${mediaDetail.type}</media:type>
+ </extension>
+ </track>
+ [/#list]
+ </trackList>
+</playlist>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
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...> - 2010-05-11 21:50:10
|
Revision: 2396
http://openutils.svn.sourceforge.net/openutils/?rev=2396&view=rev
Author: fgiust
Date: 2010-05-11 21:50:04 +0000 (Tue, 11 May 2010)
Log Message:
-----------
MEDIA-106 advanced search nearly working
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
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/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml
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/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2010-05-11 21:50:04 UTC (rev 2396)
@@ -28,9 +28,6 @@
import javax.jcr.RepositoryException;
-import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.Option;
-import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterAbstract;
-
import org.apache.commons.lang.StringUtils;
@@ -45,6 +42,8 @@
private String reference;
+ private boolean addempty;
+
/**
* Returns the options.
* @return the options
@@ -85,6 +84,24 @@
}
/**
+ * Returns the addempty.
+ * @return the addempty
+ */
+ public boolean isAddempty()
+ {
+ return addempty;
+ }
+
+ /**
+ * Sets the addempty.
+ * @param addempty the addempty to set
+ */
+ public void setAddempty(boolean addempty)
+ {
+ this.addempty = addempty;
+ }
+
+ /**
* @param reference
*/
private void getOptionsFormReference(String reference)
@@ -99,10 +116,14 @@
.getChildren();
Option opt = new Option();
- opt.setValue("");
- opt.setLabel("---");
- addOptions(opt);
+ if (addempty)
+ {
+ opt.setValue("");
+ opt.setLabel("---");
+ addOptions(opt);
+ }
+
for (Content content : referenceOptions)
{
opt = new Option();
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 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-05-11 21:50:04 UTC (rev 2396)
@@ -21,11 +21,10 @@
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.util.RequestFormUtil;
+import info.magnolia.freemarker.FreemarkerUtil;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
import java.util.Set;
import javax.jcr.RepositoryException;
@@ -39,7 +38,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
@@ -66,9 +64,6 @@
private int items = 100;
- // search path
- private String path;
-
/**
* @param name
* @param request
@@ -79,30 +74,15 @@
super(name, request, response);
}
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings({"unchecked", "deprecation" })
@Override
- protected void populateFromRequest(Object bean)
+ protected String getTemplateName(String viewName)
{
- RequestFormUtil requestFormUtil = new RequestFormUtil(this.getRequest());
- Map<String, Object> parameters = new HashMap<String, Object>(); // needed, can't directly modify the map
- // returned by request.getParameterMap()
- // FIX: siccome arriva da un virtual uri mapping, i parametri originali non sono nella query string e quindi non
- // posso usare il requestFormUtil.getParam... che fa un parsing custom della querystring
- parameters.putAll(request.getParameterMap());
- parameters.putAll(requestFormUtil.getDocuments()); // handle uploaded files too
-
- try
+ if (VIEW_SHOW.equals(viewName))
{
- BeanUtils.populate(bean, parameters);
+ return FreemarkerUtil.createTemplateName(MediaFolderViewPage.class, "html");
}
- catch (Exception e)
- {
- log.error("can't set properties on the handler", e);
- }
+ return super.getTemplateName(viewName);
}
public String show()
@@ -229,7 +209,7 @@
this.response.setContentType("text/xml");
return VIEW_RESULTS_XML;
}
- return "";
+ return VIEW_SHOW;
}
/**
@@ -340,22 +320,4 @@
this.items = items;
}
- /**
- * Returns the path.
- * @return the path
- */
- public String getPath()
- {
- return path;
- }
-
- /**
- * Sets the path.
- * @param path the path to set
- */
- public void setPath(String path)
- {
- this.path = path;
- }
-
}
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 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-05-11 21:50:04 UTC (rev 2396)
@@ -82,35 +82,35 @@
*/
public static final String SORT_BY_USAGE = "usage";
- private String path;
+ protected String path;
- private String node;
+ protected String node;
- private String dest;
+ protected String dest;
- private String type;
+ protected String type;
- private String sorting;
+ protected String sorting;
- private boolean selectMedia;
+ protected boolean selectMedia;
- private String actMediaHandle;
+ protected String actMediaHandle;
- private String mediaType;
+ protected String mediaType;
- private Collection<MediaBean> medias;
+ protected Collection<MediaBean> medias;
- private Collection<MediaTypeConfiguration> types;
+ protected Collection<MediaTypeConfiguration> types;
- private Map<String, Integer> numberOfMedia;
+ protected Map<String, Integer> numberOfMedia;
- private boolean writable;
+ protected boolean writable;
- private boolean canPublish;
+ protected boolean canPublish;
- private boolean develop;
+ protected boolean develop;
- private String search;
+ protected String search;
/**
* @param name
@@ -159,6 +159,8 @@
{
sorting = SORT_BY_MODIFICATIONDATE;
}
+
+ develop = SystemProperty.getBooleanProperty("magnolia.develop");
}
/**
@@ -196,8 +198,6 @@
Collection<Content> mediasOfType = null;
- develop = SystemProperty.getBooleanProperty("magnolia.develop");
-
if (!StringUtils.isBlank(path))
{
try
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 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-11 21:50:04 UTC (rev 2396)
@@ -173,7 +173,7 @@
log.warn("Node {} does not exist in playlist repository", path);
}
}
- return super.show();
+ return VIEW_SHOW;
}
public String save()
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml 2010-05-11 21:50:04 UTC (rev 2396)
@@ -16,7 +16,7 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="toURI" sv:type="String">
- <sv:value>forward:/.magnolia/pages/media-AdvancedSearch.html?command=searchMedia</sv:value>
+ <sv:value>forward:/.magnolia/pages/media-advsearch.html</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
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 2010-05-11 20:46:12 UTC (rev 2395)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-05-11 21:50:04 UTC (rev 2396)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
[#setting url_escaping_charset="UTF-8"]
<head>
- <title>${this.path?html!""}</title>
+ <title>${this.path!?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
@@ -34,7 +34,7 @@
function performAction(action, source, dest)
{
- if (action == "move" && dest == "${this.path?url!""}")
+ if (action == "move" && dest == "${this.path!?url!""}")
{
alert("${this.msgs.get('media.move.error.samenode')}");
return;
@@ -149,7 +149,7 @@
[#assign actual = ""]
[/#if]
<div class="voice mediatab ${actual}">
- <a href="?type=${type.name}&path=${this.path?url!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
+ <a href="?type=${type.name}&path=${this.path!?url!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" />
${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-12 09:06:53
|
Revision: 2403
http://openutils.svn.sourceforge.net/openutils/?rev=2403&view=rev
Author: diego_schivo
Date: 2010-05-12 09:06:47 +0000 (Wed, 12 May 2010)
Log Message:
-----------
MEDIA-92 MediaUsedInManager
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-05-12 08:26:53 UTC (rev 2402)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-05-12 09:06:47 UTC (rev 2403)
@@ -206,42 +206,10 @@
*/
public List<String> getUsedInWebPages(String uuid) throws InvalidQueryException, RepositoryException
{
- return getUsedInWorkspaceNodes(uuid, ContentRepository.WEBSITE, ItemType.CONTENT.getSystemName());
+ return MediaUsedInManager.getInstance().getUsedInWorkspacePaths(uuid, ContentRepository.WEBSITE);
}
/**
- *
- * @param mediaUUID
- * @param repositoryId
- * @param nodeType
- * @return
- * @throws InvalidQueryException
- * @throws RepositoryException
- */
- protected List<String> getUsedInWorkspaceNodes(String mediaUUID, String repositoryId, String nodeType)
- throws InvalidQueryException, RepositoryException
- {
- List<String> handles = new ArrayList<String>();
- QueryManager qm = MgnlContext.getQueryManager(repositoryId);
-
- Query q = qm.createQuery("select * from nt:base where contains(., '" + mediaUUID + "')", Query.SQL);
- QueryResult qr = q.execute();
- Collection<Content> nodes = qr.getContent(nodeType);
- if (nodes != null)
- {
- for (Content c : nodes)
- {
- if (!handles.contains(c.getHandle()))
- {
- handles.add(c.getHandle());
- }
-
- }
- }
- return handles;
- }
-
- /**
* Get all media nodes of given type in a folder
* @param folder folder
* @param type media
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2010-05-12 09:06:47 UTC (rev 2403)
@@ -0,0 +1,144 @@
+package net.sourceforge.openutils.mgnlmedia.media.configuration;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.beans.config.ObservedManager;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.search.Query;
+import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.query.InvalidQueryException;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class MediaUsedInManager extends ObservedManager
+{
+
+ public static MediaUsedInManager getInstance()
+ {
+ return Components.getSingleton(MediaUsedInManager.class);
+ }
+
+ private Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
+
+ private Map<String, UsedInWorkspace> usedInWorkspaceMap = new HashMap<String, UsedInWorkspace>();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ usedInWorkspaceMap.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onRegister(Content node)
+ {
+ Collection<Content> uiwNodes = node.getChildren(ItemType.CONTENTNODE);
+ for (Content uiwNode : uiwNodes)
+ {
+ try
+ {
+ UsedInWorkspace uiw = (UsedInWorkspace) Content2BeanUtil.toBean(uiwNode, UsedInWorkspace.class);
+ if (StringUtils.isEmpty(uiw.getRepositoryId()))
+ {
+ uiw.setRepositoryId(uiwNode.getName());
+ }
+ if (StringUtils.isEmpty(uiw.getNodeType()))
+ {
+ uiw.setNodeType(ItemType.CONTENT.getSystemName());
+ }
+ usedInWorkspaceMap.put(uiw.getRepositoryId(), uiw);
+ }
+ catch (Content2BeanException e)
+ {
+ log.error("Error getting media used-in for {}", uiwNode.getHandle(), e);
+ }
+ }
+ }
+
+ /**
+ * @param mediaUUID
+ * @return
+ * @throws InvalidQueryException
+ * @throws RepositoryException
+ */
+ public Map<String, List<String>> getUsedInPaths(String mediaUUID) throws InvalidQueryException, RepositoryException
+ {
+ Map<String, List<String>> map = new HashMap<String, List<String>>(usedInWorkspaceMap.size());
+ for (String repositoryId : usedInWorkspaceMap.keySet())
+ {
+ map.put(repositoryId, getUsedInWorkspacePaths(mediaUUID, repositoryId));
+ }
+ return map;
+ }
+
+ public List<String> getUsedInWorkspacePaths(String mediaUUID, String repositoryId) throws InvalidQueryException,
+ RepositoryException
+ {
+ UsedInWorkspace usedIn = usedInWorkspaceMap.get(repositoryId);
+ if (usedIn == null)
+ {
+ return Collections.emptyList();
+ }
+ List<Content> nodes = getUsedInWorkspaceNodes(mediaUUID, usedIn.getRepositoryId(), usedIn.getNodeType());
+ List<String> paths = new ArrayList<String>(nodes.size());
+ for (Content node : nodes)
+ {
+ paths.add(node.getHandle());
+ }
+ return paths;
+ }
+
+ private static List<Content> getUsedInWorkspaceNodes(String mediaUUID, String repositoryId, String nodeType)
+ throws InvalidQueryException, RepositoryException
+ {
+ List<Content> nodes = new ArrayList<Content>();
+ Set<String> handles = new HashSet<String>();
+
+ QueryManager qm = MgnlContext.getQueryManager(repositoryId);
+ Query q = qm.createQuery("select * from nt:base where contains(., '" + mediaUUID + "')", Query.SQL);
+ QueryResult qr = q.execute();
+ Collection<Content> qrNodes = qr.getContent(nodeType);
+ if (qrNodes != null)
+ {
+ for (Content c : qrNodes)
+ {
+ if (!handles.contains(c.getHandle()))
+ {
+ nodes.add(c);
+ handles.add(c.getHandle());
+ }
+
+ }
+ }
+ return nodes;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2010-05-12 09:06:47 UTC (rev 2403)
@@ -0,0 +1,50 @@
+package net.sourceforge.openutils.mgnlmedia.media.configuration;
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class UsedInWorkspace
+{
+
+ private String repositoryId;
+
+ private String nodeType;
+
+ /**
+ * Returns the repositoryId.
+ * @return the repositoryId
+ */
+ public String getRepositoryId()
+ {
+ return repositoryId;
+ }
+
+ /**
+ * Sets the repositoryId.
+ * @param repositoryId the repositoryId to set
+ */
+ public void setRepositoryId(String repositoryId)
+ {
+ this.repositoryId = repositoryId;
+ }
+
+ /**
+ * Returns the nodeType.
+ * @return the nodeType
+ */
+ public String getNodeType()
+ {
+ return nodeType;
+ }
+
+ /**
+ * Sets the nodeType.
+ * @param nodeType the nodeType to set
+ */
+ public void setNodeType(String nodeType)
+ {
+ this.nodeType = nodeType;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.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/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-05-12 08:26:53 UTC (rev 2402)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-05-12 09:06:47 UTC (rev 2403)
@@ -19,12 +19,15 @@
package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
+import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
import info.magnolia.module.ModuleRegistry;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,6 +75,7 @@
log.info("Starting module media");
ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
ctx.registerModuleObservingComponent("processors", ImageProcessorsManager.getInstance());
+ ctx.registerModuleObservingComponent("mediausedin", MediaUsedInManager.getInstance());
version = ctx.getCurrentModuleDefinition().getVersion().toString();
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml 2010-05-12 09:06:47 UTC (rev 2403)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="website" 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>94462ffe-1a8b-4f93-955b-c6ec40c65c89</sv:value>
+ </sv:property>
+ <sv:property sv:name="nodeType" sv:type="String">
+ <sv:value>mgnl:content</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:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-12T09:59:19.343+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-12T09:59:44.343+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.media.mediausedin.website.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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: <die...@us...> - 2010-05-12 10:21:47
|
Revision: 2406
http://openutils.svn.sourceforge.net/openutils/?rev=2406&view=rev
Author: diego_schivo
Date: 2010-05-12 10:21:41 +0000 (Wed, 12 May 2010)
Log Message:
-----------
MEDIA-92 basePath e propertyName
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2010-05-12 10:14:04 UTC (rev 2405)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2010-05-12 10:21:41 UTC (rev 2406)
@@ -66,15 +66,15 @@
try
{
UsedInWorkspace uiw = (UsedInWorkspace) Content2BeanUtil.toBean(uiwNode, UsedInWorkspace.class);
- if (StringUtils.isEmpty(uiw.getRepositoryId()))
+ if (StringUtils.isEmpty(uiw.getWorkspaceName()))
{
- uiw.setRepositoryId(uiwNode.getName());
+ uiw.setWorkspaceName(uiwNode.getName());
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
uiw.setNodeType(ItemType.CONTENT.getSystemName());
}
- usedInWorkspaceMap.put(uiw.getRepositoryId(), uiw);
+ usedInWorkspaceMap.put(uiw.getWorkspaceName(), uiw);
}
catch (Content2BeanException e)
{
@@ -92,22 +92,30 @@
public Map<String, List<String>> getUsedInPaths(String mediaUUID) throws InvalidQueryException, RepositoryException
{
Map<String, List<String>> map = new HashMap<String, List<String>>(usedInWorkspaceMap.size());
- for (String repositoryId : usedInWorkspaceMap.keySet())
+ for (String workspaceName : usedInWorkspaceMap.keySet())
{
- map.put(repositoryId, getUsedInWorkspacePaths(mediaUUID, repositoryId));
+ map.put(workspaceName, getUsedInWorkspacePaths(mediaUUID, workspaceName));
}
return map;
}
- public List<String> getUsedInWorkspacePaths(String mediaUUID, String repositoryId) throws InvalidQueryException,
+ public List<String> getUsedInWorkspacePaths(String mediaUUID, String workspaceName) throws InvalidQueryException,
RepositoryException
{
- UsedInWorkspace usedIn = usedInWorkspaceMap.get(repositoryId);
- if (usedIn == null)
+ UsedInWorkspace uiw = usedInWorkspaceMap.get(workspaceName);
+ if (uiw == null)
{
- return Collections.emptyList();
+ if (ContentRepository.WEBSITE.equals(workspaceName) && usedInWorkspaceMap.isEmpty())
+ {
+ // backward compatibility
+ uiw = UsedInWorkspace.DEFAULT_WEBSITE;
+ }
+ else
+ {
+ return Collections.emptyList();
+ }
}
- List<Content> nodes = getUsedInWorkspaceNodes(mediaUUID, usedIn.getRepositoryId(), usedIn.getNodeType());
+ List<Content> nodes = getUsedInWorkspaceNodes(mediaUUID, uiw);
List<String> paths = new ArrayList<String>(nodes.size());
for (Content node : nodes)
{
@@ -116,16 +124,22 @@
return paths;
}
- private static List<Content> getUsedInWorkspaceNodes(String mediaUUID, String repositoryId, String nodeType)
+ private static List<Content> getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
throws InvalidQueryException, RepositoryException
{
List<Content> nodes = new ArrayList<Content>();
Set<String> handles = new HashSet<String>();
- QueryManager qm = MgnlContext.getQueryManager(repositoryId);
- Query q = qm.createQuery("select * from nt:base where contains(., '" + mediaUUID + "')", Query.SQL);
+ QueryManager qm = MgnlContext.getQueryManager(uiw.getWorkspaceName());
+ Query q = qm.createQuery("select * from nt:base where jcr:path like '"
+ + uiw.getBasePath()
+ + "%' and contains("
+ + uiw.getPropertyName()
+ + ", '"
+ + mediaUUID
+ + "')", Query.SQL);
QueryResult qr = q.execute();
- Collection<Content> qrNodes = qr.getContent(nodeType);
+ Collection<Content> qrNodes = qr.getContent(uiw.getNodeType());
if (qrNodes != null)
{
for (Content c : qrNodes)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2010-05-12 10:14:04 UTC (rev 2405)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2010-05-12 10:21:41 UTC (rev 2406)
@@ -1,5 +1,9 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.ItemType;
+
+
/**
* @author dschivo
* @version $Id$
@@ -7,29 +11,51 @@
public class UsedInWorkspace
{
- private String repositoryId;
+ public static final UsedInWorkspace DEFAULT_WEBSITE = new UsedInWorkspace(ContentRepository.WEBSITE);
- private String nodeType;
+ private String workspaceName;
+ private String nodeType = ItemType.CONTENT.getSystemName();
+
+ private String basePath = "/";
+
+ private String propertyName = ".";
+
/**
- * Returns the repositoryId.
- * @return the repositoryId
+ *
*/
- public String getRepositoryId()
+ public UsedInWorkspace()
{
- return repositoryId;
}
/**
- * Sets the repositoryId.
- * @param repositoryId the repositoryId to set
+ * @param workspaceName
+ * @param nodeType
*/
- public void setRepositoryId(String repositoryId)
+ public UsedInWorkspace(String workspaceName)
{
- this.repositoryId = repositoryId;
+ this.workspaceName = workspaceName;
}
/**
+ * Returns the workspaceName.
+ * @return the workspaceName
+ */
+ public String getWorkspaceName()
+ {
+ return workspaceName;
+ }
+
+ /**
+ * Sets the workspaceName.
+ * @param workspaceName the workspaceName to set
+ */
+ public void setWorkspaceName(String workspaceName)
+ {
+ this.workspaceName = workspaceName;
+ }
+
+ /**
* Returns the nodeType.
* @return the nodeType
*/
@@ -47,4 +73,39 @@
this.nodeType = nodeType;
}
+ /**
+ * Returns the basePath.
+ * @return the basePath
+ */
+ public String getBasePath()
+ {
+ return basePath;
+ }
+
+ /**
+ * Sets the basePath.
+ * @param basePath the basePath to set
+ */
+ public void setBasePath(String basePath)
+ {
+ this.basePath = basePath;
+ }
+
+ /**
+ * Returns the propertyName.
+ * @return the propertyName
+ */
+ public String getPropertyName()
+ {
+ return propertyName;
+ }
+
+ /**
+ * Sets the propertyName.
+ * @param propertyName the propertyName to set
+ */
+ public void setPropertyName(String propertyName)
+ {
+ this.propertyName = propertyName;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml 2010-05-12 10:14:04 UTC (rev 2405)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml 2010-05-12 10:21:41 UTC (rev 2406)
@@ -9,9 +9,18 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>94462ffe-1a8b-4f93-955b-c6ec40c65c89</sv:value>
</sv:property>
+ <sv:property sv:name="basePath" sv:type="String">
+ <sv:value>/</sv:value>
+ </sv:property>
<sv:property sv:name="nodeType" sv:type="String">
<sv:value>mgnl:content</sv:value>
</sv:property>
+ <sv:property sv:name="propertyName" sv:type="String">
+ <sv:value>.</sv:value>
+ </sv:property>
+ <sv:property sv:name="workspaceName" sv:type="String">
+ <sv:value>website</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -23,7 +32,7 @@
<sv:value>2010-05-12T09:59:19.343+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-12T09:59:44.343+02:00</sv:value>
+ <sv:value>2010-05-12T12:10:08.671+02: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...> - 2010-05-24 13:18:04
|
Revision: 2541
http://openutils.svn.sourceforge.net/openutils/?rev=2541&view=rev
Author: diego_schivo
Date: 2010-05-24 13:17:54 +0000 (Mon, 24 May 2010)
Log Message:
-----------
MEDIA-142 Expose playlists in xspf format
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
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 2010-05-24 12:37:50 UTC (rev 2540)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 13:17:54 UTC (rev 2541)
@@ -69,7 +69,7 @@
private boolean success;
- private static final String VIEW_RESULTS_XML = "-xml";
+ private static final String VIEW_XSPF = "-xspf";
private static final String VIEW_EXTJS = "-extjs";
@@ -257,13 +257,13 @@
return VIEW_EXTJS;
}
- public String xmlView() throws IOException
+ public String xspf() throws IOException
{
- this.show();
+ String viewName = this.show();
if (this.getPlaylist() == null)
{
this.response.sendError(404);
- return this.show();
+ return viewName;
}
else
{
@@ -273,7 +273,8 @@
{
try
{
- mediaContentList.add(MgnlContext.getHierarchyManager("media").getContentByUUID(plb.getMedia()));
+ mediaContentList.add(MgnlContext.getHierarchyManager(MediaModule.REPO).getContentByUUID(
+ plb.getMedia()));
}
catch (RepositoryException e)
{
@@ -287,9 +288,9 @@
locale = Locale.getDefault().toString();
}
- this.response.setContentType("text/xml");
+ this.response.setContentType("application/xspf+xml");
}
- return VIEW_RESULTS_XML;
+ return VIEW_XSPF;
}
/**
Deleted: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-24 12:37:50 UTC (rev 2540)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-24 13:17:54 UTC (rev 2541)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<playlist version="1" xmlns="http://xspf.org/ns/0/" xmlns:media="http://www.openmindlab.com/media">
- [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
- [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
- [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
- [#assign cal = this.getStatic("java.util.Calendar")]
- [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
- <title><![CDATA[${this.playlist.title}]]></title>
- <meta rel="media:locale">${this.locale}</meta>
- <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
- <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
- <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
- <trackList>
- [#list this.mediaContentList as mediaDetail]
- [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
- <track>
- <location><![CDATA[${mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))}]]></location>
- <identifier>media:${mediaDetail.@uuid}</identifier>
- [#if (mediaDetail['title_' + this.locale])?exists]<title><![CDATA[${mediaDetail['title_' + this.locale]}]]></title>[/#if]
- [#assign resolution = systemProperty.getProperty("thumbresolution") ]
- [#if mediaEl.type(mediaNode) == 'image']
- <image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaNode, resolution)}</image>
- [#else]
- [#if (mediaDetail.image)?exists]<image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaDetail, resolution)}</image>[/#if]
- [/#if]
- [#if (mediaDetail['description_' + this.locale])?exists]<annotation><![CDATA[${mediaDetail['description_' + this.locale]}]]></annotation>[/#if]
- [#if (mediaDetail.media_duration)?exists]<duration>${(mediaDetail.media_duration * 1000)?string.computer}</duration>[/#if]
- <extension application="http://www.openmindlab.com/media">
- <media:locale code="${this.locale}" />
- <media:type>${mediaDetail.type}</media:type>
- </extension>
- </track>
- [/#list]
- </trackList>
-</playlist>
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-05-24 13:17:54 UTC (rev 2541)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<playlist version="1" xmlns="http://xspf.org/ns/0/" xmlns:media="http://www.openmindlab.com/media">
+ [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
+ [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
+ [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
+ [#assign cal = this.getStatic("java.util.Calendar")]
+ [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
+ <title><![CDATA[${this.playlist.title}]]></title>
+ <meta rel="media:locale">${this.locale}</meta>
+ <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
+ <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
+ <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
+ <trackList>
+ [#list this.mediaContentList as mediaDetail]
+ [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
+ <track>
+ <location><![CDATA[${mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))}]]></location>
+ <identifier>media:${mediaDetail.@uuid}</identifier>
+ [#if (mediaDetail['title_' + this.locale])?exists]<title><![CDATA[${mediaDetail['title_' + this.locale]}]]></title>[/#if]
+ [#assign resolution = systemProperty.getProperty("thumbresolution") ]
+ [#if mediaEl.type(mediaNode) == 'image']
+ <image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaNode, resolution)}</image>
+ [#else]
+ [#if (mediaDetail.image)?exists]<image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaDetail, resolution)}</image>[/#if]
+ [/#if]
+ [#if (mediaDetail['description_' + this.locale])?exists]<annotation><![CDATA[${mediaDetail['description_' + this.locale]}]]></annotation>[/#if]
+ [#if (mediaDetail.media_duration)?exists]<duration>${(mediaDetail.media_duration * 1000)?string.computer}</duration>[/#if]
+ <extension application="http://www.openmindlab.com/media">
+ <media:locale code="${this.locale}" />
+ <media:type>${mediaDetail.type}</media:type>
+ </extension>
+ </track>
+ [/#list]
+ </trackList>
+</playlist>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
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: <die...@us...> - 2010-05-24 14:40:26
|
Revision: 2544
http://openutils.svn.sourceforge.net/openutils/?rev=2544&view=rev
Author: diego_schivo
Date: 2010-05-24 14:40:20 +0000 (Mon, 24 May 2010)
Log Message:
-----------
MEDIA-148 Add a link to the xspf format in the playlist editing panel
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.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/resources/mgnl-resources/media/icons/16/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf_inactive.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf_inactive.png
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-24 14:02:07 UTC (rev 2543)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-24 14:40:20 UTC (rev 2544)
@@ -154,12 +154,22 @@
+ ")");
// is there a subscriber?
- if (!hasAnyActiveSubscriber()) {
+ if (!hasAnyActiveSubscriber())
+ {
menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$
menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$
menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$
}
+ ContextMenuItem menuXspf = new ContextMenuItem("xspf");
+ menuXspf.setLabel(msgs.get("tree.playlists.xspf")); //$NON-NLS-1$
+ menuXspf.setIcon(request.getContextPath() + "/.resources/media/icons/16/xspf.png"); //$NON-NLS-1$
+ menuXspf
+ .setOnclick("location.href = '" + request.getContextPath() + "' + " + tree.getJavascriptTree() + ".selectedNode.id + '.xspf';"); //$NON-NLS-1$ //$NON-NLS-2$
+ menuXspf.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedItemType(" //$NON-NLS-1$
+ + tree.getJavascriptTree()
+ + ", '" + PlaylistConstants.PLAYLIST.getSystemName() + "')"); //$NON-NLS-1$
+
tree.addMenuItem(menuNewFolder);
tree.addMenuItem(menuNewPlaylist);
tree.addSeparator();
@@ -174,6 +184,8 @@
tree.addMenuItem(menuActivate);
tree.addMenuItem(menuDeactivate);
}
+ tree.addSeparator();
+ tree.addMenuItem(menuXspf);
}
/**
@@ -182,6 +194,8 @@
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
+ tree.addFunctionBarItem(null);
+ tree.addFunctionBarItemFromContextMenu("xspf");
}
/**
@@ -192,9 +206,7 @@
final Messages msgs = getMessages();
tree.addItemType(PlaylistConstants.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
- tree.addItemType(
- PlaylistConstants.PLAYLIST.getSystemName(),
- "/.resources/media/icons/ico16-playlist.png");
+ tree.addItemType(PlaylistConstants.PLAYLIST.getSystemName(), "/.resources/media/icons/ico16-playlist.png");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.playlists.column"), true);
column0.setWidth(3);
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf_inactive.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/16/xspf_inactive.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf_inactive.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/24/xspf_inactive.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
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 2010-05-24 14:02:07 UTC (rev 2543)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-05-24 14:40:20 UTC (rev 2544)
@@ -106,6 +106,7 @@
tree.playlists=Playlists tree
tree.playlists.new=New playlist
tree.playlists.column=Playlists
+tree.playlists.xspf=xspf format
playlist.entries.add=Add entry
playlist.entries.remove=Remove entry
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 2010-05-24 14:02:07 UTC (rev 2543)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-05-24 14:40:20 UTC (rev 2544)
@@ -109,6 +109,7 @@
tree.playlists=Alberatura playlist
tree.playlists.new=Nuova playlist
tree.playlists.column=Playlists
+tree.playlists.xspf=Formato xspf
playlist.entries.add=Aggiungi elemento
playlist.entries.remove=Rimuovi elemento
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-25 07:49:14
|
Revision: 2547
http://openutils.svn.sourceforge.net/openutils/?rev=2547&view=rev
Author: diego_schivo
Date: 2010-05-25 07:49:07 +0000 (Tue, 25 May 2010)
Log Message:
-----------
MEDIA-148 Add a link to the xspf format in the playlist editing panel
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-25 07:19:13 UTC (rev 2546)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-25 07:49:07 UTC (rev 2547)
@@ -194,8 +194,8 @@
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
- tree.addFunctionBarItem(null);
- tree.addFunctionBarItemFromContextMenu("xspf");
+ // tree.addFunctionBarItem(null);
+ // tree.addFunctionBarItemFromContextMenu("xspf");
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-25 07:19:13 UTC (rev 2546)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-25 07:49:07 UTC (rev 2547)
@@ -199,7 +199,14 @@
}
},{
columnWidth: 0.4,
- items: [ playlistForm ]
+ items: [
+ playlistForm,
+ {
+ xtype: 'panel',
+ bodyStyle: 'padding:0 35px;',
+ html: '<a href="' + contextPath + playlist.handle + '.xspf" class="x-form-item">XSPF format</a>'
+ }
+ ]
}],
renderTo: Ext.getBody()
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-25 08:16:46
|
Revision: 2548
http://openutils.svn.sourceforge.net/openutils/?rev=2548&view=rev
Author: diego_schivo
Date: 2010-05-25 08:16:39 +0000 (Tue, 25 May 2010)
Log Message:
-----------
MEDIA-142 Expose playlists in xspf format
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-25 07:49:07 UTC (rev 2547)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-05-25 08:16:39 UTC (rev 2548)
@@ -165,7 +165,7 @@
menuXspf.setLabel(msgs.get("tree.playlists.xspf")); //$NON-NLS-1$
menuXspf.setIcon(request.getContextPath() + "/.resources/media/icons/16/xspf.png"); //$NON-NLS-1$
menuXspf
- .setOnclick("location.href = '" + request.getContextPath() + "' + " + tree.getJavascriptTree() + ".selectedNode.id + '.xspf';"); //$NON-NLS-1$ //$NON-NLS-2$
+ .setOnclick("location.href = '" + request.getContextPath() + "/playlists' + " + tree.getJavascriptTree() + ".selectedNode.id + '.xspf';"); //$NON-NLS-1$ //$NON-NLS-2$
menuXspf.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedItemType(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ", '" + PlaylistConstants.PLAYLIST.getSystemName() + "')"); //$NON-NLS-1$
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml 2010-05-25 07:49:07 UTC (rev 2547)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml 2010-05-25 08:16:39 UTC (rev 2548)
@@ -10,13 +10,13 @@
<sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
</sv:property>
<sv:property sv:name="fromURI" sv:type="String">
- <sv:value>(.*)\.xspf</sv:value>
+ <sv:value>/playlists/(.*)\.xspf</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="toURI" sv:type="String">
- <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&path=$1</sv:value>
+ <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&path=/$1</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -38,7 +38,7 @@
<sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-24T15:32:35.588+02:00</sv:value>
+ <sv:value>2010-05-25T10:12:35.453+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-25 07:49:07 UTC (rev 2547)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-25 08:16:39 UTC (rev 2548)
@@ -204,7 +204,7 @@
{
xtype: 'panel',
bodyStyle: 'padding:0 35px;',
- html: '<a href="' + contextPath + playlist.handle + '.xspf" class="x-form-item">XSPF format</a>'
+ html: '<a href="' + contextPath + '/playlists' + playlist.handle + '.xspf" class="x-form-item">XSPF format</a>'
}
]
}],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-06-08 16:08:22
|
Revision: 2636
http://openutils.svn.sourceforge.net/openutils/?rev=2636&view=rev
Author: fgiust
Date: 2010-06-08 16:08:16 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
CONTROLS-27 virtualuri name improved, can be useful for more than a grid...
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.mediathumbs.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/VirtualUriMappingMediaThumbOnGrid.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.thumbDocumentMapping.xml
Copied: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java (from rev 2634, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/VirtualUriMappingMediaThumbOnGrid.java)
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java 2010-06-08 16:08:16 UTC (rev 2636)
@@ -0,0 +1,59 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, 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.virtualurimapping;
+
+import info.magnolia.cms.beans.config.VirtualURIMapping;
+import info.magnolia.cms.core.Content;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrap
+ */
+public class MediaThumbnailVirtualUriMapping implements VirtualURIMapping
+{
+
+ private static String PREFIX_MAPPING = "/mediathumbnail/";
+
+ /**
+ * {@inheritDoc}
+ */
+ public MappingResult mapURI(String uri)
+ {
+
+ if (uri.startsWith(PREFIX_MAPPING))
+ {
+ String uuid = StringUtils.substringAfter(uri, PREFIX_MAPPING);
+ Content media = MediaEl.node(uuid);
+ if (media != null)
+ {
+ MappingResult mr = new MappingResult();
+ mr.setToURI("redirect:" + MediaEl.thumbnail(media));
+ mr.setLevel(1);
+ return mr;
+ }
+ }
+
+ return null;
+ }
+
+}
\ No newline at end of file
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/VirtualUriMappingMediaThumbOnGrid.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/VirtualUriMappingMediaThumbOnGrid.java 2010-06-08 15:51:39 UTC (rev 2635)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/VirtualUriMappingMediaThumbOnGrid.java 2010-06-08 16:08:16 UTC (rev 2636)
@@ -1,59 +0,0 @@
-/**
- *
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, 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.virtualurimapping;
-
-import info.magnolia.cms.beans.config.VirtualURIMapping;
-import info.magnolia.cms.core.Content;
-import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * @author cstrap
- */
-public class VirtualUriMappingMediaThumbOnGrid implements VirtualURIMapping
-{
-
- private static String PREFIX_MAPPING = "/mediathumbnail/";
-
- /**
- * {@inheritDoc}
- */
- public MappingResult mapURI(String uri)
- {
-
- if (uri.startsWith(PREFIX_MAPPING))
- {
- String uuid = StringUtils.substringAfter(uri, PREFIX_MAPPING);
- Content media = MediaEl.node(uuid);
- if (media != null)
- {
- MappingResult mr = new MappingResult();
- mr.setToURI("redirect:" + MediaEl.thumbnail(media));
- mr.setLevel(1);
- return mr;
- }
- }
-
- return null;
- }
-
-}
\ No newline at end of file
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.thumbDocumentMapping.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.thumbDocumentMapping.xml 2010-06-08 15:51:39 UTC (rev 2635)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.thumbDocumentMapping.xml 2010-06-08 16:08:16 UTC (rev 2636)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="thumbDocumentMapping" 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>13b23aa0-bf7e-47c4-a89b-3ce373f9d8c4</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.virtualurimapping.VirtualUriMappingMediaThumbOnGrid</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>2007-11-29T22:08:08.307+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-14T12:07:45.140+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-17T10:08:17.852+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
\ No newline at end of file
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.mediathumbs.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.mediathumbs.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.mediathumbs.xml 2010-06-08 16:08:16 UTC (rev 2636)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="mediathumbs" 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>ee4e82be-d5bd-4c65-a529-2ba6a98b10d5</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.virtualurimapping.MediaThumbnailVirtualUriMapping</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>2007-11-29T22:08:08.307+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-14T12:07:45.140+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-08T18:03:48.865+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.media.virtualURIMapping.mediathumbs.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: <die...@us...> - 2010-06-17 10:30:25
|
Revision: 2652
http://openutils.svn.sourceforge.net/openutils/?rev=2652&view=rev
Author: diego_schivo
Date: 2010-06-17 10:30:19 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
MEDIA-152 batch-adding entries to a playlist
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
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
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html
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/PlaylistsBrowserPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-mediaFolder.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2010-06-17 10:30:19 UTC (rev 2652)
@@ -34,6 +34,8 @@
private String cacheKiller = String.valueOf((new Date()).getTime());
+ private String parentFrame;
+
private String sourceNode;
private String action;
@@ -67,6 +69,24 @@
}
/**
+ * Returns the parentFrame.
+ * @return the parentFrame
+ */
+ public String getParentFrame()
+ {
+ return parentFrame;
+ }
+
+ /**
+ * Sets the parentFrame.
+ * @param parentFrame the parentFrame to set
+ */
+ public void setParentFrame(String parentFrame)
+ {
+ this.parentFrame = parentFrame;
+ }
+
+ /**
* Returns the sourceNode.
* @return the sourceNode
*/
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 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-06-17 10:30:19 UTC (rev 2652)
@@ -39,6 +39,8 @@
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.pages.MediaBean;
+import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBeanBuilder;
import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
@@ -79,6 +81,8 @@
private List<Content> mediaContentList;
+ private List<MediaBean> mediaBeans;
+
/**
*
*/
@@ -302,6 +306,23 @@
return VIEW_XSPF;
}
+ public String mediaFolder()
+ {
+ Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ if (folder != null)
+ {
+ Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
+ mediaBeans = new ArrayList<MediaBean>(nodes.size());
+ for (Content node : nodes)
+ {
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(node);
+ MediaBean bean = new MediaBeanBuilder(mtc).apply(node);
+ mediaBeans.add(bean);
+ }
+ }
+ return "-mediaFolder";
+ }
+
/**
* Returns the locale.
* @return the locale
@@ -338,4 +359,12 @@
this.mediaContentList = mediaContentList;
}
+ /**
+ * Returns the mediaBeans.
+ * @return the mediaBeans
+ */
+ public List<MediaBean> getMediaBeans()
+ {
+ return mediaBeans;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-06-17 10:30:19 UTC (rev 2652)
@@ -1,6 +1,6 @@
-var container, playlistView, grid;
+var playlist, container, playlistView, grid;
-function initPlaylistView(playlist){
+function initPlaylistView(){
container = parent.viewport.getComponent('center-panel');
var dataStore = new Ext.data.SimpleStore({
@@ -57,6 +57,15 @@
}
},
{
+ text: playlist.msgs.addEntries,
+ icon: contextPath + '/.resources/media/icons/ico16-add.png',
+ iconCls: 'button-add',
+ handler: function(){
+ var mgnlWin = parent.parent;
+ parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
+ }
+ },
+ {
id: 'removeEntryBtn',
text: playlist.msgs.removeEntry,
icon: contextPath + '/.resources/media/icons/ico16-remove.png',
@@ -262,3 +271,51 @@
playlistView.setWidth(container.body.getWidth(true));
grid.setHeight(container.body.getHeight(true) - 13);
};
+
+function performAction(action, sourceNode, destPath){
+ Ext.MessageBox.show({
+ title: 'Wait',
+ msg: 'Adding entries...',
+ progressText: 'Loading folder...',
+ width: 300,
+ progress: true,
+ closable: false
+ });
+ Ext.Ajax.request({
+ method: 'post',
+ url: contextPath + '/.magnolia/pages/playlistView.html',
+ params: {
+ command: 'mediaFolder',
+ path: destPath
+ },
+ success: function(r){
+ var items = Ext.decode(r.responseText).items;
+ var index = 0;
+ var addNextEntry = function(){
+ if (index == items.length){
+ Ext.MessageBox.updateProgress(1, 'All entries added!');
+ Ext.MessageBox.hide.defer(1000, Ext.MessageBox);
+ }
+ else{
+ Ext.Ajax.request({
+ form: 'addEntryForm',
+ params: {
+ mgnlPath: playlist.handle,
+ media: items[index]
+ },
+ success: function(){
+ var p = (index + 1) / items.length;
+ Ext.MessageBox.updateProgress(p, parseInt(p * 100, 10) + '% completed');
+ index++;
+ addNextEntry();
+ }
+ });
+ }
+ };
+ addNextEntry();
+ },
+ failure: function(){
+ // todo
+ }
+ });
+}
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 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-06-17 10:30:19 UTC (rev 2652)
@@ -109,6 +109,7 @@
tree.playlists.column=Playlists
tree.playlists.xspf=xspf format
playlist.entries.add=Add entry
+playlist.entries.addMany=Add entries
playlist.entries.remove=Remove entry
playlist.media.edit=Edit media
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 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-06-17 10:30:19 UTC (rev 2652)
@@ -112,6 +112,7 @@
tree.playlists.column=Playlists
tree.playlists.xspf=Formato xspf
playlist.entries.add=Aggiungi elemento
+playlist.entries.addMany=Aggiungi elementi
playlist.entries.remove=Rimuovi elemento
playlist.media.edit=Modifica media
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html 2010-06-17 10:30:19 UTC (rev 2652)
@@ -45,7 +45,7 @@
if (destPath == null || destPath.length == 0) {
alert('${this.msgs.get('media.move.error.selectnode')}');
} else {
- parent.frames['mediaFolderView'].performAction('${this.action}', '${this.sourceNode}', destPath);
+ parent.frames['${this.parentFrame!'mediaFolderView'}'].performAction('${this.action!''}', '${this.sourceNode!''}', destPath);
parent.closeLayer();
}
}
Added: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-mediaFolder.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-mediaFolder.html (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-mediaFolder.html 2010-06-17 10:30:19 UTC (rev 2652)
@@ -0,0 +1,9 @@
+{
+ success: true,
+ items: [
+ [#list this.mediaBeans as bean]
+ '${bean.uuid!''}'
+ [#if bean_has_next],[/#if]
+ [/#list]
+ ]
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-mediaFolder.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
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 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-06-17 10:30:19 UTC (rev 2652)
@@ -14,7 +14,7 @@
var contextPath = '${this.request.contextPath}';
Ext.onReady(function(){
[#if this.playlist?exists]
- initPlaylistView({
+ playlist = {
handle: '${this.playlist.handle}',
title: '${(this.playlist.title!'')?js_string}',
description: '${(this.playlist.description!'')?js_string}',
@@ -34,10 +34,12 @@
],
msgs: {
addEntry: '${this.msgs.get('playlist.entries.add')?js_string}',
+ addEntries: '${this.msgs.get('playlist.entries.addMany')?js_string}',
removeEntry: '${this.msgs.get('playlist.entries.remove')?js_string}',
editMedia: '${this.msgs.get('playlist.media.edit')?js_string}'
}
- });
+ };
+ initPlaylistView();
[/#if]
});
//]]>
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 2010-06-15 10:11:29 UTC (rev 2651)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2010-06-17 10:30:19 UTC (rev 2652)
@@ -96,6 +96,17 @@
}
}
+// resize dialog
+function resizeTo(w, h)
+{
+ if (ulDialog)
+ {
+ ulDialog.setWidth(w);
+ ulDialog.setHeight(h);
+ ulDialog.center();
+ }
+}
+
// close dialog
function closeLayer()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-17 11:02:14
|
Revision: 2655
http://openutils.svn.sourceforge.net/openutils/?rev=2655&view=rev
Author: diego_schivo
Date: 2010-06-17 11:02:03 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
MEDIA-152 fix js errors
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-06-17 10:46:41 UTC (rev 2654)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-06-17 11:02:03 UTC (rev 2655)
@@ -26,6 +26,8 @@
import info.magnolia.module.admininterface.SaveHandler;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+import java.io.IOException;
+
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -130,4 +132,12 @@
}
return result;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js 2010-06-17 10:46:41 UTC (rev 2654)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js 2010-06-17 11:02:03 UTC (rev 2655)
@@ -72,6 +72,6 @@
});
mgnlTree.prototype.openFolder = function(contextPath, handle, writable) {
- parent.reloadFolder(handle);
+ if (parent.reloadFolder) parent.reloadFolder(handle);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-06-17 19:03:10
|
Revision: 2662
http://openutils.svn.sourceforge.net/openutils/?rev=2662&view=rev
Author: fgiust
Date: 2010-06-17 19:03:03 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
MEDIA-142 also support xml extension for xspf
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml
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 2010-06-17 18:17:29 UTC (rev 2661)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-06-17 19:03:03 UTC (rev 2662)
@@ -1,4 +1,3 @@
-// MEDIA-142 da portare su media
/**
*
* Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
@@ -40,7 +39,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBean;
-import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBeanBuilder;
import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
@@ -79,6 +77,8 @@
private String locale;
+ private boolean xml;
+
private List<Content> mediaContentList;
private List<MediaBean> mediaBeans;
@@ -301,26 +301,16 @@
locale = Locale.getDefault().toString();
}
- this.response.setContentType("application/xspf+xml");
- }
- return VIEW_XSPF;
- }
-
- public String mediaFolder()
- {
- Content folder = ContentUtil.getContent(MediaModule.REPO, path);
- if (folder != null)
- {
- Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
- mediaBeans = new ArrayList<MediaBean>(nodes.size());
- for (Content node : nodes)
+ if (xml)
{
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(node);
- MediaBean bean = new MediaBeanBuilder(mtc).apply(node);
- mediaBeans.add(bean);
+ this.response.setContentType("text/xml");
}
+ else
+ {
+ this.response.setContentType("application/xspf+xml");
+ }
}
- return "-mediaFolder";
+ return VIEW_XSPF;
}
/**
@@ -367,4 +357,14 @@
{
return mediaBeans;
}
+
+ /**
+ * Sets the xml.
+ * @param xml the xml to set
+ */
+ public void setXml(boolean xml)
+ {
+ this.xml = xml;
+ }
+
}
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml 2010-06-17 18:17:29 UTC (rev 2661)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml 2010-06-17 19:03:03 UTC (rev 2662)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="xspfPlaylists" 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>2176aa80-0366-4ef0-be9a-9fa70de3be9c</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
- </sv:property>
- <sv:property sv:name="fromURI" sv:type="String">
- <sv:value>/playlists/(.*)\.xspf</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="toURI" sv:type="String">
- <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&path=/$1</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:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-25T10:12:35.453+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml 2010-06-17 19:03:03 UTC (rev 2662)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-playlist-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:uuid" sv:type="String">
+ <sv:value>932b7814-dfef-468c-8473-566f4163f4d5</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/playlists/(.*)\.(xspf|xml)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&$2=true&path=/$1</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:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-12T20:13:17.989+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.media.virtualURIMapping.media-playlist-xspf.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: <die...@us...> - 2010-06-29 15:16:56
|
Revision: 2725
http://openutils.svn.sourceforge.net/openutils/?rev=2725&view=rev
Author: diego_schivo
Date: 2010-06-29 15:16:49 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 sort by title
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
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/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-06-29 14:31:49 UTC (rev 2724)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-06-29 15:16:49 UTC (rev 2725)
@@ -51,6 +51,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
@@ -384,13 +385,13 @@
* @param pageSize
* @return
*/
- public AdvancedResult find(String path, String type, String search, boolean recursive, int pageIndex, int pageSize)
+ public AdvancedResult find(String path, String type, String search, boolean childrenOnly, String sorting, int pageIndex, int pageSize)
{
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO);
path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
if (!StringUtils.isEmpty(path))
{
- criteria.setBasePath("//" + path + (recursive ? "//*" : "/*"));
+ criteria.setBasePath("//" + path + (childrenOnly ? "/*" : "//*"));
}
criteria.add(Restrictions.eq("@jcr:primaryType", MGNL_MEDIA_TYPE));
if (!StringUtils.isEmpty(type))
@@ -401,6 +402,10 @@
{
criteria.add(Restrictions.contains(".", search));
}
+ if ("title".equals(sorting))
+ {
+ criteria.addOrder(Order.asc("@title"));
+ }
if (pageSize > 0)
{
criteria.setFirstResult(pageIndex * pageSize);
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 2010-06-29 14:31:49 UTC (rev 2724)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 15:16:49 UTC (rev 2725)
@@ -209,7 +209,14 @@
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- typeResult = MediaConfigurationManager.getInstance().find(folder.getHandle(), type, null, false, 0, -1);
+ typeResult = MediaConfigurationManager.getInstance().find(
+ folder.getHandle(),
+ type,
+ null,
+ true,
+ sorting,
+ 0,
+ -1);
}
catch (RepositoryException ex)
{
@@ -221,7 +228,7 @@
writable = false;
canPublish = false;
- typeResult = MediaConfigurationManager.getInstance().find(null, type, search, true, 0, -1);
+ typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
}
if (typeResult != null && typeResult.getItems().hasNext())
@@ -553,6 +560,24 @@
}
/**
+ * Returns the sorting.
+ * @return the sorting
+ */
+ public String getSorting()
+ {
+ return sorting;
+ }
+
+ /**
+ * Sets the sorting.
+ * @param sorting the sorting to set
+ */
+ public void setSorting(String sorting)
+ {
+ this.sorting = sorting;
+ }
+
+ /**
* Returns the writable.
* @return the writable
*/
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-06-29 14:31:49 UTC (rev 2724)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-06-29 15:16:49 UTC (rev 2725)
@@ -39,12 +39,15 @@
float: right;
}
-#navigation #bgselectorblock {
- width: 48px;
+#navigation #sortingblock,#navigation #bgselectorblock {
float: right;
margin-right: 10px;
}
+#navigation #bgselectorblock {
+ width: 48px;
+}
+
#navigation .right a.bg-selector {
padding-left: 16px;
height: 16px;
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 2010-06-29 14:31:49 UTC (rev 2724)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 15:16:49 UTC (rev 2725)
@@ -142,6 +142,13 @@
<a name="bg-white" href="#" class="bg-selector white [#if this.bgSelector == 'white']white-active[/#if]" title="${this.msgs.get('media.bgselector.white')}"><!-- --></a>
</div>
</div>
+ <div id="sortingblock">
+ <select name="sorting" onchange="location.href = '?type=${this.type}&path=${this.path!?url!''}&sorting=' + this.options[this.selectedIndex].value">
+ <option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>Creation date</option>
+ <option value="modificationdate"[#if this.sorting == 'modificationdate'] selected="selected"[/#if]>Modification date</option>
+ <option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>Title</option>
+ </select>
+ </div>
[#list this.types as type]
[#if type.name == this.type]
[#assign actual = "actual"]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-29 15:59:54
|
Revision: 2728
http://openutils.svn.sourceforge.net/openutils/?rev=2728&view=rev
Author: diego_schivo
Date: 2010-06-29 15:59:47 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 paging
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/MediaFolderViewPage.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 2010-06-29 15:28:18 UTC (rev 2727)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 15:59:47 UTC (rev 2728)
@@ -33,12 +33,15 @@
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.commands.ActivationCommand;
+import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
+import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.jcr.RepositoryException;
@@ -114,6 +117,10 @@
protected String search;
+ private List<Page> pages;
+
+ private int page;
+
/**
* @param name
* @param request
@@ -162,6 +169,11 @@
sorting = SORT_BY_MODIFICATIONDATE;
}
+ if (page <= 0)
+ {
+ page = 1;
+ }
+
develop = SystemProperty.getBooleanProperty("magnolia.develop");
}
@@ -212,8 +224,9 @@
null,
true,
sorting,
- 0,
- -1);
+ page - 1,
+ 5);
+ pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
}
catch (RepositoryException ex)
{
@@ -754,6 +767,33 @@
this.search = search;
}
+ /**
+ * Returns the pages.
+ * @return the pages
+ */
+ public List<Page> getPages()
+ {
+ return pages;
+ }
+
+ /**
+ * Returns the page.
+ * @return the page
+ */
+ public int getPage()
+ {
+ return page;
+ }
+
+ /**
+ * Sets the page.
+ * @param page the page to set
+ */
+ public void setPage(int page)
+ {
+ this.page = page;
+ }
+
public boolean isSingleInstance()
{
return MediaEl.module().isSingleinstance();
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 2010-06-29 15:28:18 UTC (rev 2727)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 15:59:47 UTC (rev 2728)
@@ -162,6 +162,15 @@
</div>
[/#list]
</div>
+
+ <ul class="paging">
+ [#list this.pages as page]
+ <li class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
+ <a href="${page.url}">${page.label}</a>
+ </li>
+ [/#list]
+ </ul>
+
<ul class="mediaList">
[#assign index = 0]
[#list this.medias as media]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-29 16:36:34
|
Revision: 2729
http://openutils.svn.sourceforge.net/openutils/?rev=2729&view=rev
Author: diego_schivo
Date: 2010-06-29 16:36:28 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 paging
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
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/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-06-29 16:36:28 UTC (rev 2729)
@@ -406,6 +406,10 @@
{
criteria.addOrder(Order.asc("@title"));
}
+ else
+ {
+ criteria.addOrder(Order.asc("@jcr:created"));
+ }
if (pageSize > 0)
{
criteria.setFirstResult(pageIndex * pageSize);
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 2010-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 16:36:28 UTC (rev 2729)
@@ -51,6 +51,8 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -241,12 +243,13 @@
typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
}
- if (typeResult != null && typeResult.getItems().hasNext())
+ medias = null;
+ if (typeResult != null)
{
- Iterator<MediaBean> it = Iterators.transform(typeResult.getItems(), new MediaBeanBuilder(mtc));
- medias = Lists.newArrayList(it);
+ ResultIterator<AdvancedResultItem> items = typeResult.getItems();
+ medias = Lists.newArrayList(Iterators.transform(items, new MediaBeanBuilder(mtc)));
}
- else
+ if (medias == null)
{
medias = CollectionUtils.EMPTY_COLLECTION;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-06-29 16:36:28 UTC (rev 2729)
@@ -113,6 +113,49 @@
color: #000;
}
+.paging {
+ clear: left;
+ list-style: none outside none;
+ display: block;
+ height: 24px;
+ padding: 10px 0 0 10px;
+}
+
+.paging .page-current-true {
+ background-color: #006699;
+ font-weight: bold;
+}
+
+.paging li.page-active-false {
+ background-color: #EEEEEE;
+ font-weight: normal;
+}
+
+.paging li.page-active-false a,.paging li.page-active-false a:visited {
+ color: #CCCCCC;
+}
+
+.paging .page-current-true a,.paging .page-current-true a:visited {
+ color: #FFFFFF;
+}
+
+.paging li {
+ background-color: #EEEEEE;
+ float: left;
+ height: 24px;
+ margin: 1px;
+ text-align: center;
+ width: 24px;
+}
+
+.paging li a {
+ display: block;
+ padding-top: 5px;
+ text-decoration: none;
+ vertical-align: middle;
+ width: 24px;
+}
+
.mediaList {
list-style: none;
margin: 0;
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 2010-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 16:36:28 UTC (rev 2729)
@@ -163,13 +163,15 @@
[/#list]
</div>
+ [#if this.pages?size > 5]
<ul class="paging">
[#list this.pages as page]
- <li class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
- <a href="${page.url}">${page.label}</a>
- </li>
+ <li class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
+ <a href="${page.url}">${page.label}</a>
+ </li>
[/#list]
</ul>
+ [/#if]
<ul class="mediaList">
[#assign index = 0]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 13:15:20
|
Revision: 2759
http://openutils.svn.sourceforge.net/openutils/?rev=2759&view=rev
Author: diego_schivo
Date: 2010-06-30 13:15:14 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 mediatab link
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/MediaFolderViewPage.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 2010-06-30 12:35:10 UTC (rev 2758)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 13:15:14 UTC (rev 2759)
@@ -38,6 +38,7 @@
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
import java.io.IOException;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -47,6 +48,7 @@
import java.util.Map;
import javax.jcr.RepositoryException;
+import javax.print.attribute.standard.RequestingUserName;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -838,4 +840,31 @@
param
});
}
+
+ /**
+ * Builds the href for the media type link in the navigation bar.
+ * @param type
+ * @return
+ */
+ public String mediatabLink(MediaTypeConfiguration type)
+ {
+ String link = "?" + StringUtils.defaultString(request.getQueryString());
+ int p1 = StringUtils.indexOfAny(link, new String[]{
+ "?type=", "&type="
+ });
+ if (p1 == -1)
+ {
+ link += ("?".equals(link) ? StringUtils.EMPTY : "&") + "type=" + type.getName();
+ }
+ else
+ {
+ int p2 = StringUtils.indexOf(link, '&', p1 + 1);
+ if (p2 == -1)
+ {
+ p2 = link.length();
+ }
+ link = StringUtils.substring(link, 0, p1 + 1) + "type=" + type.getName() + StringUtils.substring(link, p2);
+ }
+ return link;
+ }
}
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 2010-06-30 12:35:10 UTC (rev 2758)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-30 13:15:14 UTC (rev 2759)
@@ -160,7 +160,7 @@
[#assign actual = ""]
[/#if]
<div class="voice mediatab ${actual}">
- <a href="?type=${type.name}&path=${this.path!?url!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
+ <a href="${this.mediatabLink(type)}">
<img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" />
${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-07-01 10:32:37
|
Revision: 2778
http://openutils.svn.sourceforge.net/openutils/?rev=2778&view=rev
Author: diego_schivo
Date: 2010-07-01 10:32:30 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 paging: configurable itemsPerPage
Modified Paths:
--------------
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/lifecycle/MediaModule.java
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/MediaFolderViewPage.java
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.config.search.xml
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -58,6 +58,8 @@
private String defaultBasePath;
+ private int xmlItemsPerPage;
+
/**
* Returns the filters.
* @return the filters
@@ -81,6 +83,24 @@
this.defaultBasePath = defaultBasePath;
}
+ /**
+ * Returns the xmlItemsPerPage.
+ * @return the xmlItemsPerPage
+ */
+ public int getXmlItemsPerPage()
+ {
+ return xmlItemsPerPage;
+ }
+
+ /**
+ * Sets the xmlItemsPerPage.
+ * @param xmlItemsPerPage the xmlItemsPerPage to set
+ */
+ public void setXmlItemsPerPage(int xmlItemsPerPage)
+ {
+ this.xmlItemsPerPage = xmlItemsPerPage;
+ }
+
public AdvancedResult search(HttpServletRequest request, String mediaType, String path, boolean descendants,
String sorting, int itemsPerPage, int pageNumberStartingFromOne)
{
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -59,6 +59,8 @@
private String version;
private SearchMediaQueryConfiguration search;
+
+ private int folderViewItemsPerPage;
/**
* Constructor
@@ -162,6 +164,24 @@
this.search = search;
}
+ /**
+ * Returns the folderViewItemsPerPage.
+ * @return the folderViewItemsPerPage
+ */
+ public int getFolderViewItemsPerPage()
+ {
+ return folderViewItemsPerPage;
+ }
+
+ /**
+ * Sets the folderViewItemsPerPage.
+ * @param folderViewItemsPerPage the folderViewItemsPerPage to set
+ */
+ public void setFolderViewItemsPerPage(int folderViewItemsPerPage)
+ {
+ this.folderViewItemsPerPage = folderViewItemsPerPage;
+ }
+
public static SearchMediaQueryConfiguration getSearchConfiguration()
{
return ((MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(NAME)).getSearch();
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -26,6 +26,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.lang.StringUtils;
@@ -88,9 +89,19 @@
// @todo defaultBasePath handling only on xml requests?
if ("xml".equals(format))
{
- return configuration.search(request, null, null, true, SORT_BY_SCORE, items, page);
+ return configuration.search(request, null, null, true, SORT_BY_SCORE, MediaEl
+ .module()
+ .getSearch()
+ .getXmlItemsPerPage(), page);
}
- return configuration.search(request, type, "/", true, sorting, items, page);
+ return configuration.search(
+ request,
+ type,
+ "/",
+ true,
+ sorting,
+ MediaEl.module().getFolderViewItemsPerPage(),
+ page);
}
@Override
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -139,8 +139,6 @@
protected int page = 1;
- protected int items = 10;
-
protected AdvancedResult contentMediaDetails;
protected SearchMediaQueryConfiguration configuration;
@@ -240,7 +238,14 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return configuration.search(request, type, path, false, sorting, items, page);
+ return configuration.search(
+ request,
+ type,
+ path,
+ false,
+ sorting,
+ MediaEl.module().getFolderViewItemsPerPage(),
+ page);
}
/**
@@ -802,24 +807,6 @@
}
/**
- * Returns the items.
- * @return the items
- */
- public int getItems()
- {
- return items;
- }
-
- /**
- * Sets the items.
- * @param items the items to set
- */
- public void setItems(int items)
- {
- this.items = items;
- }
-
- /**
* Returns the contentMediaDetails.
* @return the contentMediaDetails
*/
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-07-01 10:32:30 UTC (rev 2778)
@@ -98,6 +98,12 @@
"player",
"jwplayer4"));
+ tasks.add(new CreateMissingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/config",
+ "folderViewItemsPerPage",
+ 10));
+
// MEDIA-70 new enabled property for media type
tasks.add(new CreateMissingPropertyTask(
ContentRepository.CONFIG,
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 2010-07-01 07:41:07 UTC (rev 2777)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-07-01 10:32:30 UTC (rev 2778)
@@ -18,6 +18,9 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
+ <sv:property sv:name="xmlItemsPerPage" sv:type="Long">
+ <sv:value>100</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -32,7 +35,7 @@
<sv:value>2010-02-15T17:07:25.390+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-04-20T16:07:41.931+02:00</sv:value>
+ <sv:value>2010-07-01T12:24:15.712+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="filters">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-07-01 10:47:52
|
Revision: 2780
http://openutils.svn.sourceforge.net/openutils/?rev=2780&view=rev
Author: diego_schivo
Date: 2010-07-01 10:47:46 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
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/pages/MediaAdvancedSearchPage.java
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/MediaAdvancedSearchFormPage.html
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 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -19,15 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.module.ModuleRegistry;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,10 +178,4 @@
{
this.folderViewItemsPerPage = folderViewItemsPerPage;
}
-
- public static SearchMediaQueryConfiguration getSearchConfiguration()
- {
- return ((MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(NAME)).getSearch();
- }
-
}
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 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -19,12 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import java.util.Map;
+
import info.magnolia.freemarker.FreemarkerUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter;
+import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
@@ -45,6 +49,8 @@
private String selectTab;
+ private Map<String, SearchFilter> filters;
+
/**
* @param name
* @param request
@@ -53,6 +59,7 @@
public MediaAdvancedSearchPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
+ filters = MediaEl.module().getSearch().getFilters();
}
@Override
@@ -77,7 +84,11 @@
// no need to count media per type on xml requests
return 0;
}
- return configuration.search(request, mtc.getName(), "/", true, SORT_BY_SCORE, 0, 1).getTotalSize();
+ return MediaEl
+ .module()
+ .getSearch()
+ .search(request, mtc.getName(), "/", true, SORT_BY_SCORE, 0, 1)
+ .getTotalSize();
}
/**
@@ -87,14 +98,19 @@
protected AdvancedResult findMediaItems()
{
// @todo defaultBasePath handling only on xml requests?
+ SearchMediaQueryConfiguration searchConfig = MediaEl.module().getSearch();
if ("xml".equals(format))
{
- return configuration.search(request, null, null, true, SORT_BY_SCORE, MediaEl
- .module()
- .getSearch()
- .getXmlItemsPerPage(), page);
+ return searchConfig.search(
+ request,
+ null,
+ null,
+ true,
+ SORT_BY_SCORE,
+ searchConfig.getXmlItemsPerPage(),
+ page);
}
- return configuration.search(
+ return searchConfig.search(
request,
type,
"/",
@@ -165,6 +181,15 @@
}
/**
+ * Returns the filters.
+ * @return the filters
+ */
+ public Map<String, SearchFilter> getFilters()
+ {
+ return filters;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
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 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -53,7 +53,6 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -141,8 +140,6 @@
protected AdvancedResult contentMediaDetails;
- protected SearchMediaQueryConfiguration configuration;
-
/**
* @param name
* @param request
@@ -151,7 +148,6 @@
public MediaFolderViewPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
- configuration = MediaModule.getSearchConfiguration();
}
/**
@@ -216,8 +212,14 @@
return 0;
}
// sorting must be specified for total-size to work (-1 otherwise)
- AdvancedResult typeResult = configuration
- .search(request, mtc.getName(), path, false, getDefaultSorting(), 0, 1);
+ AdvancedResult typeResult = MediaEl.module().getSearch().search(
+ request,
+ mtc.getName(),
+ path,
+ false,
+ getDefaultSorting(),
+ 0,
+ 1);
return typeResult.getTotalSize();
}
@@ -238,7 +240,7 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return configuration.search(
+ return MediaEl.module().getSearch().search(
request,
type,
path,
@@ -815,15 +817,6 @@
return contentMediaDetails;
}
- /**
- * Returns the configuration.
- * @return the configuration
- */
- public SearchMediaQueryConfiguration getConfiguration()
- {
- return configuration;
- }
-
public boolean isSingleInstance()
{
return MediaEl.module().isSingleinstance();
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 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2010-07-01 10:47:46 UTC (rev 2780)
@@ -24,7 +24,7 @@
[/#if]
[/#list]
[/#macro]
- [@rendersFilter filters=this.configuration.filters /]
+ [@rendersFilter this.filters /]
<input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-07-02 07:51:37
|
Revision: 2788
http://openutils.svn.sourceforge.net/openutils/?rev=2788&view=rev
Author: diego_schivo
Date: 2010-07-02 07:51:31 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
MEDIA-145 refactoring
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/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
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 2010-07-02 07:35:37 UTC (rev 2787)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-07-02 07:51:31 UTC (rev 2788)
@@ -71,7 +71,7 @@
* {@inheritDoc}
*/
@Override
- protected int countMediaItems(MediaTypeConfiguration mtc)
+ protected int countMediaItems(MediaTypeConfiguration type)
{
if ("xml".equals(format))
{
@@ -81,7 +81,7 @@
return MediaEl
.module()
.getSearch()
- .search(request, mtc.getName(), "/", true, SORT_BY_SCORE, 0, 1)
+ .search(request, type.getName(), "/", true, SORT_BY_SCORE, 0, 1)
.getTotalSize();
}
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 2010-07-02 07:35:37 UTC (rev 2787)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-02 07:51:31 UTC (rev 2788)
@@ -78,12 +78,12 @@
public static final String SORT_BY_CREATIONDATE = "creationdate";
/**
- *
+ *
*/
public static final String SORT_BY_FILENAME = "filename";
/**
- *
+ *
*/
public static final String SORT_BY_MODIFICATIONDATE = "modificationdate";
@@ -98,7 +98,7 @@
public static final String SORT_BY_TITLE = "title";
/**
- *
+ *
*/
public static final String SORT_BY_USAGE = "usage";
@@ -158,7 +158,7 @@
{
super.init();
- // left side of navigation bar
+ // left side of navigation bar: media type selectors
if (!StringUtils.isEmpty(mediaType))
{
// subset of types specified by selectMedia control
@@ -179,7 +179,7 @@
types = MediaConfigurationManager.getInstance().getTypes().values();
}
- // right side of navigation bar
+ // right side of navigation bar: sorting and background selectors
bgSelector = null;
sorting = null;
for (Cookie cookie : request.getCookies())
@@ -202,10 +202,10 @@
/**
* Counts media items for the specified type.
- * @param mtc
+ * @param type
* @return
*/
- protected int countMediaItems(MediaTypeConfiguration mtc)
+ protected int countMediaItems(MediaTypeConfiguration type)
{
if (StringUtils.isEmpty(path) && StringUtils.isBlank(search))
{
@@ -214,7 +214,7 @@
// sorting must be specified for total-size to work (-1 otherwise)
AdvancedResult typeResult = MediaEl.module().getSearch().search(
request,
- mtc.getName(),
+ type.getName(),
path,
false,
getDefaultSorting(),
@@ -256,14 +256,13 @@
@Override
public String show()
{
+ // counts media items group by type
numberOfMedia = new HashMap<String, Integer>();
- for (MediaTypeConfiguration mtc : types)
+ for (MediaTypeConfiguration type : types)
{
- numberOfMedia.put(mtc.getName(), countMediaItems(mtc));
+ numberOfMedia.put(type.getName(), countMediaItems(type));
}
- medias = Iterators.emptyIterator();
- pages = Collections.emptyList();
contentMediaDetails = findMediaItems();
if (contentMediaDetails != null)
{
@@ -273,6 +272,14 @@
medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
pages = MgnlPagingElFunctions.pageList(contentMediaDetails.getNumberOfPages(), 5, "page");
}
+ if (medias == null)
+ {
+ medias = Iterators.emptyIterator();
+ }
+ if (pages == null)
+ {
+ pages = Collections.emptyList();
+ }
return super.show();
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-07-02 07:35:37 UTC (rev 2787)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-07-02 07:51:31 UTC (rev 2788)
@@ -118,6 +118,13 @@
padding: 0 2px;
}
+.paging td a {
+ float: left;
+ line-height: 24px;
+ text-decoration: none;
+ width: 24px;
+}
+
.paging .page-current-true a {
background-color: #006699;
font-weight: bold;
@@ -137,13 +144,6 @@
color: #CCCCCC;
}
-.paging td a {
- float: left;
- line-height: 24px;
- text-decoration: none;
- width: 24px;
-}
-
.mediaList {
list-style: none;
margin: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-07-02 07:55:20
|
Revision: 2789
http://openutils.svn.sourceforge.net/openutils/?rev=2789&view=rev
Author: diego_schivo
Date: 2010-07-02 07:55:14 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
MEDIA-145 refactoring
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/MediaAdvancedSearchPage-xml.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 2010-07-02 07:51:31 UTC (rev 2788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-02 07:55:14 UTC (rev 2789)
@@ -138,7 +138,7 @@
protected int page = 1;
- protected AdvancedResult contentMediaDetails;
+ protected AdvancedResult searchResult;
/**
* @param name
@@ -263,14 +263,14 @@
numberOfMedia.put(type.getName(), countMediaItems(type));
}
- contentMediaDetails = findMediaItems();
- if (contentMediaDetails != null)
+ searchResult = findMediaItems();
+ if (searchResult != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
// casts Iterator<AdvancedResultItem> to Iterator<Content>
- Iterator<Content> contentIterator = Iterators.filter(contentMediaDetails.getItems(), Content.class);
+ Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
- pages = MgnlPagingElFunctions.pageList(contentMediaDetails.getNumberOfPages(), 5, "page");
+ pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 5, "page");
}
if (medias == null)
{
@@ -816,12 +816,12 @@
}
/**
- * Returns the contentMediaDetails.
- * @return the contentMediaDetails
+ * Returns the searchResult.
+ * @return the searchResult
*/
- public AdvancedResult getContentMediaDetails()
+ public AdvancedResult getSearchResult()
{
- return contentMediaDetails;
+ return searchResult;
}
public boolean isSingleInstance()
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html 2010-07-02 07:51:31 UTC (rev 2788)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html 2010-07-02 07:55:14 UTC (rev 2789)
@@ -8,11 +8,11 @@
[#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
<location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.currentQueryString()}]]></location>
<date>${dateUtils.toXsdDate(cal.getInstance())}</date>
- <meta rel="page">${this.contentMediaDetails.page}</meta>
- <meta rel="itemsperpage">${this.contentMediaDetails.itemsPerPage}</meta>
- <meta rel="totalitems">${this.contentMediaDetails.totalSize}</meta>
+ <meta rel="page">${this.searchResult.page}</meta>
+ <meta rel="itemsperpage">${this.searchResult.itemsPerPage}</meta>
+ <meta rel="totalitems">${this.searchResult.totalSize}</meta>
<trackList>
- [#list this.contentMediaDetails.items as mediaDetail]
+ [#list this.searchResult.items as mediaDetail]
[#assign mediaLocale = xxxx.getFirstMediaLocale(mediaDetail, this.locale)]
[#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
<track>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-07-06 13:21:21
|
Revision: 2811
http://openutils.svn.sourceforge.net/openutils/?rev=2811&view=rev
Author: diego_schivo
Date: 2010-07-06 13:21:15 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
CONTROLS-31 moved resources
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/media-trigger.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-07-06 07:18:47 UTC (rev 2810)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-07-06 13:21:15 UTC (rev 2811)
@@ -51,12 +51,12 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/MediaField.js\"></script>\n"
+ + "/.resources/media/js/MediaField.js\"></script>\n"
+ "<style type=\"text/css\">\n"
+ ".x-form-field-wrap .x-form-media-trigger {\n"
+ "background-image: url("
+ MgnlContext.getContextPath()
- + "/.resources/controls/css/img/media-trigger.gif);\n"
+ + "/.resources/media/css/images/media-trigger.gif);\n"
+ "}\n"
+ "</style>";
}
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js 2010-07-06 07:18:47 UTC (rev 2810)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js 2010-07-06 13:21:15 UTC (rev 2811)
@@ -1,14 +0,0 @@
-var MediaField = Ext.extend(Ext.form.TriggerField, {
-
- triggerClass: 'x-form-media-trigger',
-
- onTriggerClick: function(){
- if (this.disabled) return;
-
- window.setNewMedia = function(nodeid, uuid, file, thumb){
- this.setValue(uuid);
- }.createDelegate(this);
- mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 800, 500);
- }
-
-});
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/media-trigger.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/media-trigger.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js 2010-07-06 13:21:15 UTC (rev 2811)
@@ -0,0 +1,14 @@
+var MediaField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass: 'x-form-media-trigger',
+
+ onTriggerClick: function(){
+ if (this.disabled) return;
+
+ window.setNewMedia = function(nodeid, uuid, file, thumb){
+ this.setValue(uuid);
+ }.createDelegate(this);
+ mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 800, 500);
+ }
+
+});
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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: <die...@us...> - 2010-08-25 07:33:00
|
Revision: 2883
http://openutils.svn.sourceforge.net/openutils/?rev=2883&view=rev
Author: diego_schivo
Date: 2010-08-25 07:32:53 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
MEDIA-168 Sort by "the displayed name of the media" instead that on the "title" property
Modified Paths:
--------------
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/pages/MediaBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
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/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.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
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/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -36,7 +36,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
-import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -161,9 +161,9 @@
{
c.addOrder(Order.asc("@title"));
}
- else if (MediaFolderViewPage.SORT_BY_FILENAME.equals(sorting))
+ else if (MediaFolderViewPage.SORT_BY_NAME.equals(sorting))
{
- c.addOrder(Order.asc("@" + BaseTypeHandler.FILENAME_NODEDATA_NAME));
+ c.addOrder(Order.asc("@" + MediaTypeHandler.METADATA_NAME));
}
// paging
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -37,6 +37,8 @@
private String handle;
+ private String name;
+
private String filename;
private String title;
@@ -102,6 +104,24 @@
}
/**
+ * Returns the name.
+ * @return the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the name.
+ * @param name the name to set
+ */
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ /**
* Returns the filename.
* @return the filename
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -24,6 +24,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.util.NodeDataUtil;
import java.util.List;
import java.util.Map;
@@ -33,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.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,6 +73,7 @@
mb.setContent(media);
mb.setMetaData(media.getMetaData());
mb.setHandle(media.getHandle());
+ mb.setName(NodeDataUtil.getString(media, MediaTypeHandler.METADATA_NAME));
mb.setFilename(mtc.getHandler().getFilename(media));
mb.setTitle(mtc.getHandler().getTitle(media));
mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
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 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -80,6 +80,11 @@
/**
*
*/
+ public static final String SORT_BY_NAME = "name";
+
+ /**
+ *
+ */
public static final String SORT_BY_FILENAME = "filename";
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -38,6 +38,8 @@
public interface MediaTypeHandler
{
+ String METADATA_NAME = "media_name";
+
String METADATA_WIDTH = "media_width";
String METADATA_HEIGHT = "media_height";
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-08-25 07:32:53 UTC (rev 2883)
@@ -61,8 +61,6 @@
*/
public static final String ORGINAL_NODEDATA_NAME = "original";
- public static final String FILENAME_NODEDATA_NAME = "filename";
-
/**
* Logger.
*/
@@ -142,7 +140,12 @@
{
try
{
- NodeDataUtil.getOrCreateAndSet(media, FILENAME_NODEDATA_NAME, getFilename(media));
+ String name = StringUtils.substringAfterLast(getFilename(media), "/");
+ if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME)))
+ {
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name);
+ media.save();
+ }
if (media.hasContent("resolutions"))
{
@@ -151,14 +154,14 @@
{
nd.delete();
}
+ media.save();
}
if (MediaEl.module().isSingleinstance())
{
media.getMetaData().setActivated();
+ media.save();
}
-
- media.save();
}
catch (RepositoryException ex)
{
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 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-08-25 07:32:53 UTC (rev 2883)
@@ -103,10 +103,10 @@
media.bgselector.transparent=Transparent
media.bgselector.black=Black
+media.sorting.name=Name
media.sorting.score=Score
media.sorting.creationdate=Creation date
media.sorting.title=Title
-media.sorting.filename=Filename
stk.dam.mediauuid.description=Select or create a new media
stk.dam.mediauuid.label=Select media
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 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-08-25 07:32:53 UTC (rev 2883)
@@ -106,10 +106,10 @@
media.bgselector.transparent=Trasparente
media.bgselector.black=Nero
+media.sorting.name=Nome
media.sorting.score=Rilevanza
media.sorting.creationdate=Data di creazione
media.sorting.title=Titolo
-media.sorting.filename=Nome del file
stk.dam.mediauuid.description=Seleziona o carica un nuovo media
stk.dam.mediauuid.label=Seleziona media
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 2010-08-25 07:11:29 UTC (rev 2882)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-08-25 07:32:53 UTC (rev 2883)
@@ -329,9 +329,9 @@
[#if this.request.requestURI?ends_with('/media-advsearch.html')]
<option value="score"[#if this.sorting == 'score'] selected="selected"[/#if]>${this.msgs.get('media.sorting.score')}</option>
[/#if]
+ <option value="name"[#if this.sorting == 'name'] selected="selected"[/#if]>${this.msgs.get('media.sorting.name')}</option>
<option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>${this.msgs.get('media.sorting.creationdate')}</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>${this.msgs.get('media.sorting.title')}</option>
- <option value="filename"[#if this.sorting == 'filename'] selected="selected"[/#if]>${this.msgs.get('media.sorting.filename')}</option>
</select>
</div>
</div>
@@ -367,10 +367,7 @@
<ul class="mediaList">
[#assign index = 0]
[#list this.medias as media]
- [#assign name = media.filename]
- [#if name?contains("/")]
- [#assign name = name?substring(name?last_index_of("/") + 1)]
- [/#if]
+ [#assign name = media.name]
[#if name?length gt 17]
[#assign name = name?substring(0,13)]
[#assign name = name?right_pad(17, ".")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-08-25 08:12:27
|
Revision: 2887
http://openutils.svn.sourceforge.net/openutils/?rev=2887&view=rev
Author: diego_schivo
Date: 2010-08-25 08:12:20 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
MEDIA-168 export media samples
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.lab-cms-products.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2010-08-25 07:53:04 UTC (rev 2886)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2010-08-25 08:12:20 UTC (rev 2887)
@@ -36,6 +36,7 @@
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,6 +76,12 @@
mb.setHandle(media.getHandle());
mb.setName(NodeDataUtil.getString(media, MediaTypeHandler.METADATA_NAME));
mb.setFilename(mtc.getHandler().getFilename(media));
+ // backward compatibility
+ if (StringUtils.isEmpty(mb.getName()) && !StringUtils.isEmpty(mb.getFilename()))
+ {
+ int p = StringUtils.lastIndexOf(mb.getFilename(), '/');
+ mb.setName(p != -1 ? mb.getFilename().substring(p + 1) : mb.getFilename());
+ }
mb.setTitle(mtc.getHandler().getTitle(media));
mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
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 2010-08-25 07:53:04 UTC (rev 2886)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-08-25 08:12:20 UTC (rev 2887)
@@ -75,12 +75,12 @@
/**
*
*/
- public static final String SORT_BY_CREATIONDATE = "creationdate";
+ public static final String SORT_BY_NAME = "name";
/**
*
*/
- public static final String SORT_BY_NAME = "name";
+ public static final String SORT_BY_CREATIONDATE = "creationdate";
/**
*
@@ -874,6 +874,6 @@
protected String getDefaultSorting()
{
- return SORT_BY_CREATIONDATE;
+ return SORT_BY_NAME;
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.lab-cms-products.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.lab-cms-products.xml 2010-08-25 07:53:04 UTC (rev 2886)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.lab-cms-products.xml 2010-08-25 08:12:20 UTC (rev 2887)
@@ -51,6 +51,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>ico-contextmenu</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -73,6 +76,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -80,7 +86,7 @@
<sv:value>2010-06-28T17:56:08.734+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:04:00.229+02:00</sv:value>
+ <sv:value>2010-08-25T10:09:07.609+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -147,6 +153,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-01-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -169,6 +178,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -176,7 +188,7 @@
<sv:value>2010-06-28T17:56:08.828+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:01:08.698+02:00</sv:value>
+ <sv:value>2010-08-25T10:07:56.015+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -243,6 +255,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-02-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -265,6 +280,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -272,7 +290,7 @@
<sv:value>2010-06-28T17:56:08.843+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T17:59:32.621+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:26.875+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -339,6 +357,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-03-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -361,6 +382,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -368,7 +392,7 @@
<sv:value>2010-06-28T17:56:08.859+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T17:59:03.590+02:00</sv:value>
+ <sv:value>2010-08-25T10:07:32.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -435,6 +459,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-04-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -457,6 +484,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -464,7 +494,7 @@
<sv:value>2010-06-28T17:56:08.875+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:00:37.261+02:00</sv:value>
+ <sv:value>2010-08-25T10:07:48.328+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -531,6 +561,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-05-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -553,6 +586,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -560,7 +596,7 @@
<sv:value>2010-06-28T17:56:08.890+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T17:58:12.825+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:58.343+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -627,6 +663,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-06-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -649,6 +688,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -656,7 +698,7 @@
<sv:value>2010-06-28T17:56:08.906+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:00:07.933+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:33.875+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -723,6 +765,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-07-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -745,6 +790,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -752,7 +800,7 @@
<sv:value>2010-06-28T17:56:08.968+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:02:56.291+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:19.843+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -819,6 +867,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-08-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -841,6 +892,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -848,7 +902,7 @@
<sv:value>2010-06-28T17:56:08.984+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:02:03.619+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:04.937+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -915,6 +969,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-09-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -937,6 +994,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -944,7 +1004,7 @@
<sv:value>2010-06-28T17:56:09.000+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:02:27.479+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:40.750+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -1011,6 +1071,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-10-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -1033,6 +1096,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -1040,7 +1106,7 @@
<sv:value>2010-06-28T17:56:09.171+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:01:39.432+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:12.781+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -1107,6 +1173,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>mag-11-box</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>64</sv:value>
</sv:property>
@@ -1129,6 +1198,9 @@
<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>true</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -1136,7 +1208,7 @@
<sv:value>2010-06-28T17:56:09.187+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-28T18:03:26.447+02:00</sv:value>
+ <sv:value>2010-08-25T10:08:47.843+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-08-25 07:53:04 UTC (rev 2886)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-08-25 08:12:20 UTC (rev 2887)
@@ -9,10 +9,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>099156be-71cb-4054-bff0-1d728e1bbe27</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>true</sv:value>
</sv:property>
@@ -48,6 +54,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>External video sample, loaded from blip.tv</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="media_duration" sv:type="Long">
<sv:value>71</sv:value>
</sv:property>
@@ -60,6 +69,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>480</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>Openmindonline-SimpleMediaModuleForMagnoliaCMSLoadAZipArchive567.flv</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Double">
<sv:value>640.0</sv:value>
</sv:property>
@@ -79,6 +91,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>true</sv:value>
</sv:property>
@@ -95,8 +110,11 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ <sv:value>2010-08-25T10:06:50.109+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
</sv:node>
<sv:node sv:name="image">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -120,6 +138,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2009-09-09T12:31:44.774+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/jpeg</sv:value>
</sv:property>
@@ -147,12 +168,18 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>it's a cow</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="media_bitdepth" sv:type="Long">
<sv:value>24</sv:value>
</sv:property>
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>600</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>swiss-cow</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Long">
<sv:value>800</sv:value>
</sv:property>
@@ -169,6 +196,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>true</sv:value>
</sv:property>
@@ -185,8 +215,11 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ <sv:value>2010-08-25T10:06:07.156+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -210,6 +243,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2010-02-13T15:02:25.578+01:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/jpeg</sv:value>
</sv:property>
@@ -237,6 +273,12 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>This is an mp3 files stored in the media module</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>890comm2009mix</sv:value>
+ </sv:property>
<sv:property sv:name="tags" sv:type="String">
<sv:value>mp3, audio</sv:value>
</sv:property>
@@ -250,6 +292,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>true</sv:value>
</sv:property>
@@ -266,8 +311,11 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ <sv:value>2010-08-25T10:06:59.312+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -288,6 +336,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2009-12-30T16:56:17.313+01:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>audio/mpeg</sv:value>
</sv:property>
@@ -312,6 +363,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>A video stored in the repository</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="media_duration" sv:type="Long">
<sv:value>16</sv:value>
</sv:property>
@@ -324,6 +378,9 @@
<sv:property sv:name="media_height" sv:type="Long">
<sv:value>288</sv:value>
</sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>sampleflv</sv:value>
+ </sv:property>
<sv:property sv:name="media_width" sv:type="Double">
<sv:value>360.0</sv:value>
</sv:property>
@@ -343,6 +400,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>true</sv:value>
</sv:property>
@@ -359,8 +419,11 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ <sv:value>2010-08-25T10:06:29.781+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -381,6 +444,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2009-12-30T17:23:22.658+01:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>video/x-flv</sv:value>
</sv:property>
@@ -413,6 +479,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2009-12-30T17:23:22.659+01:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/png</sv:value>
</sv:property>
@@ -437,6 +506,15 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>7a9281a3-a93f-4b9b-a719-ac9340fcd82d</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>standard-tube-map</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_pages" sv:type="Long">
+ <sv:value>2</sv:value>
+ </sv:property>
<sv:property sv:name="tags" sv:type="String">
<sv:value>london, maps</sv:value>
</sv:property>
@@ -450,6 +528,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>true</sv:value>
</sv:property>
@@ -466,8 +547,11 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ <sv:value>2010-08-25T10:07:06.765+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -488,6 +572,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2010-02-13T15:03:24.077+01:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>application/pdf</sv:value>
</sv:property>
@@ -498,6 +585,41 @@
<sv:value>202600</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="image">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7d42d422-1e4d-4dfa-88c5-53cd18846e04</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>png</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>standard-tube-map.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>418</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-08-25 08:19:26
|
Revision: 2888
http://openutils.svn.sourceforge.net/openutils/?rev=2888&view=rev
Author: diego_schivo
Date: 2010-08-25 08:19:20 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
MEDIA-168 default sorting
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/MediaFolderViewPage.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 2010-08-25 08:12:20 UTC (rev 2887)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-08-25 08:19:20 UTC (rev 2888)
@@ -874,6 +874,6 @@
protected String getDefaultSorting()
{
- return SORT_BY_NAME;
+ return SORT_BY_CREATIONDATE;
}
}
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 2010-08-25 08:12:20 UTC (rev 2887)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-08-25 08:19:20 UTC (rev 2888)
@@ -329,8 +329,8 @@
[#if this.request.requestURI?ends_with('/media-advsearch.html')]
<option value="score"[#if this.sorting == 'score'] selected="selected"[/#if]>${this.msgs.get('media.sorting.score')}</option>
[/#if]
+ <option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>${this.msgs.get('media.sorting.creationdate')}</option>
<option value="name"[#if this.sorting == 'name'] selected="selected"[/#if]>${this.msgs.get('media.sorting.name')}</option>
- <option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>${this.msgs.get('media.sorting.creationdate')}</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>${this.msgs.get('media.sorting.title')}</option>
</select>
</div>
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