Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2545] trunk
|
From: <die...@us...> - 2010-05-24 16:44:37
|
Revision: 2545
http://openutils.svn.sourceforge.net/openutils/?rev=2545&view=rev
Author: diego_schivo
Date: 2010-05-24 16:44:31 +0000 (Mon, 24 May 2010)
Log Message:
-----------
MEDIA-144 use the magnolia dialog for editing media
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/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml 2010-05-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlcontextmenu/pom.xml 2010-05-24 16:44:31 UTC (rev 2545)
@@ -123,7 +123,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.3-b2-SNAPSHOT</version>
+ <version>4.3-b1</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-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java 2010-05-24 16:44:31 UTC (rev 2545)
@@ -31,6 +31,8 @@
private String mediaHandle;
+ private String mediaDialog;
+
private String thumbnail;
private String type;
@@ -96,6 +98,24 @@
}
/**
+ * Returns the mediaDialog.
+ * @return the mediaDialog
+ */
+ public String getMediaDialog()
+ {
+ return mediaDialog;
+ }
+
+ /**
+ * Sets the mediaDialog.
+ * @param mediaDialog the mediaDialog to set
+ */
+ public void setMediaDialog(String mediaDialog)
+ {
+ this.mediaDialog = mediaDialog;
+ }
+
+ /**
* 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-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 16:44:31 UTC (rev 2545)
@@ -36,6 +36,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
@@ -177,6 +179,13 @@
entry.setHandle(subNode.getHandle());
entry.setMedia(media.getUUID());
entry.setMediaHandle(media.getHandle());
+ MediaTypeConfiguration typeConf = MediaConfigurationManager
+ .getInstance()
+ .getMediaTypeConfigurationFromMedia(media);
+ if (typeConf != null)
+ {
+ entry.setMediaDialog(typeConf.getDialog());
+ }
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-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-24 16:44:31 UTC (rev 2545)
@@ -4,7 +4,7 @@
container = parent.viewport.getComponent('center-panel');
var dataStore = new Ext.data.SimpleStore({
- fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle', 'mediaHandle']
+ fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle', 'mediaHandle', 'mediaDialog']
});
dataStore.loadData(playlist.entries);
@@ -71,6 +71,19 @@
}
});
}
+ },
+ {
+ id: 'editMediaBtn',
+ text: playlist.msgs.editMedia,
+ icon: contextPath + '/.resources/media/icons/ico16-edit.png',
+ iconCls: 'button-edit',
+ disabled: true,
+ handler: function(){
+ var s = grid.getSelectionModel().getSelections()[0];
+ parent.openWindow('.magnolia/dialogs/' + s.data['mediaDialog'] + '.html'
+ + '?mgnlPath=' + s.data['mediaHandle']
+ + '&mgnlRepository=media');
+ }
}
];
@@ -272,6 +285,7 @@
});
grid.getSelectionModel().on('selectionchange', function(sm){
Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
+ Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
});
container.on('bodyresize', resizeGrid);
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-05-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-05-24 16:44:31 UTC (rev 2545)
@@ -109,6 +109,7 @@
tree.playlists.xspf=xspf format
playlist.entries.add=Add entry
playlist.entries.remove=Remove entry
+playlist.media.edit=Edit media
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 2010-05-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-05-24 16:44:31 UTC (rev 2545)
@@ -112,6 +112,7 @@
tree.playlists.xspf=Formato xspf
playlist.entries.add=Aggiungi elemento
playlist.entries.remove=Rimuovi elemento
+playlist.media.edit=Modifica media
config.search.filters.locale=Locale
config.search.filters.text=Testo
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-24 14:40:20 UTC (rev 2544)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-05-24 16:44:31 UTC (rev 2545)
@@ -27,13 +27,15 @@
'${(entry.description!'')?js_string}',
'${(entry.tags!'')?js_string}',
'${entry.handle!''}',
- '${entry.mediaHandle!''}'
+ '${entry.mediaHandle!''}',
+ '${entry.mediaDialog!''}'
][#if entry_has_next],[/#if]
[/#list]
],
msgs: {
addEntry: '${this.msgs.get('playlist.entries.add')?js_string}',
- removeEntry: '${this.msgs.get('playlist.entries.remove')?js_string}'
+ removeEntry: '${this.msgs.get('playlist.entries.remove')?js_string}',
+ editMedia: '${this.msgs.get('playlist.media.edit')?js_string}'
}
});
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
