diff --git a/admin-root/CREDITS b/admin-root/CREDITS index 2ef1bea3..381e99c8 100644 --- a/admin-root/CREDITS +++ b/admin-root/CREDITS @@ -1,4 +1,4 @@ -/* $Id$ */ +* $Id$ */ I've received lots of help from people on this project. @@ -110,6 +110,5 @@ Phil Packer Diego Penneno * Patches for multiple PID files to facilitate gentoo init scripts - - - +Patrick Kolla + * Popup "wizard" for smart playlists diff --git a/admin-root/Makefile.am b/admin-root/Makefile.am index 02fd3fa3..78835707 100644 --- a/admin-root/Makefile.am +++ b/admin-root/Makefile.am @@ -14,5 +14,5 @@ EXTRA_DIST = ftr.html linkOpaque.gif status.html aspl-license.txt \ mt-daapd.css mt-daapd.png config.html index.html required.gif \ gpl-license.html aspl-license.html thanks.html feedback.html \ playlist.html playlist.js smart.html smart.js DAAPApplet-0.1.jar \ - applet.html CREDITS + smartpopup.html applet.html CREDITS diff --git a/admin-root/smart.html b/admin-root/smart.html index 70755398..ba92a781 100644 --- a/admin-root/smart.html +++ b/admin-root/smart.html @@ -3,9 +3,8 @@

Smart Playlists

- - +
IDPlaylist NameTypeAction
IDPlaylist NameTypeAction
@@ -16,12 +15,12 @@ diff --git a/admin-root/smart.js b/admin-root/smart.js index a4697d99..dc5013d8 100644 --- a/admin-root/smart.js +++ b/admin-root/smart.js @@ -2,6 +2,12 @@ var req; var playlist_info={}; +function pl_popup(URL) { + day = new Date(); + id = day.getTime(); + eval("pagemtdaapdplPop = window.open(URL, 'mtdaapdple', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=500,height=240,left = 320,top = 448');"); +} + function pl_editor_state(state) { var pleditor = document.getElementById("pl_editor"); if(!pleditor) diff --git a/admin-root/smartpopup.html b/admin-root/smartpopup.html new file mode 100755 index 00000000..e4cafd07 --- /dev/null +++ b/admin-root/smartpopup.html @@ -0,0 +1,342 @@ + +mt-daapd playlist wizard + + + +
+ + + + + + + + + + + +
Wizard
Template:
Combine: + match all + match some +
+
+ + +