Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <die...@us...> - 2011-04-01 13:45:57
|
Revision: 3405
http://openutils.svn.sourceforge.net/openutils/?rev=3405&view=rev
Author: diego_schivo
Date: 2011-04-01 13:45:51 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-14 tagcloud building logic
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:40:56 UTC (rev 3404)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:45:51 UTC (rev 3405)
@@ -205,60 +205,63 @@
tagCloudName += "_" + locale;
}
}
-
+
if (StringUtils.isNotBlank(tagCloudName))
{
TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName);
- if (tagCloudOriginal == null)
+ if (tagCloudOriginal != null)
{
- log.error("No tag cloud configured with name : {}", tagCloudName);
- return null;
+ try
+ {
+ tagCloud = (TagCloud) BeanUtils.cloneBean(tagCloudOriginal);
+ tagCloud.setTags(new HashMap<String, Integer>());
+ }
+ catch (IllegalAccessException e)
+ {
+ // should never happen
+ }
+ catch (InstantiationException e)
+ {
+ // should never happen
+ }
+ catch (InvocationTargetException e)
+ {
+ // should never happen
+ }
+ catch (NoSuchMethodException e)
+ {
+ // should never happen
+ }
}
- try
+ else if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName")))
{
- tagCloud = (TagCloud) BeanUtils.cloneBean(tagCloudOriginal);
+ log.warn("No tag cloud configured with name : {}", tagCloudName);
}
- catch (IllegalAccessException e)
+
+ if (tagCloud == null)
{
- // should never happen
+ tagCloud = new TagCloud();
+ if (StringUtils.isNotBlank(this.getConfigValue("tagCloudRepository")))
+ {
+ tagCloud.setRepository(this.getConfigValue("tagCloudRepository"));
+ }
+ if (StringUtils.isNotBlank(this.getConfigValue("tagCloudPath")))
+ {
+ tagCloud.setPath(this.getConfigValue("tagCloudPath"));
+ }
+ if (StringUtils.isNotBlank(this.getConfigValue("tagCloudProperty")))
+ {
+ tagCloud.setPropertyName(this.getConfigValue("tagCloudProperty"));
+ }
+ else
+ {
+ // Set the actual node name, it's useful in some cases
+ tagCloud.setPropertyName(this.getName());
+ }
}
- catch (InstantiationException e)
- {
- // should never happen
- }
- catch (InvocationTargetException e)
- {
- // should never happen
- }
- catch (NoSuchMethodException e)
- {
- // should never happen
- }
- tagCloud.setTags(new HashMap<String, Integer>());
+ tagCloud.setCount(10000);
+ TagCloudManager.getInstance().calculateTagCloud(tagCloud);
}
- else
- {
- tagCloud = new TagCloud();
- if (StringUtils.isNotBlank(this.getConfigValue("tagCloudRepository")))
- {
- tagCloud.setRepository(this.getConfigValue("tagCloudRepository"));
- }
- if (StringUtils.isNotBlank(this.getConfigValue("tagCloudPath")))
- {
- tagCloud.setPath(this.getConfigValue("tagCloudPath"));
- }
- if (StringUtils.isNotBlank(this.getConfigValue("tagCloudProperty")))
- {
- tagCloud.setPropertyName(this.getConfigValue("tagCloudProperty"));
- }
- else
- {
- // Set the actual node name, it's useful in some cases
- tagCloud.setPropertyName(this.getName());
- }
- }
- tagCloud.setCount(10000);
- TagCloudManager.getInstance().calculateTagCloud(tagCloud);
return tagCloud;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 13:41:02
|
Revision: 3404
http://openutils.svn.sourceforge.net/openutils/?rev=3404&view=rev
Author: diego_schivo
Date: 2011-04-01 13:40:56 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-14 tagCloudName
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:57:17 UTC (rev 3403)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:40:56 UTC (rev 3404)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnltagcloud.dialog;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
@@ -28,6 +29,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import javax.jcr.RepositoryException;
@@ -40,6 +42,7 @@
import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager;
import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.LocaleUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -187,12 +190,28 @@
{
// Get configured node
TagCloud tagCloud = null;
- if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName")))
+ String tagCloudName = this.getConfigValue("tagCloudName");
+ if (StringUtils.isBlank(tagCloudName))
{
- TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(this.getConfigValue("tagCloudName"));
+ tagCloudName = this.getName();
+ }
+ else if (I18nContentSupportFactory.getI18nSupport().isEnabled() && "true".equals(this.getConfigValue("i18n")))
+ {
+ Locale locale = LocaleUtils.toLocale(this.getTopParent().getConfigValue("locale", null));
+ boolean isFallbackLanguage = locale == null
+ || I18nContentSupportFactory.getI18nSupport().getFallbackLocale().equals(locale);
+ if (!isFallbackLanguage)
+ {
+ tagCloudName += "_" + locale;
+ }
+ }
+
+ if (StringUtils.isNotBlank(tagCloudName))
+ {
+ TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName);
if (tagCloudOriginal == null)
{
- log.error("No tag cloud configured with name : {}", this.getConfigValue("tagCloudName"));
+ log.error("No tag cloud configured with name : {}", tagCloudName);
return null;
}
try
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:57:23
|
Revision: 3403
http://openutils.svn.sourceforge.net/openutils/?rev=3403&view=rev
Author: diego_schivo
Date: 2011-04-01 12:57:17 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-10 comment removed
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:53:28 UTC (rev 3402)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:57:17 UTC (rev 3403)
@@ -1,4 +1,3 @@
-[#-- patch for TAGCLOUD-10: option value trimmed, fix version 1.0.2 --]
[#if includejquery]
<script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.min.js"></script>
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:53:34
|
Revision: 3402
http://openutils.svn.sourceforge.net/openutils/?rev=3402&view=rev
Author: diego_schivo
Date: 2011-04-01 12:53:28 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 forcePick
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:47:27 UTC (rev 3401)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:53:28 UTC (rev 3402)
@@ -31,7 +31,7 @@
filter_hide: true,
firstselected: true,
filter_selected: true,
- newel: (configuration['forcePick']!false)?string('false', 'true'),
+ newel: ${((configuration['forcePick']?string)! != 'true')?string},
maxshownitems: 10,
tagCloudId: "tagCloud_${name}"
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:47:33
|
Revision: 3401
http://openutils.svn.sourceforge.net/openutils/?rev=3401&view=rev
Author: diego_schivo
Date: 2011-04-01 12:47:27 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 forcePick
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:43:26 UTC (rev 3400)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:47:27 UTC (rev 3401)
@@ -59,8 +59,6 @@
private TagsProvider tagsProvider;
- private boolean forcePick;
-
/**
* {@inheritDoc}
*/
@@ -107,8 +105,6 @@
}
};
}
-
- forcePick = "true".equals(getConfigValue("forcePick"));
}
/**
@@ -121,15 +117,6 @@
}
/**
- * Returns the forcePick.
- * @return the forcePick
- */
- public boolean isForcePick()
- {
- return forcePick;
- }
-
- /**
* {@inheritDoc}
*/
@Override
Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:43:26 UTC (rev 3400)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:47:27 UTC (rev 3401)
@@ -31,7 +31,7 @@
filter_hide: true,
firstselected: true,
filter_selected: true,
- newel: ${!this.forcePick},
+ newel: (configuration['forcePick']!false)?string('false', 'true'),
maxshownitems: 10,
tagCloudId: "tagCloud_${name}"
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:43:32
|
Revision: 3400
http://openutils.svn.sourceforge.net/openutils/?rev=3400&view=rev
Author: diego_schivo
Date: 2011-04-01 12:43:26 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 forcePick
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:36:44 UTC (rev 3399)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:43:26 UTC (rev 3400)
@@ -59,6 +59,8 @@
private TagsProvider tagsProvider;
+ private boolean forcePick;
+
/**
* {@inheritDoc}
*/
@@ -105,6 +107,8 @@
}
};
}
+
+ forcePick = "true".equals(getConfigValue("forcePick"));
}
/**
@@ -117,6 +121,15 @@
}
/**
+ * Returns the forcePick.
+ * @return the forcePick
+ */
+ public boolean isForcePick()
+ {
+ return forcePick;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:36:44 UTC (rev 3399)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2011-04-01 12:43:26 UTC (rev 3400)
@@ -31,7 +31,7 @@
filter_hide: true,
firstselected: true,
filter_selected: true,
- newel: true,
+ newel: ${!this.forcePick},
maxshownitems: 10,
tagCloudId: "tagCloud_${name}"
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:36:51
|
Revision: 3399
http://openutils.svn.sourceforge.net/openutils/?rev=3399&view=rev
Author: diego_schivo
Date: 2011-04-01 12:36:44 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 handling missing value
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:26:03 UTC (rev 3398)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:36:44 UTC (rev 3399)
@@ -153,7 +153,8 @@
{
Map<String, Object> values = new HashMap<String, Object>(2);
values.put("selected", tagList.contains(key));
- values.put("count", tagCloud.getTags().get(key));
+ Integer count = tagCloud.getTags().get(key);
+ values.put("count", count != null ? count : 0);
tags.put(key, values);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 12:26:09
|
Revision: 3398
http://openutils.svn.sourceforge.net/openutils/?rev=3398&view=rev
Author: diego_schivo
Date: 2011-04-01 12:26:03 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 customizable tags provider
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 10:45:17 UTC (rev 3397)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:26:03 UTC (rev 3398)
@@ -26,6 +26,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -56,6 +57,8 @@
*/
private Logger log = LoggerFactory.getLogger(ConfiguredDialog.class);
+ private TagsProvider tagsProvider;
+
/**
* {@inheritDoc}
*/
@@ -76,6 +79,32 @@
this.setConfig(
"saveHandler",
"net.sourceforge.openutils.mgnltagcloud.dialog.TagCloudDialogSafeMultivalueSaveHandler");
+
+ if (!StringUtils.isEmpty(getConfigValue("tagsProvider")))
+ {
+ try
+ {
+ tagsProvider = (TagsProvider) Class.forName(getConfigValue("tagsProvider")).newInstance();
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to instantiate custom tags provider due to {}", e.getMessage());
+ }
+ }
+ if (tagsProvider == null)
+ {
+ tagsProvider = new TagsProvider()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public Collection<String> provideTags(TagCloud tagCloud)
+ {
+ return tagCloud != null ? tagCloud.getTags().keySet() : Collections.<String> emptyList();
+ }
+ };
+ }
}
/**
@@ -118,14 +147,9 @@
}
TagCloud tagCloud = buildTagCloud();
- if (tagCloud == null)
- {
- parameters.put("configuredTagList", new String[]{});
- return;
- }
- Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size());
- for (String key : tagCloud.getTags().keySet())
+ Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>();
+ for (String key : tagsProvider.provideTags(tagCloud))
{
Map<String, Object> values = new HashMap<String, Object>(2);
values.put("selected", tagList.contains(key));
@@ -152,6 +176,12 @@
}
+ public interface TagsProvider
+ {
+
+ Collection<String> provideTags(TagCloud tagCloud);
+ }
+
protected TagCloud buildTagCloud()
{
// Get configured node
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-04-01 10:45:23
|
Revision: 3397
http://openutils.svn.sourceforge.net/openutils/?rev=3397&view=rev
Author: diego_schivo
Date: 2011-04-01 10:45:17 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
TAGCLOUD-13 extract method
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-03-23 13:57:26 UTC (rev 3396)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 10:45:17 UTC (rev 3397)
@@ -117,6 +117,43 @@
log.error("RepositoryException: {}", e);
}
+ TagCloud tagCloud = buildTagCloud();
+ if (tagCloud == null)
+ {
+ parameters.put("configuredTagList", new String[]{});
+ return;
+ }
+
+ Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size());
+ for (String key : tagCloud.getTags().keySet())
+ {
+ Map<String, Object> values = new HashMap<String, Object>(2);
+ values.put("selected", tagList.contains(key));
+ values.put("count", tagCloud.getTags().get(key));
+ tags.put(key, values);
+ }
+
+ parameters.put("configuredTagList", tags);
+
+ // load the script once: if there are multiple instances
+ String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded";
+ boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null;
+ parameters.put("includejquery", includejquery);
+ if (includejquery)
+ {
+ getRequest().setAttribute(jQueryAttributeName, "true");
+ }
+
+ parameters.put("debugEnabled", Boolean.valueOf(this.getConfigValue("debugEnabled")));
+
+ parameters.put("width", StringUtils.isNotEmpty(this.getConfigValue("width"))
+ ? this.getConfigValue("width")
+ : "");
+
+ }
+
+ protected TagCloud buildTagCloud()
+ {
// Get configured node
TagCloud tagCloud = null;
if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName")))
@@ -125,8 +162,7 @@
if (tagCloudOriginal == null)
{
log.error("No tag cloud configured with name : {}", this.getConfigValue("tagCloudName"));
- parameters.put("configuredTagList", new String[]{});
- return;
+ return null;
}
try
{
@@ -173,32 +209,6 @@
}
tagCloud.setCount(10000);
TagCloudManager.getInstance().calculateTagCloud(tagCloud);
-
- Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size());
- for (String key : tagCloud.getTags().keySet())
- {
- Map<String, Object> values = new HashMap<String, Object>(2);
- values.put("selected", tagList.contains(key));
- values.put("count", tagCloud.getTags().get(key));
- tags.put(key, values);
- }
-
- parameters.put("configuredTagList", tags);
-
- // load the script once: if there are multiple instances
- String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded";
- boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null;
- parameters.put("includejquery", includejquery);
- if (includejquery)
- {
- getRequest().setAttribute(jQueryAttributeName, "true");
- }
-
- parameters.put("debugEnabled", Boolean.valueOf(this.getConfigValue("debugEnabled")));
-
- parameters.put("width", StringUtils.isNotEmpty(this.getConfigValue("width"))
- ? this.getConfigValue("width")
- : "");
-
+ return tagCloud;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 13:57:32
|
Revision: 3396
http://openutils.svn.sourceforge.net/openutils/?rev=3396&view=rev
Author: diego_schivo
Date: 2011-03-23 13:57:26 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 URLDecoder.decode
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-03-23 13:44:39 UTC (rev 3395)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-03-23 13:57:26 UTC (rev 3396)
@@ -32,6 +32,8 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -151,7 +153,14 @@
{
if (StringUtils.isEmpty(openPath))
{
- openPath = cookie.getValue();
+ try
+ {
+ openPath = URLDecoder.decode(cookie.getValue(), "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ // should never happen
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 13:44:46
|
Revision: 3395
http://openutils.svn.sourceforge.net/openutils/?rev=3395&view=rev
Author: diego_schivo
Date: 2011-03-23 13:44:39 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 mediafolderpath cookie
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.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/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-03-23 13:44:39 UTC (rev 3395)
@@ -38,6 +38,7 @@
import java.util.zip.ZipFile;
import javax.jcr.RepositoryException;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -144,6 +145,16 @@
// should never happen
}
}
+ for (Cookie cookie : request.getCookies())
+ {
+ if ("mediafolderpath".equals(cookie.getName()))
+ {
+ if (StringUtils.isEmpty(openPath))
+ {
+ openPath = cookie.getValue();
+ }
+ }
+ }
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 13:44:39 UTC (rev 3395)
@@ -86,8 +86,6 @@
protected String sorting;
- protected String mediaFolderPath;
-
protected boolean selectMedia;
protected String actMediaHandle;
@@ -157,7 +155,6 @@
bgSelector = null;
pagesizeSelector = null;
sorting = null;
- mediaFolderPath = null;
for (Cookie cookie : request.getCookies())
{
if ("bgselector".equals(cookie.getName()))
@@ -172,10 +169,6 @@
{
sorting = cookie.getValue();
}
- else if ("mediafolderpath".equals(cookie.getName()))
- {
- mediaFolderPath = cookie.getValue();
- }
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
@@ -626,15 +619,6 @@
}
/**
- * Returns the mediaFolderPath.
- * @return the mediaFolderPath
- */
- public String getMediaFolderPath()
- {
- return mediaFolderPath;
- }
-
- /**
* Returns the writable.
* @return the writable
*/
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 13:38:14 UTC (rev 3394)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 13:44:39 UTC (rev 3395)
@@ -18,7 +18,7 @@
var viewport;
var nodeid = "${this.nodeid!''}";
var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!this.mediaFolderPath!''}";
+var openPath = "${this.openPath!''}";
var actMediaHandle = "${this.actMediaHandle!''}";
var mediaType = "${this.mediaType!''}"; // get tree url
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 13:38:20
|
Revision: 3394
http://openutils.svn.sourceforge.net/openutils/?rev=3394&view=rev
Author: diego_schivo
Date: 2011-03-23 13:38:14 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 mediafolderpath cookie
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-03-23 12:37:50 UTC (rev 3393)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-03-23 13:38:14 UTC (rev 3394)
@@ -38,7 +38,7 @@
new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
- Cookie.write('mediafolder', '${this.path!}', {duration: 30});
+ Cookie.write('mediafolderpath', '${this.path!}', {duration: 30});
[#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
this.openPlaylistFromSearchDialog();
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 12:37:56
|
Revision: 3393
http://openutils.svn.sourceforge.net/openutils/?rev=3393&view=rev
Author: diego_schivo
Date: 2011-03-23 12:37:50 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 mediafolderpath cookie
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 12:27:33 UTC (rev 3392)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 12:37:50 UTC (rev 3393)
@@ -86,6 +86,8 @@
protected String sorting;
+ protected String mediaFolderPath;
+
protected boolean selectMedia;
protected String actMediaHandle;
@@ -155,6 +157,7 @@
bgSelector = null;
pagesizeSelector = null;
sorting = null;
+ mediaFolderPath = null;
for (Cookie cookie : request.getCookies())
{
if ("bgselector".equals(cookie.getName()))
@@ -169,6 +172,10 @@
{
sorting = cookie.getValue();
}
+ else if ("mediafolderpath".equals(cookie.getName()))
+ {
+ mediaFolderPath = cookie.getValue();
+ }
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
@@ -619,6 +626,15 @@
}
/**
+ * Returns the mediaFolderPath.
+ * @return the mediaFolderPath
+ */
+ public String getMediaFolderPath()
+ {
+ return mediaFolderPath;
+ }
+
+ /**
* Returns the writable.
* @return the writable
*/
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:27:33 UTC (rev 3392)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:37:50 UTC (rev 3393)
@@ -18,7 +18,7 @@
var viewport;
var nodeid = "${this.nodeid!''}";
var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!Cookie.read('mediafolder')!''}";
+var openPath = "${this.openPath!this.mediaFolderPath!''}";
var actMediaHandle = "${this.actMediaHandle!''}";
var mediaType = "${this.mediaType!''}"; // get tree url
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-03-23 12:27:39
|
Revision: 3392
http://openutils.svn.sourceforge.net/openutils/?rev=3392&view=rev
Author: diego_schivo
Date: 2011-03-23 12:27:33 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
MEDIA-223 mediafolder cookie
Modified Paths:
--------------
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/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-13 14:20:48 UTC (rev 3391)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:27:33 UTC (rev 3392)
@@ -18,7 +18,7 @@
var viewport;
var nodeid = "${this.nodeid!''}";
var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!''}";
+var openPath = "${this.openPath!Cookie.read('mediafolder')!''}";
var actMediaHandle = "${this.actMediaHandle!''}";
var mediaType = "${this.mediaType!''}"; // get tree url
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-03-13 14:20:48 UTC (rev 3391)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-03-23 12:27:33 UTC (rev 3392)
@@ -38,6 +38,7 @@
new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
+ Cookie.write('mediafolder', '${this.path!}', {duration: 30});
[#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
this.openPlaylistFromSearchDialog();
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 14:20:55
|
Revision: 3391
http://openutils.svn.sourceforge.net/openutils/?rev=3391&view=rev
Author: fgiust
Date: 2011-03-13 14:20:48 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-03-13 14:20:36 UTC (rev 3390)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-03-13 14:20:48 UTC (rev 3391)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4-b3</version>
+ <version>4.4-b4-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b3</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b3</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 14:20:42
|
Revision: 3390
http://openutils.svn.sourceforge.net/openutils/?rev=3390&view=rev
Author: fgiust
Date: 2011-03-13 14:20:36 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.4-b3
Added Paths:
-----------
tags/openutils-mgnlmedia-4.4-b3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 14:20:06
|
Revision: 3389
http://openutils.svn.sourceforge.net/openutils/?rev=3389&view=rev
Author: fgiust
Date: 2011-03-13 14:20:00 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.4-b3
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-03-13 14:05:35 UTC (rev 3388)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-03-13 14:20:00 UTC (rev 3389)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4-b3-SNAPSHOT</version>
+ <version>4.4-b3</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b3</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 14:05:42
|
Revision: 3388
http://openutils.svn.sourceforge.net/openutils/?rev=3388&view=rev
Author: fgiust
Date: 2011-03-13 14:05:35 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-184 cleaning up search filters when changing the active folder
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2011-03-13 14:05:35 UTC (rev 3388)
@@ -36,7 +36,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.lang.StringUtils;
@@ -235,11 +234,11 @@
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
- ContextMenuItem search = new ContextMenuItem("search");
- search.setLabel(getMessages().get("media.menu.search"));
- search.setIcon(request.getContextPath() + "/.resources/icons/24/view.gif");
- search.setOnclick("parent.search()");
- tree.addFunctionBarItem(new FunctionBarItem(search));
+ // ContextMenuItem search = new ContextMenuItem("search");
+ // search.setLabel(getMessages().get("media.menu.search"));
+ // search.setIcon(request.getContextPath() + "/.resources/icons/24/view.gif");
+ // search.setOnclick("parent.search()");
+ // tree.addFunctionBarItem(new FunctionBarItem(search));
}
/**
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt 2011-03-13 14:05:35 UTC (rev 3388)
@@ -0,0 +1,5 @@
+You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
+http://led24.de/iconset/ or http://led24.de/ would be appreciated.
+
+Follow us on twitter http://twitter.com/gasyoun or email le...@gm...
+512 icons 20/05/2009
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-13 14:05:35 UTC (rev 3388)
@@ -234,8 +234,14 @@
var url = frames['mediaFolderView'].location.pathname;
- var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+ var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+
+ var querystring = {};
+ if (!querystringoriginal['search']){
+ querystring = querystringoriginal;
+ }
+
if (isbrowse || url == "") {
url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 13:32:33
|
Revision: 3387
http://openutils.svn.sourceforge.net/openutils/?rev=3387&view=rev
Author: fgiust
Date: 2011-03-13 13:32:27 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
criteria 3.3.1
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-03-13 13:31:46 UTC (rev 3386)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-03-13 13:32:27 UTC (rev 3387)
@@ -153,7 +153,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.2.2</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3386
http://openutils.svn.sourceforge.net/openutils/?rev=3386&view=rev
Author: fgiust
Date: 2011-03-13 13:31:46 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
added debug log
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-03-13 11:12:33 UTC (rev 3385)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-03-13 13:31:46 UTC (rev 3386)
@@ -138,10 +138,7 @@
}
// base path
- String searchPath = StringUtils.removeEnd(path, "/")
- + "/"
- + (descendants ? "/" : StringUtils.EMPTY)
- + "*";
+ String searchPath = StringUtils.removeEnd(path, "/") + "/" + (descendants ? "/" : StringUtils.EMPTY) + "*";
c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/"));
// sorting
@@ -172,7 +169,13 @@
c.setPaging(itemsPerPage, pageNumberStartingFromOne);
}
- return c.execute();
+ AdvancedResult result = c.execute();
+ if (log.isDebugEnabled())
+ {
+ log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ }
+
+ return result;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 11:12:40
|
Revision: 3385
http://openutils.svn.sourceforge.net/openutils/?rev=3385&view=rev
Author: fgiust
Date: 2011-03-13 11:12:33 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-222 Different icon for search-based playlists
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-dynamic.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-standard.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlists.png
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2011-03-13 11:12:33 UTC (rev 3385)
@@ -235,6 +235,20 @@
tasks.add(new BootstrapMissingNodesTask("media-etk"));
}
+ // change "playlists" icon and description
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/admininterface/config/menu/media/playlists",
+ "icon",
+ "/.resources/media/icons/ico16-playlist.png",
+ "/.resources/media/icons/ico16-playlists.png"));
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/admininterface/config/menu/media/playlists",
+ "label",
+ "Playlists",
+ "media.menu.playlists"));
+
return tasks;
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2011-03-13 11:12:33 UTC (rev 3385)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.tree;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.gui.control.Tree;
import javax.jcr.RepositoryException;
@@ -27,6 +28,8 @@
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,6 +39,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(PlaylistsTree.class);
+
+ /**
*
*/
public PlaylistsTree(String name, String repository)
@@ -64,4 +72,26 @@
}
html.append(sb);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getIcon(Content node, NodeData nodedata, String itemType)
+ {
+ try
+ {
+ // handle dynamic playlist icon
+ if (node != null && PlaylistConstants.PLAYLIST.equals(node.getItemType()) && node.hasContent("search"))
+ {
+ return "/.resources/media/icons/ico16-playlist-dynamic.png";
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Failed to read content of " + node.getHandle());
+ }
+
+ return super.getIcon(node, nodedata, itemType);
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2011-03-13 11:12:33 UTC (rev 3385)
@@ -206,7 +206,9 @@
final Messages msgs = getMessages();
tree.addItemType(PlaylistConstants.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
- tree.addItemType(PlaylistConstants.PLAYLIST.getSystemName(), "/.resources/media/icons/ico16-playlist.png");
+ tree.addItemType(
+ PlaylistConstants.PLAYLIST.getSystemName(),
+ "/.resources/media/icons/ico16-playlist-standard.png");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.playlists.column"), true);
column0.setWidth(3);
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml 2011-03-13 11:12:33 UTC (rev 3385)
@@ -10,13 +10,13 @@
<sv:value>9114d5b9-cb54-414e-8a86-9c3fdab31dd8</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/media/icons/ico16-playlist.png</sv:value>
+ <sv:value>/.resources/media/icons/ico16-playlists.png</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
- <sv:value>Playlists</sv:value>
+ <sv:value>media.menu.playlists</sv:value>
</sv:property>
<sv:property sv:name="onclick" sv:type="String">
<sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/playlistsBrowser.html');</sv:value>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-dynamic.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-dynamic.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-standard.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist-standard.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlists.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlists.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-03-13 11:12:33 UTC (rev 3385)
@@ -78,13 +78,14 @@
media.menu.title=Media
media.menu.browse=Browse
media.menu.search=Search
+media.menu.playlists=Collections
buttons.ok=Ok
buttons.cancel=Cancel
buttons.date=Date
buttons.search=Search
buttons.select=Select
-buttons.saveAsPlaylist=Save as playlist
+buttons.saveAsPlaylist=Save as a collection
dialog.filenopreview.extensions=Valid file extensions:
dialog.filenopreview.error.extension=File extension for field {0} not valid
@@ -123,8 +124,8 @@
stk.dam.mediauuid.label=Select media
tree.playlists=Playlists tree
-tree.playlists.new=New playlist
-tree.playlists.column=Playlists
+tree.playlists.new=New collection
+tree.playlists.column=Collections
tree.playlists.xspf=xspf format
playlist.entries.add=Add entry
playlist.entries.addMany=Add entries
@@ -137,14 +138,14 @@
playlist.media.edit=Edit media
playlist.xspf.export=XSPF playlist
playlist.saved=Playlist successfully saved
-playlist.cantsave=Can''t save the playlist
-playlist.details.header=Playlist details
+playlist.cantsave=Can''t save the collection
+playlist.details.header=Collection details
playlist.details.title=Title
playlist.details.description=Description
playlist.save=Save
playlist.search.edit=Edit search
-playlist.confirmUpdate.title=Update existing playlist
-playlist.confirmUpdate.text=Do you want to update playlist {0} ?
+playlist.confirmUpdate.title=Update existing collection
+playlist.confirmUpdate.text=Do you want to update collection {0} ?
config.search.filters.locale=Locale
config.search.filters.text=Text
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-03-13 10:30:31 UTC (rev 3384)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-03-13 11:12:33 UTC (rev 3385)
@@ -79,6 +79,7 @@
media.menu.title=Media
media.menu.browse=Naviga
media.menu.search=Cerca
+media.menu.playlists=Collezioni
buttons.ok=Ok
buttons.cancel=Annulla
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 10:30:37
|
Revision: 3384
http://openutils.svn.sourceforge.net/openutils/?rev=3384&view=rev
Author: fgiust
Date: 2011-03-13 10:30:31 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-175 standardize command names
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2011-03-13 10:30:31 UTC (rev 3384)
@@ -24,9 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.Command;
-
/**
* Extends {@link AdminTreeMVCHandler} to include custom js and to route activate command to activateMedia command
* @author molaschi
@@ -69,20 +67,4 @@
return MediaModuleTree.class.getName();
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected Command findCommand(String commandName)
- {
- String cmdName = commandName;
- if ("activate".equals(cmdName))
- {
- cmdName = "activateMedia";
- }
-
- Command cmd = super.findCommand(cmdName);
- return cmd;
- }
-
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2011-03-13 10:30:31 UTC (rev 3384)
@@ -29,7 +29,6 @@
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,19 +92,6 @@
* {@inheritDoc}
*/
@Override
- protected Command findCommand(String commandName)
- {
- if ("activate".equals(commandName))
- {
- commandName = "activatePlaylist";
- }
- return super.findCommand(commandName);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public String pasteNode(String pathOrigin, String pathSelected, int pasteType, int action)
throws ExchangeException, RepositoryException
{
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="activateMedia" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>d921e616-3ea9-48ae-a3d5-5abe0aaea59f</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaActivationCommand</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-12T18:21:29.563+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml 2011-03-13 10:23:34 UTC (rev 3383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activatePlaylist.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="activatePlaylist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>72d1551b-7f81-4733-be5d-d57a73ac519a</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.admininterface.commands.ActivationCommand</sv:value>
- </sv:property>
- <sv:property sv:name="itemTypes" sv:type="String">
- <sv:value>mgnl:playlistentry</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-03T10:07:01.421+01:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="activate" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d921e616-3ea9-48ae-a3d5-5ace0aaea59f</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaActivationCommand</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2008-08-12T18:21:29.563+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.media.activate.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml 2011-03-13 10:30:31 UTC (rev 3384)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="activate" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>72d1551b-7f81-4733-ce5d-d57a73ac519a</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.commands.ActivationCommand</sv:value>
+ </sv:property>
+ <sv:property sv:name="itemTypes" sv:type="String">
+ <sv:value>mgnl:playlistentry</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-03-19T19:18:55.094+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-03-28T19:50:07.958+08:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-03T10:07:01.421+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.adminInterface.commands.playlists.activate.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 10:23:40
|
Revision: 3383
http://openutils.svn.sourceforge.net/openutils/?rev=3383&view=rev
Author: fgiust
Date: 2011-03-13 10:23:34 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-215 Automatically display the folder content after selecting a path through the new address bar
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-03-13 10:00:13 UTC (rev 3382)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-03-13 10:23:34 UTC (rev 3383)
@@ -28,7 +28,7 @@
<#if !tree.browseMode && tree.functionBar?exists>
<#assign functionBarHtml = tree.functionBar.html>
<#assign p = functionBarHtml?index_of('>')>
- ${functionBarHtml?substring(0, p)} style="height: 59px;"><input id="${tree.javascriptTree}AddressBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) mgnlTreeControl.expandNode(this.value);" class="mgnlDialogControlEdit" style="width: 100%;" value="" />${functionBarHtml?substring(p + 1)}
+ ${functionBarHtml?substring(0, p)} style="height: 59px;"><input id="${tree.javascriptTree}AddressBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) {try{mgnlTreeControl.expandNode(this.value);mgnlTreeControl.openFolder('${contextPath}',this.value,false)}catch(e){}}" class="mgnlDialogControlEdit" style="width: 100%;" value="" />${functionBarHtml?substring(p + 1)}
</#if>
<#include "/info/magnolia/cms/gui/control/TreeJavascript.ftl"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 10:00:20
|
Revision: 3382
http://openutils.svn.sourceforge.net/openutils/?rev=3382&view=rev
Author: fgiust
Date: 2011-03-13 10:00:13 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
fix scroll on ie7
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css 2011-03-13 09:50:28 UTC (rev 3381)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css 2011-03-13 10:00:13 UTC (rev 3382)
@@ -15,7 +15,8 @@
form {
height: 100%;
overflow: auto;
- paddding-bottom: 20px;
+ padding-bottom: 20px;
+ position:relative;
}
.row {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-13 09:50:34
|
Revision: 3381
http://openutils.svn.sourceforge.net/openutils/?rev=3381&view=rev
Author: fgiust
Date: 2011-03-13 09:50:28 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
MEDIA-221 Add the full path of the media to the "attributes" tab
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayhandle.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java 2011-03-13 09:50:28 UTC (rev 3381)
@@ -0,0 +1,38 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.gui.dialog.DialogStatic;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class DisplayHandle extends DialogStatic
+{
+
+ @Override
+ protected String readValue()
+ {
+ return this.getStorageNode().getHandle();
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.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/dialog/DisplayUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2011-03-13 09:32:51 UTC (rev 3380)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2011-03-13 09:50:28 UTC (rev 3381)
@@ -21,9 +21,7 @@
import info.magnolia.cms.gui.dialog.DialogStatic;
-import org.apache.commons.lang.StringUtils;
-
/**
* @author cstrappazzon
* @version $Id$
@@ -34,12 +32,7 @@
@Override
protected String readValue()
{
- if (StringUtils.equals(this.getName(), "displayUUID"))
- {
- return this.getStorageNode().getUUID();
- }
-
- return "";
+ return this.getStorageNode().getUUID();
}
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayhandle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayhandle.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayhandle.xml 2011-03-13 09:50:28 UTC (rev 3381)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="displayhandle" 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>d2228600-7918-46b1-b460-fc462ee2a5c8</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DisplayHandle</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-26T16:13:12.696Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-26T16:13:35.061Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-18T10:40:06.055+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayhandle.xml
___________________________________________________________________
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-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml 2011-03-13 09:32:51 UTC (rev 3380)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml 2011-03-13 09:50:28 UTC (rev 3381)
@@ -464,5 +464,48 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="displayhandle">
+ <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>1519f4fa-43df-4736-afab-cbefa8828f8f</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>displayhandle</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>media.dialogs.tabAttributes.path.label</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="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-06-21T10:33:05.445Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-18T10:30:43.186+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-03-13 09:32:51 UTC (rev 3380)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-03-13 09:50:28 UTC (rev 3381)
@@ -41,6 +41,7 @@
media.dialogs.tabAttributes.creator.label=Created by
media.dialogs.tabAttributes.creationDate.label=Created on
media.dialogs.tabAttributes.modificationDate.label=Modified on
+media.dialogs.tabAttributes.path.label=Path
tree.media.folders=Media folders tree
media.loadzip=Load zip archive
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-03-13 09:32:51 UTC (rev 3380)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-03-13 09:50:28 UTC (rev 3381)
@@ -41,6 +41,7 @@
media.dialogs.tabAttributes.creator.label=Creato da
media.dialogs.tabAttributes.creationDate.label=Creato il
media.dialogs.tabAttributes.modificationDate.label=Modificato il
+media.dialogs.tabAttributes.path.label=Path
tree.media.folders=Alberatura media
media.loadzip=Carica archivio zip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
