From 7b1e57d0ccdda52881645f7c16f42ceb5da15881 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 9 Apr 2006 04:28:56 +0000
Subject: fixed playlist add problem and a few other minor bugs

---
 templates/header.inc         |  5 -----
 templates/show_localplay.inc | 46 ++------------------------------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

(limited to 'templates')

diff --git a/templates/header.inc b/templates/header.inc
index b2839fec..a6928b2b 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -47,14 +47,9 @@ if (conf('use_rss')) { ?>
 		</a>
 		</div><!--End topbarleft -->
 		<div id="topbarright">
-		<?php if (($user->prefs['play_type']=='mpd') && ($location['page'] != 'mpd.php')) { 
-			$myMpd = init_mpd();
-			show_template ('show_mpdminicontrol');
-		} else { ?>
 			<a href="http://www.ampache.org/index.php">Ampache v.<?php echo conf('version'); ?></a><br />
 			<b><?php echo _("You are currently logged in as") . " " . $GLOBALS['user']->fullname; ?></b>
 			<br />
-		<?php } ?>
 		</div> <!-- End topbarright -->
 	</div><!-- End topbar -->
 	<div id="sidebar"><!-- This is the sidebar -->
diff --git a/templates/show_localplay.inc b/templates/show_localplay.inc
index 936f6090..ece7ecde 100644
--- a/templates/show_localplay.inc
+++ b/templates/show_localplay.inc
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -20,48 +20,6 @@
 
 */
 
-/*!
-	@header Show localplay form
-*/
 $web_path = conf('web_path'); 
+
 ?>
-<table class="border" cellspacing="1" cellpadding="3" width="100%" border="0"><!--Localplay Table-->
-<tr class="table-header">
-	<td colspan="2"><?php echo _("Local Play Control"); ?></td>
-</tr>
-<tr class="even">
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0"><!--Localplayer Table-->
-		<tr>
-			<td><?php echo _("Playback") . ":"; ?></td>
-			<td>
-				<form action="<?php echo $web_path; ?>/localplay.php" method="post" name="playcontrol" style="display:inline;">
-					<input type="submit" title="<?php echo _("Prev"); ?>" name="submit" value="|&lt; " />
-					<input type="submit" title="<?php echo _("Stop"); ?>" name="submit" value=" X " />
-					<input type="submit" title="<?php echo _("Play"); ?>" name="submit" value=" &gt; " />
-					<input type="submit" title="<?php echo _("Pause"); ?>" name="submit" value=" = " />
-					<input type="submit" title="<?php echo _("Next"); ?>" name="submit" value=" &gt;|" />
-				</form>
-			</td>
-		</tr>
-		<tr class="even">
-			<td><?php echo _("Volume") . ":"; ?></td>
-			<td>
-				<form action="<?php echo $web_path; ?>/localplay.php" method="post" name="playcontrol" style="display:inline;">
-					<input type="submit" title="<?php echo _("Increase Volume"); ?>" name="submit" value=" +1 " />
-					<input type="submit" title="<?php echo _("Increase Volume"); ?>" name="submit" value=" +5 " />
-					<input type="submit" title="<?php echo _("Decrease Volume"); ?>" name="submit" value=" -1 " /> 
-					<input type="submit" title="<?php echo _("Decrease Volume"); ?>" name="submit" value=" -5 " />
-				</form>
-			</td>
-		</tr>
-		<tr class="even">
-			<td colspan="2">
-				<a href="<?php echo $web_path; ?>/localplay.php?submit=clear"><?php echo _("Clear queue"); ?></a><br />
-				<?php  @system(conf('localplay_status')) ?>
-			</td>
-		</tr>
-		</table><!--End Localplayer Table-->
-	</td>
-</tr>
-</table><!--End Localplay Table-->
-- 
cgit