Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2010-05-09 17:29:14
|
Revision: 2376
http://openutils.svn.sourceforge.net/openutils/?rev=2376&view=rev
Author: fgiust
Date: 2010-05-09 17:29:08 +0000 (Sun, 09 May 2010)
Log Message:
-----------
MEDIA-139 added warning for failed activation
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-05-09 17:28:48 UTC (rev 2375)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-05-09 17:29:08 UTC (rev 2376)
@@ -456,6 +456,8 @@
}
catch (Exception e)
{
+ AlertUtil.setMessage("Activation failed: " + e.getMessage());
+
log.error("Exception activating media", e);
}
@@ -481,6 +483,8 @@
}
catch (Exception e)
{
+ AlertUtil.setMessage("Deactivation failed: " + e.getMessage());
+
log.error("Exception activating media", e);
}
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-09 17:28:48 UTC (rev 2375)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-05-09 17:29:08 UTC (rev 2376)
@@ -104,6 +104,10 @@
*/
new MediaFolderView();
+
+ [#if message?exists]
+ alert("${message?js_string}");
+ [/#if]
});
</script>
</head>
@@ -124,6 +128,7 @@
<input type="hidden" name="path" value="${this.path}" />
[/#if]
</form>
+
<div id="navigation">
<div id="bgselectorblock">
<div class="voice right">
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:45:37
|
Revision: 2391
http://openutils.svn.sourceforge.net/openutils/?rev=2391&view=rev
Author: fgiust
Date: 2010-05-11 19:45:29 +0000 (Tue, 11 May 2010)
Log Message:
-----------
MEDIA-106 advanced search: first import
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/MessagesTemplatedMVCHandler.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
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/SearchFilterSpecFieldMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,70 @@
+package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class Option
+{
+
+ private String label;
+
+ private String value;
+
+ private Boolean defaultValue;
+
+ /**
+ * Returns the label.
+ * @return the label
+ */
+ public String getLabel()
+ {
+ return label;
+ }
+
+ /**
+ * Sets the label.
+ * @param label the label to set
+ */
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ /**
+ * Returns the value.
+ * @return the value
+ */
+ public String getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Sets the value.
+ * @param value the value to set
+ */
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * Returns the defaultValue.
+ * @return the defaultValue
+ */
+ public Boolean getDefaultValue()
+ {
+ return defaultValue;
+ }
+
+ /**
+ * Sets the defaultValue.
+ * @param defaultValue the defaultValue to set
+ */
+ public void setDefaultValue(Boolean defaultValue)
+ {
+ this.defaultValue = defaultValue;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.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/advancedsearch/SearchFilter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,37 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public interface SearchFilter
+{
+
+ List<Criterion> getCriterionList(String parameter, HttpServletRequest request);
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.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/advancedsearch/SearchFilterAbstract.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,112 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+
+import org.apache.commons.collections.ListUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterAbstract implements SearchFilter
+{
+
+ /**
+ * Logger.
+ */
+ protected Logger log = LoggerFactory.getLogger(SearchFilterAbstract.class);
+
+ private Map<String, SearchFilter> subfilters = new LinkedHashMap<String, SearchFilter>();
+
+ private String control;
+
+ private String label;
+
+ /**
+ * Returns the subfilters.
+ * @return the subfilters
+ */
+ public Map<String, SearchFilter> getSubfilters()
+ {
+ return subfilters;
+ }
+
+ public void addSubfilters(String name, SearchFilter subfilter)
+ {
+ subfilters.put(name, subfilter);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ return ListUtils.EMPTY_LIST;
+ }
+
+ /**
+ * Returns the type.
+ * @return the type
+ */
+ public String getControl()
+ {
+ return control;
+ }
+
+ /**
+ * Sets the type.
+ * @param type the type to set
+ */
+ public void setControl(String type)
+ {
+ this.control = type;
+ }
+
+ /**
+ * Returns the label.
+ * @return the label
+ */
+ public String getLabel()
+ {
+ return label;
+ }
+
+ /**
+ * Sets the label.
+ * @param label the label to set
+ */
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.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/advancedsearch/SearchFilterBeetweenCreationDate.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,139 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterBeetweenCreationDate extends SearchFilterAbstract
+{
+
+ private static final String META_DATA_MGNL_CREATIONDATE = "MetaData/@mgnl:creationdate";
+
+ private Calendar from;
+
+ private Calendar to;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+
+ if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0]))
+ {
+ Criterion c;
+ // From
+ from = getDate(values[0]);
+ c = Restrictions.gt(META_DATA_MGNL_CREATIONDATE, from);
+ if (MapUtils.isNotEmpty(getSubfilters()))
+ {
+ String key = getSubfilters().keySet().iterator().next();
+ values = (String[]) request.getParameterMap().get(key);
+ if (StringUtils.isNotBlank(values[0]))
+ {
+ to = getDate(values[0]);
+ c = Restrictions.between(META_DATA_MGNL_CREATIONDATE, from, to);
+ }
+ }
+ criterionList.add(c);
+ }
+ return criterionList;
+
+ }
+
+ private Calendar getDate(String date)
+ {
+ Calendar cal = Calendar.getInstance();
+
+ Pattern datePattern = Pattern.compile("(\\d{4})-(\\d{2})-(\\d{2})");
+ Matcher dateMatcher = datePattern.matcher(date);
+
+ try
+ {
+ if (dateMatcher.find())
+ {
+ cal.set(Integer.parseInt(dateMatcher.group(1)), Integer.parseInt(dateMatcher.group(2)), Integer
+ .parseInt(dateMatcher.group(3)));
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Invalid date: {}", date);
+ }
+
+ return cal;
+ }
+
+ /**
+ * Returns the from.
+ * @return the from
+ */
+ public Calendar getFrom()
+ {
+ return from;
+ }
+
+ /**
+ * Sets the from.
+ * @param from the from to set
+ */
+ public void setFrom(Calendar from)
+ {
+ this.from = from;
+ }
+
+ /**
+ * Returns the to.
+ * @return the to
+ */
+ public Calendar getTo()
+ {
+ return to;
+ }
+
+ /**
+ * Sets the to.
+ * @param to the to to set
+ */
+ public void setTo(Calendar to)
+ {
+ this.to = to;
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.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/advancedsearch/SearchFilterEmpty.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,29 @@
+/**
+ *
+ * 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.advancedsearch;
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterEmpty extends SearchFilterAbstract
+{
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.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/advancedsearch/SearchFilterInMultivalue.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,74 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterInMultivalue extends SearchFilterOptionProvider
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+
+ if (values != null)
+ {
+ for (String value : values)
+ {
+ if (StringUtils.isNotBlank(value))
+ {
+ criterionList.add(Restrictions.contains(parameter, value));
+ }
+ }
+ if (criterionList.size() > 1)
+ {
+ // put criterionList on or
+ Criterion c = Restrictions.or(criterionList.get(0), criterionList.get(1));
+ for (int i = 2; i < criterionList.size(); i++)
+ {
+ c = Restrictions.or(c, criterionList.get(i));
+ }
+ criterionList.removeAll(criterionList);
+ criterionList.add(c);
+ }
+ }
+
+ return criterionList;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.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/advancedsearch/SearchFilterMultiplevalue.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,72 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterMultiplevalue extends SearchFilterOptionProvider
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+ if (values != null)
+ {
+ for (String value : values)
+ {
+ if (StringUtils.isNotBlank(value))
+ {
+ criterionList.add(Restrictions.eq("@" + parameter, value));
+ }
+ }
+ if (criterionList.size() > 1)
+ {
+ // put criterionList on or
+ Criterion c = Restrictions.or(criterionList.get(0), criterionList.get(1));
+ for (int i = 2; i < criterionList.size(); i++)
+ {
+ c = Restrictions.or(c, criterionList.get(i));
+ }
+ criterionList.removeAll(criterionList);
+ criterionList.add(c);
+ }
+ }
+ return criterionList;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.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/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,114 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterOptionProvider extends SearchFilterAbstract
+{
+
+ private List<Option> options = new ArrayList<Option>();
+
+ private String reference;
+
+ /**
+ * Returns the options.
+ * @return the options
+ */
+ public List<Option> getOptions()
+ {
+ return options;
+ }
+
+ /**
+ * Sets the options.
+ * @param options the options to set
+ */
+ public void addOptions(Option option)
+ {
+ options.add(option);
+ }
+
+ /**
+ * Returns the reference.
+ * @return the reference
+ */
+ public String getReference()
+ {
+ return reference;
+ }
+
+ /**
+ * Sets the reference.
+ * @param reference the reference to set
+ */
+ public void setReference(String reference)
+ {
+ this.reference = reference;
+
+ getOptionsFormReference(reference);
+
+ }
+
+ /**
+ * @param reference
+ */
+ private void getOptionsFormReference(String reference)
+ {
+ if (StringUtils.isNotBlank(reference))
+ {
+ try
+ {
+ Collection<Content> referenceOptions = MgnlContext
+ .getHierarchyManager("config")
+ .getContent(reference)
+ .getChildren();
+ Option opt;
+ for (Content content : referenceOptions)
+ {
+ opt = new Option();
+ opt.setLabel(content.getNodeData("label").getString());
+ opt.setValue(content.getName());
+ addOptions(opt);
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // do nothing
+ log.error("Errore reference node on SearchFilterOptionProvider, {}", e);
+ }
+ }
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.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/advancedsearch/SearchFilterSpecFieldMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterSpecFieldMedia extends SearchFilterMultiplevalue
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Option> getOptions()
+ {
+ if (super.getOptions().size() > 0)
+ {
+ return super.getOptions();
+ }
+ List<Option> options = new ArrayList<Option>();
+ Map<String, MediaTypeConfiguration> mediatype = MediaConfigurationManager.getInstance().getTypes();
+ Option option;
+ for (String media : mediatype.keySet())
+ {
+ option = new Option();
+ option.setValue(media);
+ option.setLabel(mediatype.get(media).getLabel());
+ options.add(option);
+ }
+ return options;
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.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/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,64 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterStatus extends SearchFilterOptionProvider
+{
+
+ private static final String META_DATA_MGNL_ACTIVATED = "MetaData/@mgnl:activated";
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+ if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0]))
+ {
+ if (!values[0].equals("ALL") && "PUB".equals(values[0]))
+ {
+ criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
+
+ }
+ if(!values[0].equals("ALL") && "NOTPUB".equals(values[0]))
+ {
+ criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false));
+ }
+ }
+ return criterionList;
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.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/advancedsearch/SearchFilterText.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,88 @@
+/**
+ *
+ * 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.advancedsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchFilterText extends SearchFilterAbstract
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+ {
+ String fullTextSearch;
+ String[] values = (String[]) request.getParameterMap().get(parameter);
+
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+
+ if (values != null && values.length > 0)
+ {
+ fullTextSearch = values[0];
+ if (MapUtils.isNotEmpty(getSubfilters()) && StringUtils.isNotBlank(fullTextSearch))
+ {
+ for (String key : getSubfilters().keySet())
+ {
+ values = request.getParameterValues(key);
+ if (values != null)
+ {
+ for (String name : values)
+ {
+ criterionList.add(Restrictions.contains("@" + name, fullTextSearch));
+ }
+ if (criterionList.size() > 1)
+ {
+ // put criterionList on or
+ Criterion c = Restrictions.or(criterionList.get(0), criterionList.get(1));
+ for (int i = 2; i < criterionList.size(); i++)
+ {
+ c = Restrictions.or(c, criterionList.get(i));
+ }
+ criterionList.removeAll(criterionList);
+ criterionList.add(c);
+ }
+ }
+ }
+ }
+
+ if (StringUtils.isNotBlank(fullTextSearch))
+ {
+ criterionList.add(Restrictions.contains(".", fullTextSearch));
+ }
+ }
+ return criterionList;
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.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/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -0,0 +1,142 @@
+/**
+ *
+ * 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.advancedsearch.configuration;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SearchMediaQueryConfiguration
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SearchMediaQueryConfiguration.class);
+
+ private Map<String, SearchFilter> filters = new LinkedHashMap<String, SearchFilter>();
+
+ private String defaultBasePath;
+
+ private int maxresults = 10000;
+
+ /**
+ * Returns the filters.
+ * @return the filters
+ */
+ public Map<String, SearchFilter> getFilters()
+ {
+ return filters;
+ }
+
+ public void addFilter(String name, SearchFilter filter)
+ {
+ filters.put(name, filter);
+ }
+
+ /**
+ * Sets the defaultBasePath.
+ * @param defaultBasePath the defaultBasePath to set
+ */
+ public void setDefaultBasePath(String defaultBasePath)
+ {
+ this.defaultBasePath = defaultBasePath;
+ }
+
+ /**
+ * Sets the maxresults.
+ * @param maxresults the maxresults to set
+ */
+ public void setMaxresults(int maxresults)
+ {
+ this.maxresults = maxresults;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public AdvancedResult search(HttpServletRequest request, String basePath, String repository, String itemType)
+ {
+ return search(request, basePath, repository, itemType, maxresults, 1);
+ }
+
+ public AdvancedResult search(HttpServletRequest request, String basePath, String repository, String itemType,
+ int itemsPerPage, int pageNumberStartingFromOne)
+ {
+
+ StringBuilder sb = new StringBuilder();
+ if (basePath == null)
+ {
+ // use default
+ sb.append("/").append(defaultBasePath).append("//*");
+ }
+ if (StringUtils.isBlank(basePath) || basePath.equals("/"))
+ {
+ sb.append("//*");
+ }
+ else
+ {
+ sb.append("/").append(basePath).append("//*");
+ }
+
+ Criteria c = JCRCriteriaFactory.createCriteria();
+
+ c.setBasePath(sb.toString());
+ c.setWorkspace(repository);
+
+ c.setPaging(itemsPerPage, pageNumberStartingFromOne);
+ c.addOrder(Order.desc("@jcr:score"));
+
+ List<Criterion> criterionList = new ArrayList<Criterion>();
+ for (String key : filters.keySet())
+ {
+ criterionList = filters.get(key).getCriterionList(key, request);
+ for (Criterion criterion : criterionList)
+ {
+ c.add(criterion);
+ }
+ }
+ // set type
+ c.add(Restrictions.eq("@jcr:primaryType", "mgnl:media"));
+
+ return c.execute();
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.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-11 19:14:51 UTC (rev 2390)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -22,6 +22,7 @@
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;
@@ -54,6 +55,8 @@
private String version;
+ private SearchMediaQueryConfiguration search;
+
/**
* Constructor
*/
@@ -137,4 +140,27 @@
return version;
}
+ /**
+ * Returns the searchConfiguration.
+ * @return the searchConfiguration
+ */
+ public SearchMediaQueryConfiguration getSearch()
+ {
+ return search;
+ }
+
+ /**
+ * Sets the searchConfiguration.
+ * @param searchConfiguration the searchConfiguration to set
+ */
+ public void setSearch(SearchMediaQueryConfiguration search)
+ {
+ this.search = search;
+ }
+
+ 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/MessagesTemplatedMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2010-05-11 19:14:51 UTC (rev 2390)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2010-05-11 19:45:29 UTC (rev 2391)
@@ -19,11 +19,24 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.template.TemplateHashModel;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModelException;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.util.RequestFormUtil;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import info.magnolia.cms.i18n.Messages;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import org.apache.commons.beanutils.BeanUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,6 +48,13 @@
{
/**
+ * Logger.
+ */
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
+ protected TemplateMethodModel getStatic = new GetStaticMethodModel();
+
+ /**
* @param name
* @param request
* @param response
@@ -53,4 +73,57 @@
return super.getMsgs();
}
+ /**
+ * Override the standard method in order to use request.getParameterMap instead of
+ * requestFormUtils.getParamenterMap() since the latter doesn't work with virtual URI
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void populateFromRequest(Object bean)
+ {
+ RequestFormUtil requestFormUtil = new RequestFormUtil(this.getRequest());
+ Map<String, Object> parameters = new HashMap<String, Object>();
+
+ // FIX: use request.getParameterMap instead of requestFormUtils.getParamenterMap()
+ parameters.putAll(request.getParameterMap());
+ parameters.putAll(requestFormUtil.getDocuments()); // handle uploaded files too
+
+ try
+ {
+ BeanUtils.populate(bean, parameters);
+ }
+ catch (Exception e)
+ {
+ log.error("can't set properties on the handler", e);
+ }
+ }
+
+ /**
+ * Returns the getStatic.
+ * @return the getStatic
+ */
+ public TemplateMethodModel getGetStatic()
+ {
+ return getStatic;
+ }
+
+ public static class GetStaticMethodModel implements TemplateMethodModel
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings({"cast" })
+ public Object exec(List arguments) throws TemplateModelException
+ {
+ if (arguments != null && arguments.size() > 0)
+ {
+ BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
+ TemplateHashModel staticModel = wrapper.getStaticModels();
+ return (TemplateHashModel) staticModel.get((String) arguments.get(0));
+ }
+ return null;
+ }
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-05-11 19:14:51 UTC (rev 2390)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-05-11 19:45:29 UTC (rev 2391)
@@ -96,8 +96,8 @@
items:[
{
region:'west',
+ xtype: 'tabpanel',
id:'west-panel',
- title:'${this.msgs.get('tree.media.folders')}',
split:true,
width: 240,
minSize: 175,
@@ -106,7 +106,6 @@
margins:'0 0 0 0',
padding: 0,
expandOnShow: true,
- contentEl: 'mediaTreeView',
floatable: true,
frame: false,
border: false,
@@ -114,7 +113,16 @@
hideBorders: true,
animCollapse:false,
animFloat: false,
- stateful: true
+ stateful: true,
+ deferredRender:false,
+ activeTab:0,
+ items:[{
+ contentEl:'mediaTreeView',
+ title: 'Browse'
+ },{
+ contentEl:'advancedSearchView',
+ title: 'Search'
+ }]
},
centerItem
]
@@ -123,6 +131,7 @@
// FF 3.6 patch
setTimeout(function() {
frames['mediaTreeView'].location.href = getTreeUrl();
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia;
}, 100);
if (openPath != null && openPath != "null" && openPath.length > 0)
@@ -276,9 +285,11 @@
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
- style="width:100%;height:100%;border: none;margin:0;padding:0px;" frameborder="0" scrolling="no"></iframe>
+ style="width:100%; height:100%; border:0 none; margin:0; padding:0;" frameborder="0" scrolling="no"></iframe>
+ <iframe id="advancedSearchView" name="advancedSearchView" class="x-panel-body"
+ src="" style="width:100%; height:100%; border:0 none; margin:0; padding:0; overflow:auto;" frameborder="0" scrolling="no"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
- style="width:100%;height:100%;border:none; overflow:auto" frameborder="0" scrolling="auto"></iframe>
+ style="width:100%; height:100%; border:0 none; overflow:auto;" frameborder="0" scrolling="auto"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-11 20:46:19
|
Revision: 2395
http://openutils.svn.sourceforge.net/openutils/?rev=2395&view=rev
Author: fgiust
Date: 2010-05-11 20:46:12 +0000 (Tue, 11 May 2010)
Log Message:
-----------
MEDIA-106 advanced search
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
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearch.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearchform.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
trunk/openutils-mgnlmedia/src/main/resources/search/
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
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:05:35 UTC (rev 2394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-05-11 20:46:12 UTC (rev 2395)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -36,7 +35,6 @@
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.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.tags.el.MediaEl;
@@ -44,15 +42,8 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.template.TemplateHashModel;
-import freemarker.template.TemplateMethodModel;
-import freemarker.template.TemplateModelException;
-
/**
* Page that renders the folder view
* @author molaschi
@@ -61,14 +52,8 @@
public class MediaAdvancedSearchPage extends MediaAdvancedSearchFormPage
{
- private Logger log = LoggerFactory.getLogger(MediaAdvancedSearchPage.class);
+ private static final String VIEW_RESULTS_XML = "-xml";
- private static final String VIEW_RESULTS = "-results";
-
- private static final String VIEW_RESULTS_XML = "-results-xml";
-
- private TemplateMethodModel getStatic = new GetStaticMethodModel();
-
private String queryString;
private String format;
@@ -77,12 +62,11 @@
private String selectTab;
- // Pirelli pagination
- private int page = 1; // Numero di pagina
+ private int page = 1;
- private int items = 100; // Items per page
+ private int items = 100;
- // Path di ricerca
+ // search path
private String path;
/**
@@ -245,39 +229,10 @@
this.response.setContentType("text/xml");
return VIEW_RESULTS_XML;
}
- return VIEW_RESULTS;
+ return "";
}
/**
- * Returns the getStatic.
- * @return the getStatic
- */
- public TemplateMethodModel getGetStatic()
- {
- return getStatic;
- }
-
- public class GetStaticMethodModel implements TemplateMethodModel
- {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object exec(List arguments) throws TemplateModelException
- {
- if (arguments != null && arguments.size() > 0)
- {
- BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
- TemplateHashModel staticModel = wrapper.getStaticModels();
- return staticModel.get((String) arguments.get(0));
- }
- return null;
- }
-
- }
-
- /**
* Returns the queryString.
* @return the queryString
*/
@@ -332,33 +287,6 @@
}
/**
- * Returns the configuration.
- * @return the configuration
- */
- public SearchMediaQueryConfiguration getConfiguration()
- {
- return configuration;
- }
-
- /**
- * Sets the configuration.
- * @param configuration the configuration to set
- */
- public void setConfiguration(SearchMediaQueryConfiguration configuration)
- {
- this.configuration = configuration;
- }
-
- /**
- * Sets the getStatic.
- * @param getStatic the getStatic to set
- */
- public void setGetStatic(TemplateMethodModel getStatic)
- {
- this.getStatic = getStatic;
- }
-
- /**
* Returns the selectTab.
* @return the selectTab
*/
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:05:35 UTC (rev 2394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-05-11 20:46:12 UTC (rev 2395)
@@ -24,9 +24,6 @@
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.SystemProperty;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.security.Permission;
@@ -57,9 +54,6 @@
import org.apache.commons.chain.Command;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.util.ISO9075;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
@@ -88,11 +82,6 @@
*/
public static final String SORT_BY_USAGE = "usage";
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(MediaFolderViewPage.class);
-
private String path;
private String node;
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearch.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearch.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearch.xml 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-advsearch" 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>bdefdcf0-ec9c-41c7-b542-53d6b63c7138</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.pages.MediaAdvancedSearchPage</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-18T15:49:04.038Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-18T16:32:03.891Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T20:26:45.167+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearch.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearchform.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearchform.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearchform.xml 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-advsearchform" 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>38d8439d-52eb-4291-9a01-c7f2a9ffb150</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.pages.MediaAdvancedSearchFormPage</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-18T15:49:04.038Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-18T16:32:03.891Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T20:27:03.514+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.media-advsearchform.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="searchmedia" 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>0d7d2f4d-07bb-4333-a796-2808f5aef569</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.DefaultVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/media/search</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/media-AdvancedSearch.html?command=searchMedia</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:19.349+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-12T12:42:20.379+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.searchmedia.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,685 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="search" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d87b34d6-c2a6-44f9-9236-fd998d6273e2</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultBasePath" sv:type="String">
+ <sv:value>/mediagallery</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-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:property>
+ </sv:node>
+ <sv:node sv:name="filters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>5c13cb3a-87c6-4f32-94b2-1345f26e6f3d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-16T16:49:02.836+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-05T16:44:08.890+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="query">
+ <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>d0b2951a-0aaf-4b85-a97c-ef3669285be7</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterText</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>input</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.text</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:21:19.449+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="subfilters">
+ <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>2a886807-2afd-468a-89ba-7b5b8e9452e3</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:08:31.569+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-17T12:25:09.352+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="searchin">
+ <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>f43cca15-1f61-469f-87b3-4ae820c49088</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterOptionProvider</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>checkbox</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.searchin</sv:value>
+ </sv:property>
+ <sv:property sv:name="properties" sv:type="String">
+ <sv:value>title,tags,prova</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:09:24.647+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:21:54.608+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="options">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>9d65cdba-e27a-4c61-b3c3-fd72f7a6d0b2</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:47.391+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-18T15:38:51.000+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="title">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e7eb486e-0aef-476f-b494-0e82a1f7798f</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.title</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>title</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:22:48.929+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="description">
+ <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>96a45f3a-a63b-4722-941f-8b859d3ed9e9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.description</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>description</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:22:55.826+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="type">
+ <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>b1e9464a-6434-4693-bff3-a83dad32f2cc</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterSpecFieldMedia</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>checkbox</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.types</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-04-20T16:04:53.184+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="options">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>c517c1ef-7cd9-41fd-8046-62e03752c43d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T16:02:52.443+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-18T16:02:55.683+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="status">
+ <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>63f8470e-b7f2-485d-b421-08d27c55a2dc</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterStatus</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>radio</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.status</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:23:52.310+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="options">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>da096fcb-334c-47fb-a81d-d70c40e3a1c1</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:47.391+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-18T16:14:12.312+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="all">
+ <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>4bc844f7-dfd5-4e23-a0f7-bfb7e5842c79</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultValue" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.all</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>ALL</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:33:16.450+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="published">
+ <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>575da731-699e-4557-bfa8-4cff6c8a748b</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.published</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>PUB</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:33:23.647+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="notpublished">
+ <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>83382f88-a2bb-4818-b563-20a5686cf98e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.notpublished</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>NOTPUB</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:33:32.907+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="from">
+ <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>43e44ae7-5225-4614-9684-2401e8db939d</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterBeetweenCreationDate</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>date</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.date.from</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:24:47.265+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="subfilters">
+ <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>618f8cf1-74eb-4597-b772-ae6e9ad53d52</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:08:31.569+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-16T16:49:37.931+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="to">
+ <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>b8742fd9-df7e-4334-ae44-3a7bd3f2a8a5</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterEmpty</sv:value>
+ </sv:property>
+ <sv:property sv:name="control" sv:type="String">
+ <sv:value>date</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.date.until</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-15T17:09:24.647+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-22T10:24:56.940+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,27 @@
+<div class="row">
+ <#if filter.label??>
+ <label for="${filterKey}">
+ <#if !(this.msgs[filter.label])?starts_with("???")>
+ ${this.msgs[filter.label]}
+ <#else>
+ ${filter.label}
+ </#if>
+ </label>
+ </#if>
+
+ <#list filter.options as option>
+ <div class="inner-row">
+ <input type="checkbox" name="${filterKey}" value="${option.value}" />
+ <span>
+ <#if !(this.msgs[option.label])?starts_with("???")>
+ ${this.msgs[option.label]}
+ <#else>
+ ${option.label}
+ </#if>
+ </span>
+ </div>
+ </#list>
+
+ <@rendersFilter filter.subfilters />
+
+</div>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,33 @@
+<div class="row">
+
+<#if filter.label??>
+<label for="${filterKey}">
+ <#if !(this.msgs[filter.label])?starts_with("???")>
+ ${this.msgs[filter.label]}
+ <#else>
+ ${filter.label}
+ </#if>
+</label>
+</#if>
+
+<input type="text" name="${filterKey}" id="${filterKey}" value="" class="input-date" />
+<span class="mgnlControlButton" id="butt_${filterKey}" onclick="cal_butt_${filterKey}.show()">Date</span>
+<script type="text/javascript">
+// <![CDATA[
+ var cal_butt_${filterKey} = Calendar.setup({
+ inputField: "${filterKey}",
+ ifFormat: "%Y-%m-%d",
+ showsTime: false,
+ timeFormat: "24",
+ cache: true,
+ button: "butt_${filterKey}",
+ singleClick: "true",
+ step: 1
+ });
+// ]]>
+</script>
+
+
+ <@rendersFilter filter.subfilters />
+
+</div>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,5 @@
+<div class="row">
+ <#if filter.label??>
+ <label for="${filterKey}"> <#if !(this.msgs[filter.label])?starts_with("???")> ${this.msgs[filter.label]} <#else> ${filter.label} </#if></label>
+ </#if> NOT READY
+</div>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,14 @@
+<div class="row">
+ <#if filter.label??>
+ <label for="${filterKey}">
+ <#if !(this.msgs[filter.label])?starts_with("???")>
+ ${this.msgs[filter.label]}
+ <#else>
+ ${filter.label}
+ </#if>
+ </label>
+ </#if>
+ <input type="text" name="${filterKey}" value="" />
+ <br />
+ <@rendersFilter filter.subfilters />
+</div>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,30 @@
+<div class="row">
+ <#if filter.label??>
+ <label for="${filterKey}">
+ <#if !(this.msgs[filter.label])?starts_with("???")>
+ ${this.msgs[filter.label]}
+ <#else>
+ ${filter.label}
+ </#if>
+ </label>
+ </#if>
+
+ <#list filter.options as option>
+ <div class="inner-row">
+ <#if option.defaultValue?? & option.defaultValue>
+ <input type="radio" name="${filterKey}" value="${option.value}" checked="checked" />
+ <#else>
+ <input type="radio" name="${filterKey}" value="${option.value}" />
+ </#if>
+ <span>
+ <#if !(this.msgs[option.label])?starts_with("???")>
+ ${this.msgs[option.label]}
+ <#else>
+ ${option.label}
+ </#if>
+ </span>
+ </div>
+ </#list>
+
+ <@rendersFilter filter.subfilters />
+</div>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl 2010-05-11 20:46:12 UTC (rev 2395)
@@ -0,0 +1,30 @@
+<div class="row">
+ <#if filter.label??>
+ <label for="${filterKey}">
+ <#if !(this.msgs[filter.label])?starts_with("???")>
+ ${this.msgs[filter.label]}
+ <#else>
+ ${filter.label}
+ </#if>
+ </label>
+ </#if>
+
+<select name="${filterKey}" id="${filterKey}">
+ <#list filter.options as option>
+ <#if option.defaultValue?? & option.defaultValue>
+ <option value="${option.value}" selected="selected">
+ <#else>
+ <option value="${option.value}">
+ </#if>
+
+ <#if !(this.msgs[option.label])?starts_with("???")>
+ ${this.msgs[option.label]}
+ <#else>
+ ${option.label}
+ </#if>
+
+ </option>
+ </#list>
+</select>
+ <@rendersFilter filter.subfilters />
+</div>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 22:42:00
|
Revision: 2397
http://openutils.svn.sourceforge.net/openutils/?rev=2397&view=rev
Author: fgiust
Date: 2010-05-11 22:41:54 +0000 (Tue, 11 May 2010)
Log Message:
-----------
MEDIA-142 playlist xml view, cleanup
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-05-11 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-05-11 22:41:54 UTC (rev 2397)
@@ -139,10 +139,12 @@
if (content != null && !(content instanceof NodeMapWrapper))
{
- content = new NodeMapWrapper(new I18nContentWrapper(content), MgnlContext
- .getAggregationState()
- .getMainContent()
- .getHandle());
+ Content currentpage = MgnlContext.getAggregationState().getMainContent();
+ if (currentpage == null)
+ {
+ currentpage = content;
+ }
+ content = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
}
return content;
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 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-11 22:41:54 UTC (rev 2397)
@@ -72,8 +72,6 @@
private List<Content> mediaContentList;
- private Calendar dateRequest;
-
/**
*
*/
@@ -222,9 +220,6 @@
}
}
- // Set date
- this.dateRequest = Calendar.getInstance();
-
// Get locale
if (StringUtils.isEmpty(locale))
{
@@ -272,21 +267,4 @@
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;
- }
}
Modified: 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-11 21:50:04 UTC (rev 2396)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-11 22:41:54 UTC (rev 2397)
@@ -3,12 +3,13 @@
[#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.getXsdDate(this.dateRequest)}</date>
+ <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
<trackList>
[#list this.mediaContentList as mediaDetail]
[#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
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:37:15
|
Revision: 2404
http://openutils.svn.sourceforge.net/openutils/?rev=2404&view=rev
Author: diego_schivo
Date: 2010-05-12 09:37:09 +0000 (Wed, 12 May 2010)
Log Message:
-----------
MEDIA-92 usedInUris instead of usedInWebPages
Modified Paths:
--------------
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/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/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-05-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-05-12 09:37:09 UTC (rev 2404)
@@ -55,6 +55,8 @@
private List<String> usedInWebPages = new ArrayList<String>();
+ private List<String> usedInUris = new ArrayList<String>();
+
private boolean canPublish;
private boolean writable;
@@ -226,6 +228,24 @@
}
/**
+ * Returns the usedInUris.
+ * @return the usedInUris
+ */
+ public List<String> getUsedInUris()
+ {
+ return usedInUris;
+ }
+
+ /**
+ * Sets the usedInUris.
+ * @param usedInUris the usedInUris to set
+ */
+ public void setUsedInUris(List<String> usedInUris)
+ {
+ this.usedInUris = usedInUris;
+ }
+
+ /**
* Returns the canPublish.
* @return the canPublish
*/
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-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-05-12 09:37:09 UTC (rev 2404)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -38,6 +40,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.jcr.RepositoryException;
@@ -48,6 +51,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
@@ -256,8 +260,18 @@
&& mb.isWritable()
&& ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
- mb.getUsedInWebPages().addAll(
- MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ Map<String, List<String>> workspacePaths = MediaUsedInManager.getInstance().getUsedInPaths(
+ media.getUUID());
+ mb.getUsedInWebPages().addAll(workspacePaths.get(ContentRepository.WEBSITE));
+ for (Map.Entry<String, List<String>> entry : workspacePaths.entrySet())
+ {
+ String repository = entry.getKey();
+ for (String handle : entry.getValue())
+ {
+ String uri = URI2RepositoryManager.getInstance().getURI(repository, handle);
+ mb.getUsedInUris().add(uri);
+ }
+ }
}
catch (RepositoryException ex)
{
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-12 09:06:47 UTC (rev 2403)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-05-12 09:37:09 UTC (rev 2404)
@@ -280,11 +280,11 @@
<span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
<div class="pages menu" style="display: none;">
<ul class="mediamenu">
- [#list media.usedInWebPages as page]
+ [#list media.usedInUris as uri]
<li>
- <a href="${this.request.contextPath}${page}.html" target="_blank">
+ <a href="${this.request.contextPath}${uri}" target="_blank">
<img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" alt="" />
- <span>${page}</span>
+ <span>${uri}</span>
</a>
</li>
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-21 16:48:38
|
Revision: 2535
http://openutils.svn.sourceforge.net/openutils/?rev=2535&view=rev
Author: diego_schivo
Date: 2010-05-21 16:48:32 +0000 (Fri, 21 May 2010)
Log Message:
-----------
MEDIA-146
Modified Paths:
--------------
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
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-extjs.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-21 16:19:41 UTC (rev 2534)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-21 16:48:32 UTC (rev 2535)
@@ -28,7 +28,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
@@ -66,8 +65,12 @@
private String description;
+ private boolean success;
+
private static final String VIEW_RESULTS_XML = "-xml";
+ private static final String VIEW_EXTJS = "-extjs";
+
private String locale;
private List<Content> mediaContentList;
@@ -117,6 +120,15 @@
}
/**
+ * Returns the success.
+ * @return the success
+ */
+ public boolean isSuccess()
+ {
+ return success;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
@@ -161,7 +173,9 @@
{
log.warn(
"Node {} referenced by entry {} of playlist {} does not exist in media repository",
- new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() });
+ new Object[]{
+ mediaUUID, subNode.getName(), playlist.getHandle()
+ });
}
}
playlist.setEntries(entries);
@@ -176,6 +190,7 @@
public String save()
{
+ success = false;
Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
if (node != null)
{
@@ -188,12 +203,13 @@
node.getMetaData().setActivated();
}
node.save();
+ success = true;
}
catch (RepositoryException e)
{
}
}
- return null;
+ return VIEW_EXTJS;
}
public String xmlView() throws IOException
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-21 16:19:41 UTC (rev 2534)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-21 16:48:32 UTC (rev 2535)
@@ -163,6 +163,9 @@
url: contextPath + '/.magnolia/pages/playlistView.html',
success: function(){
Ext.Msg.alert('Success', 'Playlist successfully saved');
+ },
+ failure: function(){
+ Ext.Msg.alert('Failure', 'Can't save the playlist');
}
});
}
Added: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-extjs.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-extjs.html (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-extjs.html 2010-05-21 16:48:32 UTC (rev 2535)
@@ -0,0 +1 @@
+{ success: ${this.success?string} }
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-extjs.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 11:57:25
|
Revision: 2539
http://openutils.svn.sourceforge.net/openutils/?rev=2539&view=rev
Author: diego_schivo
Date: 2010-05-24 11:57:19 +0000 (Mon, 24 May 2010)
Log Message:
-----------
MEDIA-144 insert media's title and description directly from their own playlist.
Modified Paths:
--------------
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
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 10:53:06 UTC (rev 2538)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 11:57:19 UTC (rev 2539)
@@ -65,6 +65,8 @@
private String description;
+ private String mediaHandle;
+
private boolean success;
private static final String VIEW_RESULTS_XML = "-xml";
@@ -120,6 +122,24 @@
}
/**
+ * Returns the mediaHandle.
+ * @return the mediaHandle
+ */
+ public String getMediaHandle()
+ {
+ return mediaHandle;
+ }
+
+ /**
+ * Sets the mediaHandle.
+ * @param mediaHandle the mediaHandle to set
+ */
+ public void setMediaHandle(String mediaHandle)
+ {
+ this.mediaHandle = mediaHandle;
+ }
+
+ /**
* Returns the success.
* @return the success
*/
@@ -213,6 +233,30 @@
return VIEW_EXTJS;
}
+ public String saveMedia()
+ {
+ success = false;
+ Content node = ContentUtil.getContent(MediaModule.REPO, mediaHandle);
+ if (node != null)
+ {
+ try
+ {
+ NodeDataUtil.getOrCreateAndSet(node, "title", title);
+ NodeDataUtil.getOrCreateAndSet(node, "description", description);
+ if (MediaEl.module().isSingleinstance())
+ {
+ node.getMetaData().setActivated();
+ }
+ node.save();
+ success = true;
+ }
+ catch (RepositoryException e)
+ {
+ }
+ }
+ return VIEW_EXTJS;
+ }
+
public String xmlView() throws IOException
{
this.show();
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-24 10:53:06 UTC (rev 2538)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-24 11:57:19 UTC (rev 2539)
@@ -150,6 +150,60 @@
}
});
+ var mediaForm = new Ext.FormPanel({
+ items: {
+ xtype: 'fieldset',
+ labelWidth: 90,
+ title: 'Selected media details',
+ defaults: {width: 140},
+ defaultType: 'textfield',
+ autoHeight: true,
+ bodyStyle: Ext.isIE ? 'padding:0 0 5px 15px;' : 'padding:10px 15px;',
+ border: false,
+ style: {
+ "margin-left": "10px",
+ "margin-right": Ext.isIE6 ? (Ext.isStrict ? "-10px" : "-13px") : "0"
+ },
+ items: [{
+ xtype: 'hidden',
+ name: 'command',
+ value: 'saveMedia'
+ }, {
+ xtype: 'hidden',
+ name: 'mgnlCK',
+ value: (new Date()).getTime()
+ }, {
+ xtype: 'hidden',
+ name: 'mediaHandle',
+ }, {
+ fieldLabel: 'Title',
+ name: 'title',
+ anchor: '100% none'
+ }, {
+ xtype: 'textarea',
+ fieldLabel: 'Description',
+ name: 'description',
+ anchor: '100% none'
+ }],
+ buttons: [{
+ text: 'Save',
+ handler: function(){
+ if(mediaForm.getForm().isValid()){
+ mediaForm.getForm().submit({
+ url: contextPath + '/.magnolia/pages/playlistView.html',
+ success: function(){
+ Ext.Msg.alert('Success', 'Media successfully saved');
+ },
+ failure: function(){
+ Ext.Msg.alert('Failure', 'Can\'t save media');
+ }
+ });
+ }
+ }
+ }]
+ }
+ });
+
playlistView = new Ext.Panel({
id: 'playlistView',
frame: true,
@@ -167,7 +221,14 @@
},
store: dataStore,
cm: colModel,
- selModel: new Ext.grid.RowSelectionModel(),
+ selModel: new Ext.grid.RowSelectionModel({
+ singleSelect: true,
+ listeners: {
+ rowselect: function(sm, row, rec) {
+ mediaForm.getForm().loadRecord(rec);
+ }
+ }
+ }),
autoSizeColumns: true,
enableColLock: false,
tbar: tbar,
@@ -176,7 +237,7 @@
}
},{
columnWidth: 0.4,
- items: [ playlistForm ]
+ items: [ playlistForm, mediaForm ]
}],
renderTo: Ext.getBody()
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-06-07 15:09:47
|
Revision: 2628
http://openutils.svn.sourceforge.net/openutils/?rev=2628&view=rev
Author: fgiust
Date: 2010-06-07 15:09:41 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
MEDIA-150 uploading of type "jpeg" is not allowed
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-07 14:33:02 UTC (rev 2627)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-07 15:09:41 UTC (rev 2628)
@@ -171,6 +171,21 @@
"parseremotefiles",
Boolean.TRUE));
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/dialogs/mediaImageDlg/tabImage/original",
+ "extensions",
+ "jpg,gif,png",
+ "jpg,jpeg,gif,png"));
+
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/image",
+ "extensions",
+ "jpg,gif,png",
+ "jpg,jpeg,gif,png"));
+
+
// install stk support
if (isModuleInstalled("standard-templating-kit"))
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml 2010-06-07 14:33:02 UTC (rev 2627)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml 2010-06-07 15:09:41 UTC (rev 2628)
@@ -100,7 +100,7 @@
<sv:value>mediaFile</sv:value>
</sv:property>
<sv:property sv:name="extensions" sv:type="String">
- <sv:value>jpg,gif,png</sv:value>
+ <sv:value>jpg,jpeg,gif,png</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.dialogs.tabImage.image.label</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-06-07 14:33:02 UTC (rev 2627)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-06-07 15:09:41 UTC (rev 2628)
@@ -16,7 +16,7 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="extensions" sv:type="String">
- <sv:value>jpg,gif,png</sv:value>
+ <sv:value>jpg,jpeg,gif,png</sv:value>
</sv:property>
<sv:property sv:name="i18nBasename" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-18 06:35:32
|
Revision: 2665
http://openutils.svn.sourceforge.net/openutils/?rev=2665&view=rev
Author: diego_schivo
Date: 2010-06-18 06:35:26 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
restored method
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-06-18 06:24:21 UTC (rev 2664)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-06-18 06:35:26 UTC (rev 2665)
@@ -39,6 +39,7 @@
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;
@@ -313,6 +314,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
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-18 06:24:21 UTC (rev 2664)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-06-18 06:35:26 UTC (rev 2665)
@@ -321,7 +321,7 @@
},
success: function(){
var p = (index + 1) / items.length;
- Ext.MessageBox.updateProgress(p, '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'.replace(/\{0\}/, parseInt(p * 100, 10) + '%');
+ Ext.MessageBox.updateProgress(p, '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'.replace(/\{0\}/, parseInt(p * 100, 10) + '%'));
index++;
addNextEntry();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-29 17:15:51
|
Revision: 2732
http://openutils.svn.sourceforge.net/openutils/?rev=2732&view=rev
Author: diego_schivo
Date: 2010-06-29 17:15:45 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 sorting saved as cookie
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
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 16:58:17 UTC (rev 2731)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 17:15:45 UTC (rev 2732)
@@ -97,6 +97,8 @@
protected String type;
+ protected String bgSelector;
+
protected String sorting;
protected boolean selectMedia;
@@ -119,9 +121,9 @@
protected String search;
- private List<Page> pages;
+ protected List<Page> pages;
- private int page;
+ protected int page;
/**
* @param name
@@ -166,10 +168,21 @@
fillNumberOfMediaPerType();
}
- if (sorting == null)
+ bgSelector = null;
+ sorting = null;
+ for (Cookie cookie : request.getCookies())
{
- sorting = SORT_BY_MODIFICATIONDATE;
+ if ("bgselector".equals(cookie.getName()))
+ {
+ bgSelector = cookie.getValue();
+ }
+ else if ("sorting".equals(cookie.getName()))
+ {
+ sorting = cookie.getValue();
+ }
}
+ bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
+ sorting = StringUtils.defaultString(sorting);
if (page <= 0)
{
@@ -573,21 +586,21 @@
}
/**
- * Returns the sorting.
- * @return the sorting
+ * Returns the bgSelector.
+ * @return the bgSelector
*/
- public String getSorting()
+ public String getBgSelector()
{
- return sorting;
+ return bgSelector;
}
/**
- * Sets the sorting.
- * @param sorting the sorting to set
+ * Returns the sorting.
+ * @return the sorting
*/
- public void setSorting(String sorting)
+ public String getSorting()
{
- this.sorting = sorting;
+ return sorting;
}
/**
@@ -802,18 +815,6 @@
return MediaEl.module().isSingleinstance();
}
- public String getBgSelector()
- {
- for (Cookie cookie : request.getCookies())
- {
- if ("bgselector".equals(cookie.getName()))
- {
- return cookie.getValue();
- }
- }
- return "white";
- }
-
public String getMessage(String key, String param)
{
return getMsgs().get(key, new String[]{param });
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-06-29 16:58:17 UTC (rev 2731)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-06-29 17:15:45 UTC (rev 2732)
@@ -71,7 +71,8 @@
},
handleSelectChange: function(){
- location.href = '?type=' + this.options.type + '&path=' + this.options.path + '&sorting=' + this.select.get('value');
+ Cookie.write('sorting', this.select.get('value'), {duration: 30});
+ location.href = '?type=' + this.options.type + '&path=' + this.options.path;
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 06:28:17
|
Revision: 2735
http://openutils.svn.sourceforge.net/openutils/?rev=2735&view=rev
Author: diego_schivo
Date: 2010-06-30 06:28:10 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 fix search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.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/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2010-06-30 06:24:40 UTC (rev 2734)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2010-06-30 06:28:10 UTC (rev 2735)
@@ -90,7 +90,6 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
public String show()
{
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 06:24:40 UTC (rev 2734)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-30 06:28:10 UTC (rev 2735)
@@ -168,7 +168,7 @@
[/#list]
</div>
- [#if this.pages?size > 5]
+ [#if this.pages?has_content && 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}">
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:55:02
|
Revision: 2760
http://openutils.svn.sourceforge.net/openutils/?rev=2760&view=rev
Author: diego_schivo
Date: 2010-06-30 13:54:56 +0000 (Wed, 30 Jun 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/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html
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-06-30 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 13:54:56 UTC (rev 2760)
@@ -40,8 +40,6 @@
private static final String VIEW_RESULTS_XML = "-xml";
- private String queryString;
-
private String format;
private AdvancedResult contentMediaDetails;
@@ -109,34 +107,6 @@
setType(selectTab);
}
- StringBuilder qs = new StringBuilder();
- for (Object objKey : request.getParameterMap().keySet())
- {
- String key = (String) objKey;
- if ("command".equals(key) || "type".equals(key))
- {
- continue;
- }
- Object objValue = request.getParameterMap().get(key);
- if (objValue.getClass().isArray())
- {
- for (String value : (String[]) objValue)
- {
- if (qs.length() > 0)
- {
- qs.append("&");
- }
- qs.append(key).append("=").append(value);
- }
- }
- else
- {
- qs.append(key).append("=").append(objValue);
- }
- }
- queryString = qs.toString();
-
- setSearch(queryString);
if (!StringUtils.isNotBlank(selectTab))
{
selectTab = getType();
@@ -151,24 +121,6 @@
}
/**
- * Returns the queryString.
- * @return the queryString
- */
- public String getQueryString()
- {
- return queryString;
- }
-
- /**
- * Sets the queryString.
- * @param queryString the queryString to set
- */
- public void setQueryString(String queryString)
- {
- this.queryString = queryString;
- }
-
- /**
* Returns the format.
* @return the format
*/
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 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 13:54:56 UTC (rev 2760)
@@ -38,7 +38,6 @@
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;
@@ -48,7 +47,6 @@
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;
@@ -842,29 +840,33 @@
}
/**
+ * Obtains the query string to use for reloading the current page.<br>
+ * Unwanted parameters are removed.
+ * @return
+ */
+ public String currentQueryString()
+ {
+ String s = request.getQueryString();
+ s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
+ int p1;
+ while ((p1 = StringUtils.indexOfAny(s, new String[]{
+ "&type=", "&command="
+ })) != -1)
+ {
+ int p2 = s.indexOf('&', p1 + 1);
+ s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY);
+ }
+ return s.substring(1);
+ }
+
+ /**
* 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;
+ String s = currentQueryString();
+ return '?' + s + (s.length() > 0 ? '&' : StringUtils.EMPTY) + "type=" + type.getName();
}
}
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-06-30 13:15:14 UTC (rev 2759)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html 2010-06-30 13:54:56 UTC (rev 2760)
@@ -6,7 +6,7 @@
[#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")]
- <location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.queryString}]]></location>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 15:21:54
|
Revision: 2763
http://openutils.svn.sourceforge.net/openutils/?rev=2763&view=rev
Author: diego_schivo
Date: 2010-06-30 15:21:47 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 adv-search sorting
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/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/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-06-30 14:15:55 UTC (rev 2762)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-06-30 15:21:47 UTC (rev 2763)
@@ -34,6 +34,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -95,10 +96,10 @@
*/
public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath)
{
- return search(request, mediaType, basePath, maxresults, 1);
+ return search(request, mediaType, basePath, MediaFolderViewPage.SORT_BY_SCORE, maxresults, 1);
}
- public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath,
+ public AdvancedResult search(HttpServletRequest request, String mediaType, String basePath, String sorting,
int itemsPerPage, int pageNumberStartingFromOne)
{
@@ -123,8 +124,21 @@
c.setWorkspace(MediaModule.REPO);
c.setPaging(itemsPerPage, pageNumberStartingFromOne);
- c.addOrder(Order.desc("@jcr:score"));
+ // sorting
+ if (MediaFolderViewPage.SORT_BY_SCORE.equals(sorting))
+ {
+ c.addOrder(Order.desc("@jcr:score"));
+ }
+ else if (MediaFolderViewPage.SORT_BY_CREATIONDATE.equals(sorting))
+ {
+ c.addOrder(Order.asc("@jcr:created"));
+ }
+ else if (MediaFolderViewPage.SORT_BY_TITLE.equals(sorting))
+ {
+ c.addOrder(Order.asc("@title"));
+ }
+
List<Criterion> criterionList = new ArrayList<Criterion>();
for (String key : filters.keySet())
{
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-06-30 14:15:55 UTC (rev 2762)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-06-30 15:21:47 UTC (rev 2763)
@@ -93,7 +93,7 @@
// paging disabled for xml requests
return configuration.search(request, type, null);
}
- return configuration.search(request, type, "/", items, page);
+ return configuration.search(request, type, "/", sorting, items, page);
}
@Override
@@ -173,4 +173,13 @@
{
this.selectTab = selectTab;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected String getDefaultSorting()
+ {
+ return SORT_BY_SCORE;
+ }
}
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 14:15:55 UTC (rev 2762)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 15:21:47 UTC (rev 2763)
@@ -90,6 +90,11 @@
/**
*
*/
+ public static final String SORT_BY_SCORE = "score";
+
+ /**
+ *
+ */
public static final String SORT_BY_TITLE = "title";
/**
@@ -189,7 +194,7 @@
}
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
- sorting = StringUtils.defaultIfEmpty(sorting, SORT_BY_CREATIONDATE);
+ sorting = StringUtils.defaultIfEmpty(sorting, getDefaultSorting());
// for activation status handling
develop = SystemProperty.getBooleanProperty("magnolia.develop");
@@ -212,7 +217,7 @@
search,
StringUtils.isEmpty(search),
// sorting must be specified for total-size to work (-1 otherwise)
- SORT_BY_CREATIONDATE,
+ getDefaultSorting(),
0,
1);
return typeResult.getTotalSize();
@@ -869,4 +874,9 @@
String s = currentQueryString();
return '?' + s + (s.length() > 0 ? '&' : StringUtils.EMPTY) + "type=" + type.getName();
}
+
+ protected String getDefaultSorting()
+ {
+ 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-06-30 14:15:55 UTC (rev 2762)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-30 15:21:47 UTC (rev 2763)
@@ -352,7 +352,10 @@
<div id="sortingblock">
<div class="voice right" style="padding-top: 3px;">
<select id="sorting" name="sorting">
- <option value=""[#if this.sorting == 'creationdate'] selected="selected"[/#if]>Creation date</option>
+ [#if this.request.requestURI?ends_with('/media-advsearch.html')]
+ <option value="score"[#if this.sorting == 'score'] selected="selected"[/#if]>Score</option>
+ [/#if]
+ <option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>Creation date</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>Title</option>
</select>
</div>
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:54:17
|
Revision: 2813
http://openutils.svn.sourceforge.net/openutils/?rev=2813&view=rev
Author: diego_schivo
Date: 2010-07-06 13:54:09 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
CONTROLS-31 samples-media-grid paragraph
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media-grid.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
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-07-06 13:24:14 UTC (rev 2812)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-07-06 13:54:09 UTC (rev 2813)
@@ -74,6 +74,9 @@
private static final String VIEW_XSPF = "-xspf";
+ /**
+ * JSON response to ajax calls (eg: saving playlist title and description)
+ */
private static final String VIEW_EXTJS = "-extjs";
private String locale;
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media-grid.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media-grid.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media-grid.xml 2010-07-06 13:54:09 UTC (rev 2813)
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-media-grid" 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>b0f017a9-6092-4c10-b6fa-4204f2fbdd6e</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <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:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:25:37.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGrid">
+ <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>9934f47b-f514-470c-ad98-c50686422acc</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Grid</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.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:25:32.875+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="grid">
+ <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>73b0f000-7bca-4b11-a421-e8744185efe9</sv:value>
+ </sv:property>
+ <sv:property sv:name="addRowsEnabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>grid</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>350</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>Grid</sv:value>
+ </sv:property>
+ <sv:property sv:name="rows" sv:type="Long">
+ <sv:value>10</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:25:32.875+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="columns">
+ <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>d6f2be0e-7a48-4f12-8fc1-209dbb0976d8</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-07-02T15:01:02.937+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:25:32.875+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="00">
+ <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>39544810-49f0-4c6e-9170-ad85bf1cb445</sv:value>
+ </sv:property>
+ <sv:property sv:name="header" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:26:02.547+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media-grid.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml 2010-07-06 13:54:09 UTC (rev 2813)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-media-grid" 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>a6cfb91a-3da1-44af-b30f-4e36465569a2</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample grid paragraph with a column of media objects.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="templatePath" sv:type="String">
+ <sv:value>/templates/samples-media/paragraph-grid.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Grid sample for module media</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>jsp</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>2008-09-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:27:17.859+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2010-07-06 13:24:14 UTC (rev 2812)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2010-07-06 13:54:09 UTC (rev 2813)
@@ -9,6 +9,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>d6861cc7-18c5-4c64-86be-c20b34586cad</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="text" sv:type="String">
<sv:value><p>This sample shows how to use jsp template, how you can extend the Template class and add your own variables and how to define parameters that you can then use as request parameters.</p></sv:value>
</sv:property>
@@ -19,6 +22,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>false</sv:value>
</sv:property>
@@ -29,7 +35,7 @@
<sv:value>2009-01-16T09:26:04.050+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
+ <sv:value>2010-07-06T15:50:42.703+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>sampleSimpleMedia</sv:value>
@@ -45,10 +51,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>338b6542-c356-4680-a859-f389c4ba01d2</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:creationdate" sv:type="Date">
<sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
</sv:property>
@@ -64,10 +76,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>45ec599b-6974-4a16-b55a-9a65d1a06e3c</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -75,7 +93,7 @@
<sv:value>2009-01-16T10:14:19.199+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
+ <sv:value>2010-07-06T15:50:42.703+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="03">
@@ -88,6 +106,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>2011e0df-8f0d-4f66-83d2-a0d267a6773a</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" sv:type="String">
<sv:value>ad7e0745-ba39-448b-99ae-71ef39f8d45e</sv:value>
</sv:property>
@@ -95,6 +116,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -119,6 +143,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>eb76ccfe-1bd0-4d56-bfbe-5004ce32ba26</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" sv:type="String">
<sv:value>ef030b33-c082-4304-abfd-65f498caedf8</sv:value>
</sv:property>
@@ -132,6 +159,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -156,6 +186,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>91082704-7e48-4e4e-b59e-530924e62fc4</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" sv:type="String">
<sv:value>d39f582f-3d53-46ae-95d9-42f778198503</sv:value>
</sv:property>
@@ -163,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -187,6 +223,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>32b5785e-88f6-4b05-a154-80156d0dbf4a</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" sv:type="String">
<sv:value>ad7e0745-ba39-448b-99ae-71ef39f8d45e</sv:value>
</sv:property>
@@ -200,6 +239,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -224,6 +266,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>7a2d0b81-fffa-46b8-a115-ec0389f23c79</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" sv:type="String">
<sv:value>7a342aeb-6e05-4e4a-8aa4-fa93e0312a3f</sv:value>
</sv:property>
@@ -237,6 +282,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -261,6 +309,9 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>4e4bae9c-e22c-48fd-a954-5afd5cbadee3</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="playlist" sv:type="String">
<sv:value>/samples/test</sv:value>
</sv:property>
@@ -268,6 +319,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:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -282,5 +336,52 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="05">
+ <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>ba6b59ea-2cd7-4fad-9986-05dbc8c42824</sv:value>
+ </sv:property>
+ <sv:property sv:name="grid" sv:type="String">
+ <sv:value>277bd94c-8ce0-411d-b739-72c76fbf25cf
+a7a58f9a-d572-4c0e-a616-ade7a5d1b7a9
+e2cf5c0f-1050-4dd8-bb32-d0c7f05918c8
+f1b0758f-6117-4a76-add9-dfa5e09b9fb2
+0f076956-3642-48a4-8efd-8cb17f3be49b
+67f1f2f4-32d8-4f50-b94a-303f064169d6
+e8726d5f-99b0-4f3c-97e5-68a7a3ea6bd0
+499ec55b-4448-4307-9b39-9eece7c66a1a
+61d1fc92-3ed5-4415-b563-d5ac4fa5c382
+730b82bf-2f07-4a07-8844-2e8245678d5e
+</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-07-06T15:50:42.687+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-06T15:50:42.687+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>samples-media-grid</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2010-07-06 13:54:09 UTC (rev 2813)
@@ -0,0 +1,23 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+ xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+ xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils" xmlns:media="http://net.sourceforge.openutils/mgnlMedia">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <cms:setNode var="node" />
+ <table cellspacing="0" border="1">
+ <thead>
+ <tr>
+ <th>media</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+ <tr>
+ <td>
+ <media:media item="${row[0]}" />
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+</jsp:root>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2010-07-06 13:24:14 UTC (rev 2812)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2010-07-06 13:54:09 UTC (rev 2813)
@@ -20,7 +20,7 @@
<cms:editBar />
<cms:includeTemplate />
</cms:contentNodeIterator>
- <cms:newBar contentNodeCollectionName="main" paragraph="samples-media,samples-mediatag,samples-playlist" />
+ <cms:newBar contentNodeCollectionName="main" paragraph="samples-media,samples-mediatag,samples-playlist,samples-media-grid" />
</div>
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <df...@us...> - 2010-08-31 15:44:49
|
Revision: 2957
http://openutils.svn.sourceforge.net/openutils/?rev=2957&view=rev
Author: dfghi
Date: 2010-08-31 15:44:42 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
MEDIA-171 Added the possibility to set a zip importer class.
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/MediaBrowserPage.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-08-31 08:38:10 UTC (rev 2956)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-08-31 15:44:42 UTC (rev 2957)
@@ -21,10 +21,10 @@
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-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.media.zip.ZipImporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,10 +54,8 @@
private String player = "player.swf";
private String version;
-
- private SearchMediaQueryConfiguration search;
- private int folderViewItemsPerPage;
+ private ZipImporter zipimporter;
/**
* Constructor
@@ -134,48 +132,23 @@
this.player = player;
}
- /**
- * Returns the version.
- * @return the version
- */
- public String getVersion()
+ public ZipImporter getZipimporter()
{
- return version;
+ return zipimporter;
}
-
- /**
- * Returns the searchConfiguration.
- * @return the searchConfiguration
- */
- public SearchMediaQueryConfiguration getSearch()
+
+ public void setZipimporter(ZipImporter zipimporter)
{
- return search;
+ this.zipimporter = zipimporter;
}
/**
- * Sets the searchConfiguration.
- * @param searchConfiguration the searchConfiguration to set
+ * Returns the version.
+ * @return the version
*/
- public void setSearch(SearchMediaQueryConfiguration search)
+ public String getVersion()
{
- this.search = search;
+ return version;
}
- /**
- * 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;
- }
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-08-31 08:38:10 UTC (rev 2956)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-08-31 15:44:42 UTC (rev 2957)
@@ -23,7 +23,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
-import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
import java.io.File;
@@ -31,8 +30,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import javax.jcr.RepositoryException;
@@ -41,7 +38,9 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
+import net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter;
+import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
+import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporterException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -51,7 +50,7 @@
/**
- * Page that contains the tree and the foldere view.
+ * Page that contains the tree and the folders view.
* @author molaschi
* @version $Id$
*/
@@ -130,59 +129,31 @@
zipStream = zipFile.getStream();
IOUtils.copy(zipStream, fos);
-
IOUtils.closeQuietly(fos);
ZipFile zip = new ZipFile(temp);
- Enumeration< ? extends ZipEntry> entries = zip.entries();
- while (entries.hasMoreElements())
- {
- ZipEntry entry = entries.nextElement();
-
- String path = entry.getName();
-
- if (!entry.isDirectory())
- {
-
- InputStream inputStream = zip.getInputStream(entry);
-
- String parent = StringUtils.trimToEmpty(parentPath) + "/" + path;
- parent = StringUtils.replace(parent, "\\", "/");
- parent = StringUtils.replace(parent, "//", "/");
- if (!parent.startsWith("/"))
- {
- parent = "/" + parent;
- }
- String filename = StringUtils.substringAfterLast(parent, "/");
- parent = StringUtils.substringBeforeLast(parent, "/");
-
- MediaLoadUtils.loadEntry(
- inputStream,
- StringUtils.defaultIfEmpty(parent, "/fromzip"),
- filename,
- false);
-
- }
+ ZipImporter importer = MediaEl.module().getZipimporter();
+ if (importer == null)
+ { // Fallback to the default if nothing is set.
+ importer = new DefaultZipImporter();
}
+ importer.importFromZip(zip, parentPath);
+ zip.close();
}
catch (IOException e)
{
log.error(e.getMessage(), e);
}
- catch (AccessDeniedException e)
+ catch (ZipImporterException e)
{
+ // TODO Maybe we should show something...
log.error(e.getMessage(), e);
}
- catch (RepositoryException e)
- {
- log.error(e.getMessage(), e);
- }
finally
{
IOUtils.closeQuietly(zipStream);
+ FileUtils.deleteQuietly(temp);
}
- FileUtils.deleteQuietly(temp);
-
this.openPath = parentPath;
return this.show();
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java 2010-08-31 15:44:42 UTC (rev 2957)
@@ -0,0 +1,79 @@
+/**
+ *
+ * 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.zip;
+
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Default zip importer. Simply takes files in the provided zip file and store them in the media repository.
+ *
+ * @author Danilo Ghirardelli
+ */
+public class DefaultZipImporter implements ZipImporter {
+
+ /**
+ * {@inheritDoc}
+ */
+ public void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException {
+ try
+ {
+ Enumeration< ? extends ZipEntry> entries = zip.entries();
+ while (entries.hasMoreElements())
+ {
+ ZipEntry entry = entries.nextElement();
+
+ String path = entry.getName();
+
+ if (!entry.isDirectory())
+ {
+ InputStream inputStream = zip.getInputStream(entry);
+
+ String parent = StringUtils.trimToEmpty(parentPath) + "/" + path;
+ parent = StringUtils.replace(parent, "\\", "/");
+ parent = StringUtils.replace(parent, "//", "/");
+ if (!parent.startsWith("/"))
+ {
+ parent = "/" + parent;
+ }
+ String filename = StringUtils.substringAfterLast(parent, "/");
+ parent = StringUtils.substringBeforeLast(parent, "/");
+
+ MediaLoadUtils.loadEntry(
+ inputStream,
+ StringUtils.defaultIfEmpty(parent, "/fromzip"),
+ filename,
+ false);
+
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new ZipImporterException(e.getMessage(), e);
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.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/zip/ZipImporter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java 2010-08-31 15:44:42 UTC (rev 2957)
@@ -0,0 +1,44 @@
+/**
+ *
+ * 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.zip;
+
+import java.util.zip.ZipFile;
+
+
+/**
+ * Interface for zip importers. Using this, is possible to extract metadata from the zip file while importing the
+ * images. Common cases are: - Title, description or other metadata are included in the media file name or folder. -
+ * Metadata for all medias are included in a file (xml, txt) in the zip. - Metadata for the media is stored within the
+ * zip file metadata. Implementing this interface you can cover any of the aforementioned cases.
+ *
+ * @author Danilo Ghirardelli
+ */
+public interface ZipImporter {
+
+ /**
+ * Stores in the media repository the images found in the zip file. Implementing this method you have control over
+ * the (eventual) metadata handling.
+ *
+ * @param zipFile The file from request
+ * @param parentPath Repo folder selected for storing the images. May be null.
+ * @throws ZipImporterException
+ */
+ void importFromZip(ZipFile zip, String parentPath) throws ZipImporterException;
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.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/zip/ZipImporterException.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java 2010-08-31 15:44:42 UTC (rev 2957)
@@ -0,0 +1,47 @@
+/**
+ *
+ * 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.zip;
+
+/**
+ * Exception for zip import.
+ * @author Danilo Ghirardelli
+ */
+public class ZipImporterException extends RuntimeException {
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * @param message
+ */
+ public ZipImporterException(String message) {
+ super(message);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public ZipImporterException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.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/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml 2010-08-31 15:44:42 UTC (rev 2957)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="zipimporter" 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>7a187c96-87ac-4ca4-8669-ac75911b34f4</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter</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-08-31T16:34:22.420+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-08-31T16:35:13.535+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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-09-01 08:29:40
|
Revision: 2964
http://openutils.svn.sourceforge.net/openutils/?rev=2964&view=rev
Author: diego_schivo
Date: 2010-09-01 08:29:29 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
MEDIA-169 AdvancedSearch/playlist xml views should use the same freemarker template
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Removed Paths:
-------------
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/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-09-01 08:08:50 UTC (rev 2963)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-09-01 08:29:29 UTC (rev 2964)
@@ -21,13 +21,19 @@
import info.magnolia.freemarker.FreemarkerUtil;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
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.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView;
import org.apache.commons.lang.StringUtils;
@@ -64,6 +70,10 @@
{
return FreemarkerUtil.createTemplateName(MediaFolderViewPage.class, "html");
}
+ else if (VIEW_RESULTS_XML.equals(viewName))
+ {
+ return FreemarkerUtil.createTemplateName(PlaylistView.class, "-xspf", "html");
+ }
return super.getTemplateName(viewName);
}
@@ -130,7 +140,7 @@
selectTab = getType();
}
- if (StringUtils.isNotBlank(format) && "xml".equals(format))
+ if ("xml".equals(format))
{
this.response.setContentType("text/xml");
return VIEW_RESULTS_XML;
@@ -182,4 +192,29 @@
{
return SORT_BY_SCORE;
}
+
+ public String playlistTitle()
+ {
+ return null;
+ }
+
+ public String playlistLocation()
+ {
+ return "/media/search?" + currentQueryString();
+ }
+
+ public Map<String, Object> playlistMetas()
+ {
+ Map<String, Object> metas = new LinkedHashMap<String, Object>();
+ metas.put("page", searchResult.getPage());
+ metas.put("itemsperpage", searchResult.getItemsPerPage());
+ metas.put("totalitems", searchResult.getTotalSize());
+ return metas;
+ }
+
+ public ResultIterator<AdvancedResultItem> getMediaContentList()
+ {
+ return searchResult.getItems();
+ }
+
}
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-09-01 08:08:50 UTC (rev 2963)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-09-01 08:29:29 UTC (rev 2964)
@@ -392,6 +392,11 @@
this.xml = xml;
}
+ public String playlistTitle()
+ {
+ return playlist.getTitle();
+ }
+
public String playlistLocation()
{
return "/playlists" + playlist.getHandle() + ".xspf?locale=" + locale;
Deleted: 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-09-01 08:08:50 UTC (rev 2963)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html 2010-09-01 08:29:29 UTC (rev 2964)
@@ -1,39 +0,0 @@
-[#-- todo: this should use the same template as PlaylistView-xml.html --]
-<?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")]
- <location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.currentQueryString()}]]></location>
- <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
- <meta rel="page">${this.searchResult.page}</meta>
- <meta rel="itemsperpage">${this.searchResult.itemsPerPage}</meta>
- <meta rel="totalitems">${this.searchResult.totalSize}</meta>
- <trackList>
- [#list this.searchResult.items as mediaDetail]
- [#assign mediaLocale = xxxx.getFirstMediaLocale(mediaDetail, this.locale)]
- [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
- <track>
- [#assign mediaURL = mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))]
- <location>${mediaURL}</location>
- <identifier>media:${mediaDetail.@uuid}</identifier>
- [#if (mediaDetail['title_' + mediaLocale])?exists]<title>${mediaDetail['title_' + mediaLocale]}</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(mediaNode, resolution)}</image>[/#if]
- [/#if]
- [#if (mediaDetail['description_' + mediaLocale])?exists]<description>${mediaDetail['description_' + mediaLocale]}</description>[/#if]
- [#if (mediaDetail['richContent_' + mediaLocale])?exists]<annotation><![CDATA[${mediaDetail['richContent_' + mediaLocale]}]]></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="${mediaLocale}" />
- <media:type>${mediaDetail}</media:type>
- </extension>
- </track>
- [/#list]
- </trackList>
-</playlist>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-09-01 08:08:50 UTC (rev 2963)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-09-01 08:29:29 UTC (rev 2964)
@@ -5,7 +5,10 @@
[#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>
+ [#assign title = this.playlistTitle()!'']
+ [#if title?has_content]
+ <title><![CDATA[${title}]]></title>
+ [/#if]
<location><![CDATA[${mgnlEl.baseUrl()}${this.playlistLocation()}]]></location>
<date>${dateUtils.toXsdDate(cal.getInstance())}</date>
[#assign metas = this.playlistMetas()]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-01 15:09:29
|
Revision: 2994
http://openutils.svn.sourceforge.net/openutils/?rev=2994&view=rev
Author: diego_schivo
Date: 2010-09-01 15:09:21 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
MEDIA-170 PlaylistTrackExtensionContributor
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/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistTrackExtensionContributors.0.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-01 15:07:46 UTC (rev 2993)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-01 15:09:21 UTC (rev 2994)
@@ -21,11 +21,16 @@
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+
+import java.util.ArrayList;
+import java.util.List;
+
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.media.zip.ZipImporter;
+import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,6 +67,8 @@
private ZipImporter zipimporter;
+ private List playlistTrackExtensionContributors = new ArrayList();
+
/**
* Constructor
*/
@@ -199,4 +206,28 @@
{
this.zipimporter = zipimporter;
}
+
+ /**
+ * Returns the playlistTrackExtensionContributors.
+ * @return the playlistTrackExtensionContributors
+ */
+ public List getPlaylistTrackExtensionContributors()
+ {
+ return playlistTrackExtensionContributors;
+ }
+
+ /**
+ * Sets the playlistTrackExtensionContributors.
+ * @param playlistTrackExtensionContributors the playlistTrackExtensionContributors to set
+ */
+ public void setPlaylistTrackExtensionContributors(List playlistTrackExtensionContributors)
+ {
+ this.playlistTrackExtensionContributors = playlistTrackExtensionContributors;
+ }
+
+ public void addPlaylistTrackExtensionContributor(PlaylistTrackExtensionContributor contributor)
+ {
+ this.playlistTrackExtensionContributors.add(contributor);
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-09-01 15:07:46 UTC (rev 2993)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-09-01 15:09:21 UTC (rev 2994)
@@ -30,6 +30,7 @@
import info.magnolia.module.ModuleRegistry;
import java.awt.Point;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -49,6 +50,7 @@
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
+import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
@@ -478,11 +480,14 @@
{
return new int[]{
NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_WIDTH)),
- NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_HEIGHT)) };
+ NumberUtils.toInt(res.getAttribute(FileProperties.PROPERTY_HEIGHT))
+ };
}
}
- return new int[]{-1, -1 };
+ return new int[]{
+ -1, -1
+ };
}
/**
@@ -783,4 +788,13 @@
return resolutions;
}
+ public static void writePlaylistTrackExtension(Content media, PrintWriter writer)
+ {
+ for (Object item : module().getPlaylistTrackExtensionContributors())
+ {
+ PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
+ contributor.addMediaAttributes(media, writer);
+ }
+ }
+
}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java 2010-09-01 15:09:21 UTC (rev 2994)
@@ -0,0 +1,24 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.util.NodeDataUtil;
+
+import java.io.PrintWriter;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class DefaultPlaylistTrackExtensionContributor implements PlaylistTrackExtensionContributor
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addMediaAttributes(Content media, PrintWriter writer)
+ {
+ writer.println("<media:type>" + NodeDataUtil.getString(media, "type") + "</media:type>");
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.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/playlist/pages/PlaylistTrackExtensionContributor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java 2010-09-01 15:09:21 UTC (rev 2994)
@@ -0,0 +1,21 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import info.magnolia.cms.core.Content;
+
+import java.io.PrintWriter;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public interface PlaylistTrackExtensionContributor
+{
+
+ /**
+ * @param media
+ * @param writer
+ */
+ void addMediaAttributes(Content media, PrintWriter writer);
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.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/resources/mgnl-bootstrap/media/config.modules.media.config.playlistTrackExtensionContributors.0.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistTrackExtensionContributors.0.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistTrackExtensionContributors.0.xml 2010-09-01 15:09:21 UTC (rev 2994)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="0" 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>a7724230-6c6d-4b5d-a451-f505181b5d4c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.DefaultPlaylistTrackExtensionContributor</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-01T16:20:34.688+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-01T16:37:56.408+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.playlistTrackExtensionContributors.0.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-09-01 15:07:46 UTC (rev 2993)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-09-01 15:09:21 UTC (rev 2994)
@@ -5,6 +5,7 @@
[#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")]
+ [#assign freemarkerEnv = this.getStatic("freemarker.core.Environment")]
[#assign title = this.playlistTitle()!'']
[#if title?has_content]
<title><![CDATA[${title}]]></title>
@@ -44,7 +45,7 @@
[/#if]
<extension application="http://www.openmindlab.com/media">
<media:locale code="${mediaLocale}" />
- <media:type>${mediaNode.type}</media:type>
+ ${mediaEl.writePlaylistTrackExtension(mediaNode, freemarkerEnv.getCurrentEnvironment().out)}
</extension>
</track>
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-08 13:01:53
|
Revision: 3002
http://openutils.svn.sourceforge.net/openutils/?rev=3002&view=rev
Author: diego_schivo
Date: 2010-09-08 13:01:42 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
MEDIA-173 Give a feedback to the user after a zip import
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/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/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-09-07 17:40:30 UTC (rev 3001)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-09-08 13:01:42 UTC (rev 3002)
@@ -23,6 +23,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.util.AlertUtil;
import info.magnolia.context.MgnlContext;
import java.io.File;
@@ -138,15 +139,17 @@
}
importer.importFromZip(zip, parentPath);
zip.close();
+ AlertUtil.setMessage(getMsgs().get("media.loadzip.success"));
}
catch (IOException e)
{
log.error(e.getMessage(), e);
+ AlertUtil.setMessage(getMessage("media.loadzip.failure", e.getMessage()));
}
catch (ZipImporterException e)
{
- // TODO Maybe we should show something...
log.error(e.getMessage(), e);
+ AlertUtil.setMessage(getMessage("media.loadzip.failure", e.getMessage()));
}
finally
{
@@ -320,7 +323,7 @@
{
this.zipFile = file;
}
-
+
/**
* {@inheritDoc}
*/
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-09-07 17:40:30 UTC (rev 3001)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-09-08 13:01:42 UTC (rev 3002)
@@ -44,6 +44,8 @@
tree.media.folders=Media folders tree
media.loadzip=Load zip archive
+media.loadzip.success=Zip archive successfully loaded
+media.loadzip.failure=Failed to load zip archive: {0}
media.select=Select media...
media.remove=Remove 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-09-07 17:40:30 UTC (rev 3001)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-09-08 13:01:42 UTC (rev 3002)
@@ -44,6 +44,8 @@
tree.media.folders=Alberatura media
media.loadzip=Carica archivio zip
+media.loadzip.success=Archivio zip caricato con successo
+media.loadzip.failure=Impossibile caricare l'archivio zip: {0}
media.select=Seleziona media...
media.remove=Rimuovi media
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-07 17:40:30 UTC (rev 3001)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-08 13:01:42 UTC (rev 3002)
@@ -137,6 +137,9 @@
{
reloadFolder(openPath);
}
+ [#if message?exists]
+ Ext.Msg.alert('', '${message?js_string}');
+ [/#if]
}, 100);
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-10 14:20:21
|
Revision: 3027
http://openutils.svn.sourceforge.net/openutils/?rev=3027&view=rev
Author: diego_schivo
Date: 2010-09-10 14:20:15 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-177 pagesize selection
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-09-10 13:55:50 UTC (rev 3026)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:20:15 UTC (rev 3027)
@@ -117,6 +117,8 @@
protected String bgSelector;
+ protected String pagesizeSelector;
+
protected String sorting;
protected boolean selectMedia;
@@ -186,6 +188,7 @@
// right side of navigation bar: sorting and background selectors
bgSelector = null;
+ pagesizeSelector = null;
sorting = null;
for (Cookie cookie : request.getCookies())
{
@@ -193,12 +196,17 @@
{
bgSelector = cookie.getValue();
}
+ else if ("pagesizeselector".equals(cookie.getName()))
+ {
+ pagesizeSelector = cookie.getValue();
+ }
else if ("sorting".equals(cookie.getName()))
{
sorting = cookie.getValue();
}
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
+ pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "1");
sorting = StringUtils.defaultIfEmpty(sorting, getDefaultSorting());
// for activation status handling
@@ -217,10 +225,14 @@
return 0;
}
// sorting must be specified for total-size to work (-1 otherwise)
- AdvancedResult typeResult = MediaEl
- .module()
- .getSearch()
- .search(request, type.getName(), path, false, getDefaultSorting(), 0, 1);
+ AdvancedResult typeResult = MediaEl.module().getSearch().search(
+ request,
+ type.getName(),
+ path,
+ false,
+ getDefaultSorting(),
+ 0,
+ 1);
return typeResult.getTotalSize();
}
@@ -241,10 +253,14 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return MediaEl
- .module()
- .getSearch()
- .search(request, type, path, false, sorting, MediaEl.module().getFolderViewItemsPerPage(), page);
+ return MediaEl.module().getSearch().search(
+ request,
+ type,
+ path,
+ false,
+ sorting,
+ MediaEl.module().getFolderViewItemsPerPage(),
+ page);
}
/**
@@ -597,6 +613,15 @@
}
/**
+ * Returns the pagesizeSelector.
+ * @return the pagesizeSelector
+ */
+ public String getPagesizeSelector()
+ {
+ return pagesizeSelector;
+ }
+
+ /**
* Returns the sorting.
* @return the sorting
*/
@@ -828,7 +853,9 @@
public String getMessage(String key, String param)
{
- return getMsgs().get(key, new String[]{param });
+ return getMsgs().get(key, new String[]{
+ param
+ });
}
/**
@@ -841,7 +868,9 @@
String s = request.getQueryString();
s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
int p1;
- while ((p1 = StringUtils.indexOfAny(s, new String[]{"&type=", "&command=" })) != -1)
+ while ((p1 = StringUtils.indexOfAny(s, new String[]{
+ "&type=", "&command="
+ })) != -1)
{
int p2 = s.indexOf('&', p1 + 1);
s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY);
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-09-10 13:55:50 UTC (rev 3026)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:20:15 UTC (rev 3027)
@@ -45,6 +45,7 @@
*/
});
new MediaFolderView.BgSelectors('#navigation a.bg-selector');
+ new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector');
new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
@@ -98,6 +99,30 @@
});
+MediaFolderView.PagesizeSelectors = new Class({
+
+ initialize: function(selectors){
+ this.selectors = $$(selectors).addEvent('click', this.handleClick.bindWithEvent(this));
+ this.previousValue = document.body.className.match(/pagesize-(\w+)/)[1];
+ },
+
+ handleClick: function(e){
+ e.stop();
+ var selector = $(e.target);
+ var value = selector.className.match(/pagesize-selector\s+(\w+)(-active)?/)[1];
+ if (value == this.previousValue) return;
+ if (this.previousValue) $(document.body).removeClass('pagesize' + this.previousValue);
+ $(document.body).addClass('pagesize' + value);
+ Cookie.write('pagesizeselector', value, {duration: 30});
+ this.selectors.each(function(item){
+ if (item == selector) item.addClass(value + '-active');
+ else if (this.previousValue) item.removeClass(this.previousValue + '-active');
+ }, this);
+ this.previousValue = value;
+ }
+
+});
+
MediaFolderView.Sorting = new Class({
Implements: Options,
@@ -311,7 +336,7 @@
});
</script>
</head>
- <body id="mediafolderview" class="bg-${this.bgSelector}">
+ <body id="mediafolderview" class="bg-${this.bgSelector} pagesize-${this.pagesizeSelector}">
<form action="" style="display:none" id="actionForm" method="post">
<input type="hidden" id="actionCmd" name="command" value="delete" />
<input type="hidden" id="actionPath" name="path" value="${this.path!""}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-10 14:46:29
|
Revision: 3029
http://openutils.svn.sourceforge.net/openutils/?rev=3029&view=rev
Author: diego_schivo
Date: 2010-09-10 14:46:23 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-177 config
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/MediaFolderViewPage.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:35:10 UTC (rev 3028)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:46:23 UTC (rev 3029)
@@ -23,7 +23,9 @@
import info.magnolia.module.ModuleLifecycleContext;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
@@ -65,6 +67,8 @@
private int folderViewItemsPerPage;
+ private Map<String, Integer> folderViewPageSizes = new HashMap<String, Integer>();
+
private ZipImporter zipimporter;
private List playlistTrackExtensionContributors = new ArrayList();
@@ -190,6 +194,24 @@
}
/**
+ * Returns the folderViewPageSizes.
+ * @return the folderViewPageSizes
+ */
+ public Map<String, Integer> getFolderViewPageSizes()
+ {
+ return folderViewPageSizes;
+ }
+
+ /**
+ * @param sizeKey
+ * @param value
+ */
+ public void addFolderViewPageSizes(String sizeKey, Long value)
+ {
+ folderViewPageSizes.put(sizeKey, value.intValue());
+ }
+
+ /**
* Returns the zipimporter.
* @return the zipimporter
*/
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-09-10 14:35:10 UTC (rev 3028)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:46:23 UTC (rev 3029)
@@ -253,14 +253,13 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return MediaEl.module().getSearch().search(
- request,
- type,
- path,
- false,
- sorting,
- MediaEl.module().getFolderViewItemsPerPage(),
- page);
+ MediaModule module = MediaEl.module();
+ Integer itemsPerPage = module.getFolderViewPageSizes().get(pagesizeSelector);
+ if (itemsPerPage == null)
+ {
+ itemsPerPage = module.getFolderViewItemsPerPage();
+ }
+ return module.getSearch().search(request, type, path, false, sorting, module.getFolderViewItemsPerPage(), page);
}
/**
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml 2010-09-10 14:46:23 UTC (rev 3029)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="folderViewPageSizes" 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>7a61d6f0-b42c-48bf-8772-9e217656e55e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="size1" sv:type="Long">
+ <sv:value>10</sv:value>
+ </sv:property>
+ <sv:property sv:name="size2" sv:type="Long">
+ <sv:value>25</sv:value>
+ </sv:property>
+ <sv:property sv:name="size3" sv:type="Long">
+ <sv:value>50</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-10T16:39:29.243+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-10T16:44:23.579+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.config.folderViewPageSizes.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: <fg...@us...> - 2010-09-10 14:59:53
|
Revision: 3031
http://openutils.svn.sourceforge.net/openutils/?rev=3031&view=rev
Author: fgiust
Date: 2010-09-10 14:59:47 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-167 new paginator (and toolbar) layout
Modified Paths:
--------------
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/MediaBrowserPage.html
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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:59:47 UTC (rev 3031)
@@ -73,37 +73,37 @@
{
/**
- *
+ *
*/
public static final String SORT_BY_NAME = "name";
/**
- *
+ *
*/
public static final String SORT_BY_CREATIONDATE = "creationdate";
/**
- *
+ *
*/
public static final String SORT_BY_FILENAME = "filename";
/**
- *
+ *
*/
public static final String SORT_BY_MODIFICATIONDATE = "modificationdate";
/**
- *
+ *
*/
public static final String SORT_BY_SCORE = "score";
/**
- *
+ *
*/
public static final String SORT_BY_TITLE = "title";
/**
- *
+ *
*/
public static final String SORT_BY_USAGE = "usage";
@@ -282,7 +282,7 @@
// casts Iterator<AdvancedResultItem> to Iterator<Content>
Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
- pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 5, "page");
+ pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 10, "page");
}
if (medias == null)
{
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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:59:47 UTC (rev 3031)
@@ -14,9 +14,21 @@
width: 100%;
float: left;
line-height: 30px;
- background: #E4F5C9 url(images/toolbar-background.png) repeat-x bottom left;
+ min-height: 56px;
+ background: #E4F5C9 url(images/toolbar-background-light.png) repeat-x top left;
}
+.tabsrow1 {
+ height: 28px;
+ background: #E4F5C9 url(images/toolbar-background.png) repeat-x top left;
+}
+
+.tabsrow2 {
+ display: block;
+ clear: both;
+ height: 30px;
+}
+
.separator {
color: #fff;
font-size: 1.3em;
@@ -88,6 +100,7 @@
#navigation select#sorting {
width: 150px;
+ visibility: hidden;
}
.voice a,.voice a:visited,.voice a:hover {
@@ -123,15 +136,17 @@
.paging {
border-collapse: collapse;
- margin: 10px auto 0;
+ margin: 6px 20px 0 0;
}
.paging td {
padding: 0;
- border: 1px solid #999;
+ border: 2px solid #c9e090;
width: 16px;
+ height: 18px;
text-align: center;
background-color: #fff;
+ text-align: center;
}
.paging td a,.paging td a:visited {
@@ -165,10 +180,19 @@
color: #FFFFFF;
}
-.paging .page-active-false a,.paging .page-active-false a:visited {
- color: #CCCCCC;
+.paging .page-first,.paging .page-previous,.paging .page-next,.paging .page-last {
+ background-color: #afcd66;
}
+.paging .page-first a,.paging .page-previous a,.paging .page-next a,.paging .page-last a {
+ color: #fff !important;
+ font-weight: normal;
+}
+
+.pagincontainer {
+ float: right;
+}
+
.mediaList {
list-style: none;
margin: 0;
@@ -343,7 +367,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
div.sexy-tooltip {
@@ -366,7 +390,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
@@ -411,4 +435,9 @@
ul.mediamenu li,ul.mediamenu li a {
height: 20px;
cursor: pointer;
+}
+
+#scrollablecontent {
+ overflow-y: scroll;
+ height: 300px;
}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 14:59:47 UTC (rev 3031)
@@ -291,7 +291,7 @@
<iframe id="advancedSearchView" name="advancedSearchView" class="x-panel-body"
src="" style="width:100%; height:100%; border:0 none; margin:0; padding:0; overflow:auto;" frameborder="0" scrolling="no"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
- style="width:100%; height:100%; border:0 none; overflow:auto;" frameborder="0" scrolling="auto"></iframe>
+ style="width:100%; height:100%; border:0 none; overflow:hidden;" frameborder="0" scrolling="no"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:59:47 UTC (rev 3031)
@@ -350,6 +350,31 @@
</form>
<div id="navigation">
+
+
+
+
+ <div class="tabsrow1">
+ [#list this.types as type]
+ [#if type.name == this.type]
+ [#assign actual = "actual"]
+ [#else]
+ [#assign actual = ""]
+ [/#if]
+ <div class="voice mediatab ${actual}">
+ <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>
+ </div>
+ [/#list]
+ </div>
+
+
+ <div class="tabsrow2">
+
+
+
<div id="bgselectorblock">
<div class="voice right">
<a name="bg-black" href="#" class="bg-selector black [#if this.bgSelector == 'black']black-active[/#if]" title="${this.msgs.get('media.bgselector.black')}"><!-- --></a>
@@ -380,35 +405,32 @@
</select>
</div>
</div>
- [#list this.types as type]
- [#if type.name == this.type]
- [#assign actual = "actual"]
- [#else]
- [#assign actual = ""]
+
+
+ [#if this.pages?has_content && this.pages?size > 5]
+ <div class="pagincontainer">
+ <table class="paging">
+ <tr>
+ [#list this.pages as page]
+ <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
+ <a href="${page.url}">${page.label}</a>
+ </td>
+ [/#list]
+ </tr>
+ </table>
+ </div>
[/#if]
- <div class="voice mediatab ${actual}">
- <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>
+
+
+
</div>
- [/#list]
+
+
</div>
- [#if this.pages?has_content && this.pages?size > 5]
- <div style="clear: left;">
- <table class="paging">
- <tr>
- [#list this.pages as page]
- <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
- <a href="${page.url}">${page.label}</a>
- </td>
- [/#list]
- </tr>
- </table>
- </div>
- [/#if]
+ <div style="clear:both; height: 1px"><!-- --></div>
+ <div id="scrollablecontent">
<ul class="mediaList">
[#assign index = 0]
[#list this.medias as media]
@@ -588,5 +610,7 @@
</li>
[/#list]
</ul>
+ </div>
+
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-10 15:05:59
|
Revision: 3032
http://openutils.svn.sourceforge.net/openutils/?rev=3032&view=rev
Author: diego_schivo
Date: 2010-09-10 15:05:52 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-177 don't propagate page
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-09-10 14:59:47 UTC (rev 3031)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:05:52 UTC (rev 3032)
@@ -868,7 +868,7 @@
s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
int p1;
while ((p1 = StringUtils.indexOfAny(s, new String[]{
- "&type=", "&command="
+ "&type=", "&command=", "&page="
})) != -1)
{
int p2 = s.indexOf('&', p1 + 1);
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-09-10 14:59:47 UTC (rev 3031)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:05:52 UTC (rev 3032)
@@ -31,18 +31,7 @@
if (Browser.Engine.name == 'trident' && Browser.Engine.version == 4) this.fixNavWidthIE6();
else this.fixNavWidth();
new mooSelecta({
- selector: '#sorting'/*,
- triggerClass: 'selecta2',
- triggerPadding: 24,
- triggerBeforeImage: '${this.request.contextPath}/.resources/media/css/images/select-left.png',
- triggerBeforeImageWidth: 3,
- triggerBeforeImageHeight: 21,
- wrapperClass: 'selecta2Wrapper',
- wrapperWidthAdjustment: 0,
- optionClass: 'selecta2Option',
- optionClassSelected: 'selecta2OptionSelected',
- optionClassOver: 'selecta2OptionOver'
- */
+ selector: '#sorting'
});
new MediaFolderView.BgSelectors('#navigation a.bg-selector');
new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-09-11 17:42:20
|
Revision: 3066
http://openutils.svn.sourceforge.net/openutils/?rev=3066&view=rev
Author: fgiust
Date: 2010-09-11 17:42:14 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
minor changes to look&feel
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/background.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
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-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-11 17:42:14 UTC (rev 3066)
@@ -859,4 +859,13 @@
{
return SortMode.FILENAME_ASC;
}
+
+ /**
+ * Returns the installed media module version.
+ * @return version as string.
+ */
+ public String getModuleVersion()
+ {
+ return MediaEl.module().getVersion();
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/background.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-09-11 17:42:14 UTC (rev 3066)
@@ -2,12 +2,16 @@
font-family: Verdana, sans-serif;
font-size: 11px;
line-height: 19px;
- background: transparent url(../assets/branding/background.png) repeat-x scroll left top;
+ background: #fff url(../assets/branding/background.png) repeat-x scroll left top;
color: #333;
height: 22px;
text-align: center;
}
+#branding-panel .x-panel-body-noheader {
+ border: none;
+}
+
.mediaBranding img.logo {
display: inline;
margin: 0 8px 0 12px;
@@ -20,4 +24,4 @@
.mgnlListHeaderBackground {
border: 10px solid red;
-}
+}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-11 17:42:14 UTC (rev 3066)
@@ -25,3 +25,7 @@
#navigation .sortingcontainer {
padding-top: 8px;
}
+
+.mediaBranding {
+ height: 26px !important;
+}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-11 17:42:14 UTC (rev 3066)
@@ -4,7 +4,10 @@
<head>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/xtheme-gray.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/branding.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/branding.css?version=${this.moduleVersion}" />
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
+ <![endif]-->
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
@@ -84,6 +87,7 @@
},
{
region:'south',
+ id:'branding-panel',
html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a><span class="brandinginfo">${this.getMessage('media.footer.text', this.moduleVersion)}</span></div>',
height: 24
}
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-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-11 17:42:14 UTC (rev 3066)
@@ -5,7 +5,7 @@
<title>${this.path!?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion}" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/mooSelecta.css" />
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
@@ -33,9 +33,9 @@
new mooSelecta({
selector: '#sorting'
});
- new MediaFolderView.BgSelectors('#navigation a.bg-selector');
- new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options);
- new MediaFolderView.Sorting('sorting', this.options);
+ new MediaFolderView.BgSelectors('#navigation a.bg-selector');
+ new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options);
+ new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
},
@@ -295,7 +295,7 @@
});
new MediaFolderView({queryString: '${this.currentQueryString()?js_string}'});
-
+
[#if message?exists]
alert("${message?js_string}");
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-09-11 18:03:23
|
Revision: 3067
http://openutils.svn.sourceforge.net/openutils/?rev=3067&view=rev
Author: fgiust
Date: 2010-09-11 18:03:17 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
ie7 css fixes
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.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/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-11 17:42:14 UTC (rev 3066)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-11 18:03:17 UTC (rev 3067)
@@ -834,7 +834,7 @@
public String currentQueryString()
{
String s = request.getQueryString();
- s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s;
+ s = "&" + s;
int p1;
while ((p1 = StringUtils.indexOfAny(s, new String[]{"&type=", "&command=", "&page=" })) != -1)
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-11 17:42:14 UTC (rev 3066)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-11 18:03:17 UTC (rev 3067)
@@ -28,4 +28,13 @@
.mediaBranding {
height: 26px !important;
+}
+
+#scrollablecontent {
+ position: relative;
+}
+
+#scrollablecontent .iespacer {
+ height: 10px;
+ clear: both;
}
\ No newline at end of file
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-09-11 17:42:14 UTC (rev 3066)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-11 18:03:17 UTC (rev 3067)
@@ -582,6 +582,8 @@
</li>
[/#list]
</ul>
+
+ <div class="iespacer"><!-- --></div>
</div>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2011-01-04 11:26:02
|
Revision: 3211
http://openutils.svn.sourceforge.net/openutils/?rev=3211&view=rev
Author: molaschi
Date: 2011-01-04 11:25:56 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
MEDIA-198
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.deactivate.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2011-01-04 11:25:56 UTC (rev 3211)
@@ -0,0 +1,32 @@
+package net.sourceforge.openutils.mgnlmedia.media.commands;
+
+import info.magnolia.commands.CommandsManager;
+import info.magnolia.context.Context;
+import info.magnolia.module.admininterface.commands.BaseRepositoryCommand;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+
+import org.apache.commons.chain.Command;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class MediaDeactivationCommand extends BaseRepositoryCommand
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean execute(Context context) throws Exception
+ {
+ if (!MediaEl.module().isSingleinstance())
+ {
+ Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "deactivate");
+ return cmd.execute(context);
+ }
+ return true;
+ }
+
+}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.deactivate.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.deactivate.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.deactivate.xml 2011-01-04 11:25:56 UTC (rev 3211)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="deactivate" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>099b2eba-442d-4104-9d80-4a111b1fc0f9</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaDeactivationCommand</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2011-01-04T12:06:31.789+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-04T12:16:57.641+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
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