From d7c3ede9e757dab9889503a415d78c7937a311b3 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 14 Jan 2008 01:38:50 +0000
Subject: fixed public/private aspect of playlists, default is to filter out
 non-owned private playlists now

---
 templates/show_edit_playlist_row.inc.php | 12 +++++++++---
 templates/show_playlist.inc.php          |  2 +-
 templates/show_playlist_row.inc.php      |  1 +
 templates/show_playlists.inc.php         |  5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index edc8e63f..3a1e6161 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -19,13 +19,19 @@
 
 */
 ?>
-<td colspan="5">
-<form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="#">
+<td colspan="6">
+<form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="javascript:void(0);">
 <table cellpadding="0" cellspacing="0">
 <tr>
 	<td>
-	<input type="textbox" name="name" size="9" value="<?php echo scrub_out($playlist->name); ?>" />
+		<input type="textbox" name="name" size="9" value="<?php echo scrub_out($playlist->name); ?>" />
 	</td>
+	<td>	
+		<?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> 
+		<select name="pl_type">
+			<option value="public"<?php echo $select_public; ?>><?php echo _('Public'); ?></option>
+			<option value="private"<?php echo $select_private; ?>><?php echo _('Private'); ?></option>
+		</select>
 	<td>
 	<input type="hidden" name="id" value="<?php echo $playlist->id; ?>" />
 	<input type="hidden" name="type" value="playlist" />
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 0c72526c..622e266b 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -24,7 +24,7 @@
  */
 $web_path = Config::get('web_path'); 
 ?>
-<?php show_box_top($playlist->name . ' ' . _('Playlist')); ?>
+<?php show_box_top($playlist->f_type . ' ' . $playlist->name . ' ' . _('Playlist')); ?>
 		<div id="information_actions">
 		<ul>
 		<li><a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Normalize Tracks'); ?></a></li>
diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php
index 1efb252a..a6579a05 100644
--- a/templates/show_playlist_row.inc.php
+++ b/templates/show_playlist_row.inc.php
@@ -24,6 +24,7 @@
 	<?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random',_('Random'),'random_playlist_' . $playlist->id); ?>
 </td>
 <td class="cel_playlist"><?php echo $playlist->f_link; ?></td>
+<td class="cel_type"><?php echo $playlist->f_type; ?></td>
 <td class="cel_songs"><?php echo $count; ?></td>
 <td class="cel_owner"><?php echo scrub_out($playlist->f_user); ?></td>
 <td class="cel_action">
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index 5707c772..553d65f5 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -25,6 +25,7 @@
 <colgroup>
   <col id="col_add" />
   <col id="col_playlist" />
+  <col id="col_type" />
   <col id="col_songs" />
   <col id="col_owner" />
   <col id="col_action" />
@@ -32,6 +33,7 @@
 <tr class="th-top">
   <th class="cel_add"><?php echo _('Add'); ?></th>
 	<th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th>
+	<th class="cel_type">&nbsp;</th>
 	<th class="cel_songs"><?php echo _('# Songs'); ?></th>
 	<th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&sort=user',_('Owner'),'playlist_sort_owner'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
@@ -49,8 +51,9 @@ foreach ($object_ids as $playlist_id) {
 <tr class="th-bottom">
   <th class="cel_add"><?php echo _('Add'); ?></th>
 	<th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name_bottom'); ?></th>
+	<th class="cel_type">&nbsp;</th>
 	<th class="cel_songs"><?php echo _('# Songs'); ?></th>
-	<th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&sort=user',_('Owner'),'playlist_sort_owner'); ?></th>
+	<th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&sort=user',_('Owner'),'playlist_sort_owner_bottom'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
 </tr>
 </table>
-- 
cgit