* Added delete admin function on democratic play

* fixed some minor display issues with playlist dropdowns
* added Delete Disabled bin script for removing disabled songs

6 files changed, 22 insertions, 6 deletions

diff --git a/templates/default.css b/templates/default.css
index 625ea8ec..6bc33087 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -566,11 +566,13 @@ li.current-rating{
 	border-bottom:2px solid #000000;
 	border-left:2px solid #000000;
 	border-top:2px solid #000000;}
+
 .text-action, .text-action li {
 	margin-top:5px;
 	list-style: none;
 	margin-bottom:5px;
 	padding-left:0px;
+	text-wrap: none;
 }
 .text-action a, .text-action span {
 	background: #dddddd;
@@ -578,11 +580,13 @@ li.current-rating{
  	padding-left:2px;
 	padding-right:2px;
 	text-decoration: none;
+	text-wrap: none;
 }
 .text-action #pt_active {
 	background: #000000;
 	color: #ffffff;
 	border:1px solid #dddddd;
+	text-wrap: none; 
 }
 #nowplaying {
 	width:600px;
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index 31ec04fc..4270b99c 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -45,7 +45,7 @@ if (is_object($GLOBALS['playlist'])) { ?>
 <tr align="center">
 <td colspan="2">
 	<?php echo _('Playlist'); ?>: <input type="button" value="<?php echo _('Add to'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/playlist.php?action=add_to');" />
-	<?php  show_playlist_dropdown($_SESSION['data']['playlist_id']); ?>
+	<?php  show_playlist_select($_SESSION['data']['playlist_id']); ?>
 	<input class="button" type="button" value="<?php echo _('View'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/playlist.php?action=view');" />
 	<input class="button" type="button" value="<?php echo _('Edit'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/playlist.php?action=edit');" />
 </td>
diff --git a/templates/show_search.inc b/templates/show_search.inc
index e3e88e89..4a3a7dee 100644
--- a/templates/show_search.inc
+++ b/templates/show_search.inc
@@ -143,7 +143,7 @@
 <br />
 <form method="post" action="<?php echo conf('web_path'); ?>/playlist.php?action=add_dyn_song">
 <?php echo _('Save Search As Track on'); ?>:
-<?php show_playlist_dropdown($_SESSION['data']['playlist_id']); ?>
+<?php show_playlist_select($_SESSION['data']['playlist_id'],'dynamic'); ?>
 <input class="button" type="submit" value="<?php echo _('Save'); ?>" /></form>
 <?php } ?>
 <?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_tv_adminctl.inc.php b/templates/show_tv_adminctl.inc.php
index b9a624c1..7eaceebc 100644
--- a/templates/show_tv_adminctl.inc.php
+++ b/templates/show_tv_adminctl.inc.php
@@ -23,7 +23,7 @@
 <?php if (!$tmp_playlist->vote_active()) { ?>
 <form id="form_playlist" method="post" action="<?php echo conf('web_path'); ?>/tv.php" enctype="multipart/form-data" >
 <?php echo _('Base Playlist'); ?>:
-<?php show_playlist_dropdown(); ?>
+<?php show_playlist_select('','democratic'); ?>
 <input type="hidden" name="action" value="create_playlist" />
 <input type="submit" value="<?php echo _('Activate'); ?>" />
 </form>
@@ -44,7 +44,7 @@ else {
 <br />
 <?php echo _('Base Playlist'); ?>: 
 <form method="post" style="Display:inline;" action="<?php echo conf('web_path'); ?>/tv.php?action=update_playlist&amp;playlist_id=<?php echo $tmp_playlist->base_playlist; ?>" enctype="multipart/form-data">
-	<?php show_playlist_dropdown($tmp_playlist->base_playlist); ?>		
+	<?php show_playlist_select($tmp_playlist->base_playlist,'democratic'); ?>		
 	<input type="hidden" name="tmp_playlist_id" value="<?php echo $tmp_playlist->id; ?>" />
 	<input type="submit" value="<?php echo _('Update'); ?>" />
 </form>
diff --git a/templates/show_tv_playlist.inc.php b/templates/show_tv_playlist.inc.php
index 94bb1c7b..50bc7d11 100644
--- a/templates/show_tv_playlist.inc.php
+++ b/templates/show_tv_playlist.inc.php
@@ -43,6 +43,10 @@ else {
 	<td><?php echo _('Action'); ?></td>
 	<td><?php echo _('Votes'); ?></td>
 	<td><?php echo _('Song'); ?></td>
+	<td><?php echo _('Time'); ?></td>
+	<?php if ($GLOBALS['user']->has_access(100)) { ?>
+	<td><?php echo _('Admin'); ?></td>
+	<?php } ?>
 </tr>
 <?php 
 
@@ -60,7 +64,15 @@ foreach($songs as $row_id=>$song_id) {
 	<?php } ?>
 	</td>
 	<td><?php echo scrub_out($tmp_playlist->get_vote($row_id)); ?></td>
-	<td><?php echo scrub_out($song->title . ' / ' . $song->get_album_name()); ?></td>
+	<td><?php echo $song->f_link . " / " . $song->f_album_link . " / " . $song->f_artist_link; ?></td>
+	<td><?php echo $song->f_time; ?></td>
+	<?php if ($GLOBALS['user']->has_access(100)) { ?>
+	<td>
+		<span onclick="ajaxPut('<?php echo conf('ajax_url'); ?>?action=tv_admin&amp;cmd=delete&amp;track_id=<?php echo $song_id; ?><?php echo conf('ajax_info'); ?>')" />
+		<?php echo get_user_icon('delete'); ?>
+		</span>
+	</td>
+	<?php } ?>
 </tr>
 <?php 
 	} // end foreach 
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index ab7ec8f7..af3bc38b 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -193,7 +193,7 @@ $web_path = conf('web_path');
 		?>
 		<?php require_once(conf('prefix') . '/templates/show_playtype_switch.inc.php'); ?>
 	</li>
-<?php if ($GLOBALS['user']->prefs['play_type'] == 'democratic') { ?>
+<?php if (conf('allow_democratic_playback')) { ?>
 	<li>
 		<a href="<?php echo $web_path; ?>/tv.php"><?php echo _('Democratic View'); ?></a>
 	</li>