added ability to do add new on other elements of song edit (Thx picasso) added export catalog to csv

3 files changed, 25 insertions, 12 deletions

diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index dcd41750..cbab7739 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -26,15 +26,19 @@
 	<input type="textbox" name="name" value="<?php echo scrub_out($song->title); ?>" />
 </td>
 <td>
-	<?php show_artist_select('artist',$song->artist); ?>
+	<?php show_artist_select('artist',$song->artist,true,$song->id); ?>
+	<div id="artist_select_song_<?php echo $song->id ?>"></div>
+<?php echo Ajax::observe('artist_select_'.$song->id,'change','check_inline_song_edit("artist", '.$song->id.')'); ?>
 </td>
 <td>
 	<?php show_album_select('album',$song->album,true,$song->id); ?>
 	<div id="album_select_song_<?php echo $song->id ?>"></div>
-<?php echo Ajax::observe('album_select_'.$song->id,'change','checkAlbum('.$song->id.')'); ?>
+<?php echo Ajax::observe('album_select_'.$song->id,'change','check_inline_song_edit("album", '.$song->id.')'); ?>
 </td>
 <td>
-	<?php show_genre_select('genre',$song->genre); ?>
+	<?php show_genre_select('genre',$song->genre,'',true,$song->id); ?>
+	<div id="genre_select_song_<?php echo $song->id ?>"></div>
+<?php echo Ajax::observe('genre_select_'.$song->id,'change','check_inline_song_edit("genre", '.$song->id.')'); ?>
 </td>
 <td>
 	<input type="textbox" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" />
diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php
index eece02f2..16ffc716 100644
--- a/templates/show_export.inc.php
+++ b/templates/show_export.inc.php
@@ -19,20 +19,28 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+
+$name = 'export_' . $_REQUEST['export_format']; 
+${$name} = ' selected="selected"';
+$name = 'catalog_' . $_REQUEST['export_catalog']; 
+${$name} = ' selected="selected"'; 
+
 show_box_top(_('Export Catalog')); ?>
 <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" >
-<table cellspacing="0" cellpadding="3">
+<table class="tableform" cellspacing="0" cellpadding="3">
 <tr>
 	<td valign="top"><strong><?php echo _('Catalog'); ?>:</strong></td>
 	<td>
-		<select id="export_catalog" name="export_catalog" width="150" style="width: 150px">
-			<option value="">(all)</option>
+		<select id="export_catalog" name="export_catalog">
+			<option value=""><?php echo _('All'); ?></option>
 <?php
 		$catalog_ids = Catalog::get_catalogs(); 
-		foreach ($catalog_ids as $cat_id) {
-			$cat = new Catalog($cat_id);
+		foreach ($catalog_ids as $catalog_id) {
+			$catalog = new Catalog($catalog_id);
+			$current_name = 'catalog_' . $catalog->id; 
+			
 ?>
-			<option value="<?php echo $cat->id; ?>" <?php if($_REQUEST['export_catalog']==$cat->id) echo "selected=\"selected\"" ?>><?php echo $cat->name; ?></option>
+			<option value="<?php echo $catalog->id; ?>"<?php echo ${$current_name}; ?>><?php echo scrub_out($catalog->name); ?></option>
 <?php
 		}
 ?>
@@ -42,8 +50,9 @@ show_box_top(_('Export Catalog')); ?>
 <tr>
 	<td valign="top"><strong><?php echo _('Format'); ?>:</strong></td>
 	<td>
-		<select id="export_format" name="export_format" width="150" style="width: 150px">
-			<option value="itunes" <?php if($_REQUEST['export_format']=='itunes') echo "selected=\"selected\"" ?>>iTunes</option>
+		<select id="export_format" name="export_format">
+			<option value="csv" <?php echo $export_csv; ?>>CSV</option>
+			<option value="itunes" <?php echo $export_itunes; ?>>iTunes</option>
 		</select>
 	</td>
 </tr>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 0f0411ab..9ad1154e 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -24,8 +24,8 @@
       <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li>
       <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>
       <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li>
+      <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export Catalog'); ?></a></li>
       <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li>
-      <li id="sb_admin_ot_Export"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export'); ?></a></li>
       <?php if (Config::get('shoutbox')) { ?>
       <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/shout.php?action=show_manage"><?php echo _('Manage Shoutbox'); ?></a></li>
       <?php } ?>