fixed shoutbox typo so albums add correctly, can now edit playlist tracks and change their track in the playlist, added batch download link to single playlist view

5 files changed, 21 insertions, 21 deletions

diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php
index 520b2fb6..8a8d612c 100644
--- a/templates/show_edit_playlist_song_row.inc.php
+++ b/templates/show_edit_playlist_song_row.inc.php
@@ -19,29 +19,23 @@
 
 */
 ?>
-<td colspan="8">
-<form method="post" id="edit_song_<?php echo $song->id; ?>" action="#">
+<td colspan="9">
+<form method="post" id="edit_track_<?php echo $track['id']; ?>" action="javascript:void(0);">
 <table class="inline-edit" cellpadding="3" cellspacing="0">
 <tr>
 <td>
-	<input type="textbox" name="name" value="<?php echo scrub_out($song->title); ?>" />
-</td>
-<td>
-	<?php show_artist_select('artist',$song->artist); ?>
-</td>
-<td>
-	<?php show_album_select('album',$song->album); ?>
-</td>
-<td>
-	<?php show_genre_select('genre',$song->genre); ?>
-</td>
-<td>
-	<input type="textbox" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" />
+	<input type="textbox" name="track" size="3" maxlength="4" value="<?php echo intval($track['track']); ?>" />
 </td>
+<td class="cel_song"><?php echo $song->f_link; ?></td>
+<td class="cel_artist"><?php echo $song->f_artist_link; ?></td>
+<td class="cel_album"><?php echo $song->f_album_link; ?></td>
+<td class="cel_genre"><?php echo $song->f_genre_link; ?></td>
+<td class="cel_track"><?php echo $song->f_track; ?></td>
+<td class="cel_time"><?php echo $song->f_time; ?></td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $song->id; ?>" />
 	<input type="hidden" name="type" value="song" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
+	<?php echo Ajax::button('?page=playlist&action=save_track&playlist_id=' . $playlist->id . '&track_id=' . $track['id'],'download',_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?>
 </td>
 </tr>
 </table>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 190ea033..f04326fd 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -27,6 +27,11 @@
 <div id="information_actions">
 <ul>
 	<li><a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Normalize Tracks'); ?></a></li>
+        <?php if (Access::check_function('batch_download')) { ?>
+                <li><a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&amp;id=<?php echo $playlist->id; ?>">
+                        <?php echo get_user_icon('batch_download',_('Batch Download')); ?>
+                </a></li>
+        <?php } ?>
 	<li><?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id,_('Add All'),'play_playlist'); ?></li>
 	<li><?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id,_('Add Random'),'play_playlist_random'); ?></li>
 </ul>
diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php
index dd92f0fb..f3345dd7 100644
--- a/templates/show_playlist_song_row.inc.php
+++ b/templates/show_playlist_song_row.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -34,6 +34,7 @@
 	</a>
 	<?php } ?>
 	<?php if ($playlist->has_access()) { ?>
-		<?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track=' . $object['track_id'],'delete',_('Delete'),'track_del_' . $object['track_id']); ?>
+		<?php echo Ajax::button('?page=playlist&action=edit_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'edit',_('Edit'),'track_edit_' . $object['track_id']); ?>
+		<?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete',_('Delete'),'track_del_' . $object['track_id']); ?>
 	<?php } ?>
 </td>
diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php
index b0ba1e95..a2ee62f3 100644
--- a/templates/show_playlist_songs.inc.php
+++ b/templates/show_playlist_songs.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ $ajax_url = Config::get('ajax_url');
 		$song->format(); 
 		$playlist_track = $object['track'];
 ?>
-<tr class="<?php echo flip_class(); ?>" id="song_<?php echo $song->id; ?>">
+<tr class="<?php echo flip_class(); ?>" id="track_<?php echo $object['track_id']; ?>">
 	<?php require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; ?> 
 </tr>
 <?php } ?>
diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 9a9c149c..cdb53f03 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -31,7 +31,7 @@
 ?>
 <div class="shout <?php echo flip_class(); ?>">
 	<?php echo $shout->get_image(); ?>
-	<?php echo Ajax::button('?action=basket&type=' . $shout->object_type .' &id=' . $shout->object_id,'add',_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?>
+	<?php echo Ajax::button('?action=basket&type=' . $shout->object_type .'&id=' . $shout->object_id,'add',_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?>
 	<?php echo $object->f_link; ?>
 	<span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span>
 	<span class="shouttext"><?php echo scrub_out($shout->text); ?></span>