Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3385] trunk/openutils-mgnlmedia/src/main
|
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.
|
