Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2011-02-17 09:54:52
|
Revision: 3347
http://openutils.svn.sourceforge.net/openutils/?rev=3347&view=rev
Author: diego_schivo
Date: 2011-02-17 09:54:46 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 confirm update playlist
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 09:25:57 UTC (rev 3346)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 09:54:46 UTC (rev 3347)
@@ -11,9 +11,24 @@
<script src="${this.request.contextPath}/.resources/calendar/calendar-setup.js" type="text/javascript"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-core.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-more.js"></script>
+ <script type="text/javascript">
+window.addEvent('domready', function(){
+ var form = $('mediaSearchForm');
+ form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
+ new Event(e).stop();
+ [#if this.playlistUUID?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ });
+
+ function saveAsPlaylist(update){
+ form.getElement('input[name=command]').set('value', 'saveAsPlaylist');
+ form.getElement('input[name=playlistUUID]').set('value', update ? "${this.playlistUUID!''}" : '');
+ form.submit();
+ }
+});
+ </script>
</head>
<body id="mgnl">
- <form action="${this.request.contextPath}/media/search" target="mediaFolderView">
+ <form id="mediaSearchForm" action="${this.request.contextPath}/media/search" target="mediaFolderView">
[#macro msgIfAvail key]
[#if !(this.msgs[key])?starts_with("???")]${this.msgs[key]}[#else]${key}[/#if]
[/#macro]
@@ -31,9 +46,10 @@
<input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
<div class="row">
- <input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
+ <input type="submit" name="search" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" />
<input type="hidden" name="command" value="" />
+ <input type="hidden" name="playlistUUID" value="" />
</div>
</form>
</body>
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-02-17 09:25:57 UTC (rev 3346)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 09:54:46 UTC (rev 3347)
@@ -305,6 +305,13 @@
});
uploadDlg.show();
}
+
+function confirmUpdatePlaylist(callback)
+{
+ Ext.MessageBox.confirm('Confirm', 'Update existing playlist?', function(btn){
+ callback(btn == 'yes');
+ });
+}
//]]>
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:19:50
|
Revision: 3352
http://openutils.svn.sourceforge.net/openutils/?rev=3352&view=rev
Author: diego_schivo
Date: 2011-02-17 11:19:44 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 confirm message
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 11:14:16 UTC (rev 3351)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 11:19:44 UTC (rev 3352)
@@ -16,7 +16,7 @@
var form = $('mediaSearchForm');
form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
new Event(e).stop();
- [#if this.playlistHandle?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ [#if this.playlistHandle?has_content]parent.extConfirm('Update existing playlist', 'Do you want to update playlist ${this.playlistHandle?js_string} ?', saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
});
function saveAsPlaylist(update){
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-02-17 11:14:16 UTC (rev 3351)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 11:19:44 UTC (rev 3352)
@@ -306,9 +306,9 @@
uploadDlg.show();
}
-function confirmUpdatePlaylist(callback)
+function extConfirm(title, text, callback)
{
- Ext.MessageBox.confirm('Confirm', 'Update existing playlist?', function(btn){
+ Ext.MessageBox.confirm(title, text, function(btn){
callback(btn == 'yes');
});
}
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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X