Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2022] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-02-22 10:32:20
|
Revision: 2022
http://openutils.svn.sourceforge.net/openutils/?rev=2022&view=rev
Author: diego_schivo
Date: 2010-02-22 10:32:13 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
MEDIA-105 open the media selector directly.
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.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-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-02-22 10:32:13 UTC (rev 2022)
@@ -69,30 +69,6 @@
* {@inheritDoc}
*/
@Override
- public void renderHtml(String view) throws IOException
- {
- if (VIEW_CLOSE_WINDOW.equals(view))
- {
- PrintWriter out = this.getResponse().getWriter();
- out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" ");
- out.write(" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
- out.println("<html>"); //$NON-NLS-1$
- out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
- out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
- out.println("parent.openPlaylist('" + path + "');");
- out.println("parent.closeLayer();"); //$NON-NLS-1$
- out.println("</script></html>"); //$NON-NLS-1$
- }
- else
- {
- super.renderHtml(view);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
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-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-02-22 10:32:13 UTC (rev 2022)
@@ -36,7 +36,24 @@
icon: contextPath + '/.resources/media/icons/ico16-add.png',
iconCls: 'button-add',
handler: function(){
- parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
+ //parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
+ var mgnlWin = parent.parent;
+ mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
+ Ext.Ajax.request({
+ form: 'addEntryForm',
+ params: {
+ mgnlPath: playlist.handle,
+ media: uuid
+ },
+ success: function(){
+ parent.openPlaylist(playlist.handle);
+ },
+ failure: function(){
+ // todo
+ }
+ });
+ };
+ mgnlWin.mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=media&selectMedia=true&mgnlCK=' + mgnlWin.mgnlGetCacheKiller(), 800, 500);
}
},
{
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-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-02-22 10:32:13 UTC (rev 2022)
@@ -41,5 +41,14 @@
</script>
</head>
<body>
+ <div style="display: none;">
+ <form id="addEntryForm" method="POST" action="${this.request.contextPath}/.magnolia/dialogs/playlistentry.html" enctype="multipart/form-data">
+ <input type="hidden" name="mgnlDialog" value="playlistentry" />
+ <input type="hidden" name="mgnlRepository" value="playlists" />
+ <input type="hidden" name="mgnlSaveInfo" value="media,String,0,0,0" />
+ <input type="hidden" name="media_saveHandler" value="net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler" />
+ <input type="hidden" name="media_configNode" value="/modules/media/dialogs/playlistentry/tabGeneral/media" />
+ </form>
+ </div>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
