to keep infamys eyes from bleeding

15 files changed, 117 insertions, 100 deletions

diff --git a/templates/default.css b/templates/default.css
index 54acfb37..d8fb9ccc 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -331,7 +331,7 @@ div#sidebar{
 }
 
 #np_container1{
-	width: 250px;
+	width: 260px;
 	height: 18px;
 	padding: 0px;
 	margin: 0px;
@@ -502,7 +502,11 @@ li.current-rating{
 /* Box Related Styles */
 .box { 
 	padding:0px;
-	background: #fff;
+	background: #f7f7f7;
+}
+.box #box-title { 
+	border-bottom: solid 1px; #000000;
+	font-weight: bold;
 }
 .box-left-top { 
 	background: url(../themes/classic/images/topleft.gif) no-repeat;
@@ -561,11 +565,9 @@ li.current-rating{
 	border:1px solid #dddddd;
 }
 #nowplaying {
-	background: #bbbbbb;
+	width:600px;
 }
 .np_row {
-	display:block;
-	background: #dddddd;
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
diff --git a/templates/show_album.inc b/templates/show_album.inc
index dfff023c..e2ef6838 100644
--- a/templates/show_album.inc
+++ b/templates/show_album.inc
@@ -32,18 +32,10 @@ $row_classes = array('even','odd');
 $album_id	= $album->id;
 $artist_id	= $album->artist_id;
 $username	= $GLOBALS['user']->username;
-
+$title		= scrub_out($album->name) . ' -- ' . $album->f_artist; 
 ?>
-<br />
-<table class="border" cellspacing="1" cellpadding="3" border="0">
-<tr class="table-header">
-	<td colspan="2">
-		<font size="+1"><?php echo scrub_out($album->name); ?> -- 
-		<?php echo $album->f_artist; ?></font>
-	</td>
-</tr>
-<tr class="even">
-	<td width="140" align="center">
+<?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?>
+	<div style="display:table-cell;width:140px;">
 	<?php 
         if ($album_name != "Unknown (Orphaned)") {
 		$aa_url = $web_path . "/albumart.php?id=" . $album->id . "&amp;type=popup";
@@ -52,13 +44,13 @@ $username	= $GLOBALS['user']->username;
 		echo "</a>\n";
         }
 	?>
-	</td>
-	<td valign="top">
+	</div>
+	<div style="display:table-cell;vertical-align:top;">
 		<?php
 		if (conf('ratings')) {	show_rating($album->id, 'album');} // end if ratings
 		echo "<br />\n";
 		?>
-		<b>Actions:</b><br />
+		<strong><?php echo _('Actions'); ?>:</strong><br />
 		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $album->id; ?>"><?php echo  _("Play Album"); ; ?></a><br />
 		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=album_random&amp;album_id=<?php echo  $album->id; ; ?>"><?php echo  _("Play Random from Album"); ; ?></a><br />
 		<?php if ( ($GLOBALS['user']->has_access('75')) || (!conf('use_auth'))) { ?>
@@ -71,7 +63,5 @@ $username	= $GLOBALS['user']->username;
 		<?php if (batch_ok()) { ?>
 		&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo  $album->id; ; ?>"><?php echo _('Download'); ?></a><br />
 		<?php } ?>
-	</td>
-</tr>
-</table>
-<br />
+	</div>
+<?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_albums.inc b/templates/show_albums.inc
index 99aa8e48..c768def5 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc
@@ -27,6 +27,7 @@ $web_path = conf('web_path');
 // Build array of the table classes we are using
 $total_items = $view->total_items;
 ?>
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <tr class="even" align="center">
 	<td colspan="5">
@@ -84,4 +85,4 @@ foreach ($albums as $album) {
 	</td>
 </tr>
 </table>
-<br />
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_artist.inc b/templates/show_artist.inc
index 0048c84e..64e00a5a 100644
--- a/templates/show_artist.inc
+++ b/templates/show_artist.inc
@@ -29,7 +29,7 @@ $web_path = conf('web_path');
 <br />
 <?php require (conf('prefix') . '/templates/show_artist_box.inc.php'); ?>
 <!-- *** Multi-Album Art Display Thx MrBlahh Updated by clader *** -->
-<br />
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <form id="songs" method="post" enctype="multipart/form-data" action="artists.php">
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <tr class="table-header">
@@ -77,4 +77,4 @@ foreach ($albums as $album) {
 <input type="hidden" name="type" value="album" />
 <input type="hidden" name="artist_id" value="<?php echo $artist_id; ?>" />
 </form>
-
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_artist_box.inc.php b/templates/show_artist_box.inc.php
index 8ed59615..5dd31a9f 100644
--- a/templates/show_artist_box.inc.php
+++ b/templates/show_artist_box.inc.php
@@ -20,18 +20,18 @@
 
 */ 
 $web_path = conf('web_path');
+$title = _('Albums by') . " " . $artist->full_name; 
 ?>
-<div class="text-box">
-		<span class="header1"><?php echo _('Albums by') . " " . $artist->full_name; ?></span>
-		<br /><?php if (conf('ratings')) { show_rating($artist->id, 'artist'); } // end if ratings ?>
-		<ul class="text-action">
-			<li><a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a></li>
-			<li><a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist_id; ?>"><?php echo _("Play All Songs By") . " " . $artist->full_name; ?></a></li>
-			<li><a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist_id; ?>"><?php echo _("Play Random Songs By") . " " . $artist->full_name; ?></a></li>
-			<?php  if ($GLOBALS['user']->has_access('100')) { ?>
-				<li><a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Update from tags"); ?></a></li>
-				<li><a href="<?php echo $web_path; ?>/artists.php?action=show_rename&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a></li>
-				<li><a href="<?php echo $web_path; ?>/artists.php?action=show_similar&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Find duplicate artists"); ?></a></li>
-			<?php } ?>
-		</ul>
-</div>
+<?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?>
+<?php if (conf('ratings')) { show_rating($artist->id, 'artist'); } // end if ratings ?>
+<strong><?php echo _('Actions'); ?>:</strong><br />
+&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a><br />
+&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist_id; ?>"><?php echo _("Play All Songs By") . " " . $artist->full_name; ?></a><br />
+&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist_id; ?>"><?php echo _("Play Random Songs By") . " " . $artist->full_name; ?></a><br />
+<?php  if ($GLOBALS['user']->has_access('100')) { ?>
+	&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Update from tags"); ?></a><br />
+	&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/artists.php?action=show_rename&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a><br />
+	&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/artists.php?action=show_similar&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Find duplicate artists"); ?></a><br />
+<?php } ?>
+<?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
+<?php unset($title); ?>
diff --git a/templates/show_artists.inc b/templates/show_artists.inc
index 074bdf5a..1163710c 100644
--- a/templates/show_artists.inc
+++ b/templates/show_artists.inc
@@ -29,6 +29,7 @@ $web_path = conf('web_path');
 // Build array of the table classes we are using
 $total_items = $view->total_items;
 ?>
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <tr class="even" align="center">
 	<td colspan="5">
@@ -72,4 +73,4 @@ foreach ($artists as $artist) { ?>
 	</td>
 </tr>
 </table>
-
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_box.inc.php b/templates/show_box.inc.php
index 6bff9378..3e74d9b5 100644
--- a/templates/show_box.inc.php
+++ b/templates/show_box.inc.php
@@ -20,19 +20,7 @@
 
 */
 ?>
-<table class="box" cellspacing="0" cellpadding="0">
-<tr>
-	<td class="box-left-top"></td>
-	<td class="box-top"></td>
-	<td class="box-right-top"></td>
-</tr>
-<tr>
-	<td class="box-left" rowspan="2"></td>
-	<td><?php echo $title; ?></td>
-	<td class="box-right" rowspan="2"></td>
-</tr>
-<tr>
-	<td>
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 	<ol>
 	<?php
 		foreach ($items as $item) {
@@ -40,11 +28,4 @@
 		}
 	?>
 	</ol>
-	</td>
-</tr>
-<tr>
-        <td class="box-left-bottom"></td>
-        <td class="box-bottom"></td>
-        <td class="box-right-bottom"></td>
-</tr>
-</table>
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/tool_box.inc b/templates/show_box_bottom.inc.php
index acf4ce2e..f0c050f3 100644
--- a/templates/tool_box.inc
+++ b/templates/show_box_bottom.inc.php
@@ -19,30 +19,12 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*!
- @header
- A template file
-
-*/
-
 ?>
-
-<table class="box">
-<tr class="box-top">
-        <td class="box-left-top"></td>
-        <td class="box-center-top"></td>
-        <td class="box-right-top"></td>
-</tr>
-<tr class="table-header" align="center">
-	<th><?php echo $title; ?></th>
+	</td>
 </tr>
 <tr>
-	<td>
-	<?php
-	foreach (array_keys($items) as $item) {
-		print("\t\t\t&gt;&gt; <a href=\"$items[$item]\"> $item</a><br />\n");
-	}
-	?>
-	</td>
+        <td class="box-left-bottom"></td>
+        <td class="box-bottom"></td>
+        <td class="box-right-bottom"></td>
 </tr>
 </table>
diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php
new file mode 100644
index 00000000..26aa1fa2
--- /dev/null
+++ b/templates/show_box_top.inc.php
@@ -0,0 +1,39 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+<table class="box" cellspacing="0" cellpadding="0">
+<tr>
+	<td class="box-left-top"></td>
+	<td class="box-top"></td>
+	<td class="box-right-top"></td>
+</tr>
+<tr>
+	<td class="box-left" rowspan="2"></td>
+<?php if ($title) { ?>
+	<td id="box-title"><?php echo $title; ?></td>
+<?php } else { ?>
+	<td></td>
+<?php } ?>
+	<td class="box-right" rowspan="2"></td>
+</tr>
+<tr>
+	<td style="padding-top:3px;">
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 3f857776..0fe68ace 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -26,6 +26,7 @@
  */
 $total_items = $view->total_items;
 ?>
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <tr class="even" align="center">
 	<td colspan="5">
@@ -59,3 +60,4 @@ foreach ($genres as $genre) {
 	</td>
 </tr>
 </table>
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_now_playing.inc b/templates/show_now_playing.inc
index 27b903a5..77f68dea 100644
--- a/templates/show_now_playing.inc
+++ b/templates/show_now_playing.inc
@@ -29,9 +29,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 if (count($results)) {
 ?>
-		<div id="np_title">
-			<h1><?php echo _('Now Playing'); ?></h1>
-		</div>
+<table class="box" cellspacing="0" cellpadding="0">
+<tr>
+        <td class="box-left-top"></td>
+        <td class="box-top"></td>
+        <td class="box-right-top"></td>
+</tr>
+<tr>
+        <td class="box-left" rowspan="2"></td>
+        <td id="box-title"><?php echo _('Now Playing'); ?></td>
+        <td class="box-right" rowspan="2"></td>
+</tr>
+<tr><td style="padding-top:3px;">
 <?php 
 foreach ($results as $item) {
 	$song = $item['song'];
@@ -45,4 +54,11 @@ foreach ($results as $item) {
 
 } // end foreach
 ?>
+</td></tr>
+<tr>
+        <td class="box-left-bottom"></td>
+        <td class="box-bottom"></td>
+        <td class="box-right-bottom"></td>
+</tr>
+</table>
 <?php } // end if count results ?>
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index a02b59c6..db12a240 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -20,14 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 ?>
-<div class="np_row">
-	<div class="np_cell"><?php echo scrub_out($np_user->fullname); ?></div>
-	<div class="np_cell">
+<span class="np_row">
+	<span class="np_cell"><?php echo scrub_out($np_user->fullname); ?></div>
+	<span class="np_cell">
 	<a title="<?php echo scrub_out($song->f_title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
 		<?php echo scrub_out($song->f_title); ?>
 	</a>
 	</div>
-	<div class="np_cell">
+	<span class="np_cell">
 	<a title="<?php echo scrub_out($song->f_album); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
 		<?php echo scrub_out($song->f_album); ?></a> /
 	<a title="<?php echo scrub_out($song->f_artist); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
@@ -35,9 +35,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	</a>
 	</div>
 	<?php if (conf('play_album_art')) { ?>
-	<div class="np_cell">
+	<span class="np_cell">
 	<a target="_blank" href="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;type=popup" onclick="popup_art('<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;type=popup'); return false;">
 	<img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;fast=1&amp;thumb=1" alt="Album Art" height="75" /></a>
 	</div>
 	<?php } // end play album art ?>
-</div>
+</span>
diff --git a/templates/show_search.inc b/templates/show_search.inc
index ae1c2efd..393a6c24 100644
--- a/templates/show_search.inc
+++ b/templates/show_search.inc
@@ -24,7 +24,7 @@
  * This is the template for the searches... amazing!
  */
 ?>
-
+<?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <form name="search" method="post" action="<?php echo  conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
 <table class="tabledata" cellspacing="0" cellpadding="3" border="0">
 <tr class="table-header">
@@ -147,5 +147,4 @@
 <?php show_playlist_dropdown('', true); ?>
 <input class="button" type="submit" value="<?php echo _('Save'); ?>" /></form>
 <?php } ?>
-<br />
-
+<?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 09ebc31a..50c918d4 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -27,7 +27,10 @@ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $G
 	$playlist_owner = true;
 }
 
+// Title of this page
+
 ?>
+<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <form id="songs" method="post" enctype="multipart/form-data" action="#" style="Display:inline;">
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <?php if (is_object($GLOBALS['view'])) { ?>
@@ -179,4 +182,5 @@ $num = count($song_ids);
 <br />
 <?php show_play_selected(); ?>
 </form>
+<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
 
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 5f5fdde1..e11e1b63 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -155,7 +155,7 @@ switch ($location['page']) {
 <?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?> 
 	<li>
 		<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/song.php?action=random&amp;method=stream" style="Display:inline">
-		<select name="random" style="width:9em;">
+		<select name="random" style="width:8.7em;">
 			<option value="1">1</option>
 			<option value="5" selected="selected">5</option>
 			<option value="10">10</option>
@@ -167,9 +167,9 @@ switch ($location['page']) {
 			<option value="1000">1000</option>
 			<option value="-1"><?php echo _("All"); ?></option>
 		</select>
-		<?php show_genre_pulldown('genre','','','13','width:9em;'); ?>
+		<?php show_genre_pulldown('genre','','','13','width:8.7em;'); ?>
 					<br />  
-		<select name="random_type" style="width:9em;">
+		<select name="random_type" style="width:8.7em;">
 			<option value="Songs"><?php echo _("Songs"); ?></option>
 			<option value="Minutes"><?php echo _("Minutes"); ?></option>
 			<option value="Artists"><?php echo _("Artists"); ?></option>
@@ -177,7 +177,7 @@ switch ($location['page']) {
 			<option value="Less Played"><?php echo _("Less Played"); ?></option>
 		</select>
 		<br /> 
-		<?php show_catalog_pulldown('catalog','width:9em;'); ?>
+		<?php show_catalog_pulldown('catalog','width:8.7em;'); ?>
 		<br />
 		<input class="smallbutton" type="submit" value="<?php echo _('Enqueue'); ?>" />
 		</form>