From: <die...@us...> - 2010-05-24 09:18:46
|
Revision: 2537 http://openutils.svn.sourceforge.net/openutils/?rev=2537&view=rev Author: diego_schivo Date: 2010-05-24 09:18:38 +0000 (Mon, 24 May 2010) Log Message: ----------- MEDIA-143 tooltip on playlist entry's thumbnail showing the media handle Modified Paths: -------------- trunk/openutils-mgnlcontextmenu/pom.xml trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html Modified: trunk/openutils-mgnlcontextmenu/pom.xml =================================================================== --- trunk/openutils-mgnlcontextmenu/pom.xml 2010-05-21 16:51:42 UTC (rev 2536) +++ trunk/openutils-mgnlcontextmenu/pom.xml 2010-05-24 09:18:38 UTC (rev 2537) @@ -123,7 +123,7 @@ <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmedia</artifactId> - <version>4.3-b1</version> + <version>4.3-b2-SNAPSHOT</version> </dependency> <dependency> <groupId>info.magnolia</groupId> Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java 2010-05-21 16:51:42 UTC (rev 2536) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java 2010-05-24 09:18:38 UTC (rev 2537) @@ -29,6 +29,8 @@ private String media; + private String mediaHandle; + private String thumbnail; private String type; @@ -76,6 +78,24 @@ } /** + * Returns the mediaHandle. + * @return the mediaHandle + */ + public String getMediaHandle() + { + return mediaHandle; + } + + /** + * Sets the mediaHandle. + * @param mediaHandle the mediaHandle to set + */ + public void setMediaHandle(String mediaHandle) + { + this.mediaHandle = mediaHandle; + } + + /** * Returns the thumbnail. * @return the thumbnail */ Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-21 16:51:42 UTC (rev 2536) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 09:18:38 UTC (rev 2537) @@ -156,6 +156,7 @@ PlaylistEntryBean entry = new PlaylistEntryBean(); entry.setHandle(subNode.getHandle()); entry.setMedia(media.getUUID()); + entry.setMediaHandle(media.getHandle()); entry.setThumbnail(MediaEl.thumbnail(media)); entry.setType(NodeDataUtil.getString(media, "type")); entry.setTitle(I18nContentSupportFactory Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-21 16:51:42 UTC (rev 2536) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-24 09:18:38 UTC (rev 2537) @@ -4,7 +4,7 @@ container = parent.viewport.getComponent('center-panel'); var dataStore = new Ext.data.SimpleStore({ - fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle'] + fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle', 'mediaHandle'] }); dataStore.loadData(playlist.entries); @@ -12,7 +12,7 @@ { header: 'Thumbnail', renderer : function(v, p, record){ - return v ? '<img border="0" alt="" src="' + contextPath + v + '" />' : ''; + return v ? '<img border="0" alt="" src="' + contextPath + v + '" title="' + record.data['mediaHandle'] + '" />' : ''; } }, {header: 'Type'}, Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-05-21 16:51:42 UTC (rev 2536) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-05-24 09:18:38 UTC (rev 2537) @@ -26,7 +26,8 @@ '${(entry.title!'')?js_string}', '${(entry.description!'')?js_string}', '${(entry.tags!'')?js_string}', - '${entry.handle!''}' + '${entry.handle!''}', + '${entry.mediaHandle!''}' ][#if entry_has_next],[/#if] [/#list] ], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |