a ton of css fixes

17 files changed, 54 insertions, 68 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 0b341a7d..09d41618 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.3.3-Beta1 
+	- A ton of CSS cleanup (Thx apex)
 	- Fixed an issue with multi-value config options on test.php
 	- Changed default site_charset to UTF-8 in ampache.cfg.php.dist
 	- Fixed some <? in show_test.inc (Thx apex)
diff --git a/login.php b/login.php
index 2751f0f6..5f2e67fc 100644
--- a/login.php
+++ b/login.php
@@ -160,6 +160,7 @@ $htmllang = str_replace("_","-",conf('lang'));
 <link rel="stylesheet" href="templates/default.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="templates/print.css" type="text/css" media="print" />
 <link rel="stylesheet" href="templates/handheld.css" type="text/css" media="handheld" />
+<link rel="stylesheet" href="<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" media="screen" />
 <title> <?php echo conf('site_title'); ?> </title>
 <script type="text/javascript" language="javascript">
 function focus(){ document.login.username.focus(); }
diff --git a/templates/catalog.inc b/templates/catalog.inc
index 13639940..1ed89ce5 100644
--- a/templates/catalog.inc
+++ b/templates/catalog.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,7 +44,7 @@ $tools = array( _("Add a catalog") => $web_path . "/admin/catalog.php?action=sho
 	<td valign="top"><?php show_local_catalog_info(); ?></td>
 	<td valign="top">
 		<form name="catalog" method="post" action="<?php echo  $web_path; ?>/admin/catalog.php" enctype="multipart/form-data">
-		<table class="border" cellspacing="1" cellpadding="3">
+		<table class="tabledata" cellspacing="1" cellpadding="3">
 		<tr class="table-header" align="center">
 			<td colspan="4"><?php echo  _("Update Catalogs"); ?></td>
 		</tr>
diff --git a/templates/header.inc b/templates/header.inc
index f36c6115..2e11c5d1 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/templates/show_access_list.inc b/templates/show_access_list.inc
index 20dddab0..f709e33a 100644
--- a/templates/show_access_list.inc
+++ b/templates/show_access_list.inc
@@ -1,16 +1,12 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
- $CVSHeader: ampache/modules/class/song.php,v 1.7 2004/01/12 08:27:26 vollmerk Exp $
- $Source: /data/cvsroot/ampache/modules/class/song.php,v $
-
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +24,6 @@
 	@discussion default display for access admin page
 
 */
-$row_classes = array('even','odd');
 $web_path = conf('web_path');
 ?>
 <?php show_box_top(_('Host Access to Your Catalog')); ?>
@@ -45,7 +40,7 @@ stream from this server.</p>
 </span>
 </p>
 <?php if (count($list)) { ?>
-<table cellspacing="1" cellpadding="3" class="border">
+<table cellspacing="1" cellpadding="3" class="tabledata">
 <tr class="table-header" align="center">
 	<td><?php echo _('Name'); ?></td>
 	<td><?php echo _('Start Address'); ?></td>
@@ -60,7 +55,7 @@ stream from this server.</p>
 	/* Start foreach List Item */
 	foreach ($list as $access) { 
 ?>
-		<tr class="<?php echo $row_classes[0]; ?>">
+		<tr class="<?php echo flip_class(); ?>">
 			<td><?php echo scrub_out($access->name); ?></td>
 			<td><?php echo int2ip($access->start); ?></td>
 			<td><?php echo int2ip($access->end); ?></td>
@@ -74,7 +69,6 @@ stream from this server.</p>
 				<a href="<?php echo $web_path; ?>/admin/access.php?action=show_confirm_delete&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php print _("Revoke"); ?></a>
 			</td>
 		</tr>
-		<?php  $row_classes = array_reverse($row_classes); ?>
 	<?php  } // end foreach ?>
 </table>
 <?php  } // end if count ?>
diff --git a/templates/show_albums.inc b/templates/show_albums.inc
index e76d2b1a..17cf5496 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation. 
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,8 +27,8 @@ $web_path = conf('web_path');
 $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">
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header">
 	<td colspan="5">
 	<?php if ($view->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
 	</td>
diff --git a/templates/show_artist.inc b/templates/show_artist.inc
index 1521f728..b4b013dc 100644
--- a/templates/show_artist.inc
+++ b/templates/show_artist.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +27,7 @@ $web_path = conf('web_path');
 <!-- *** Multi-Album Art Display Thx MrBlahh Updated by clader *** -->
 <?php show_box_top(); ?>
 <form id="songs" method="post" enctype="multipart/form-data" action="artists.php">
-<table class="border" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
 <tr class="table-header">
 	<th align="center">
 	&nbsp;&nbsp;<a href="#" onclick="check_songs(); return false;"><?php echo _('Select'); ?></a>
diff --git a/templates/show_artists.inc b/templates/show_artists.inc
index 1163710c..32a2bf59 100644
--- a/templates/show_artists.inc
+++ b/templates/show_artists.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation. 
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,8 +29,8 @@ $web_path = conf('web_path');
 $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">
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header" align="center">
 	<td colspan="5">
 	<?php if ($GLOBALS['view']->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
 	</td>
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index 660b3772..4337c644 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -23,7 +23,7 @@
 $web_path = conf('web_path');
 
 ?>
-<table class="border" cellspacing="0" cellpadding="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr class="table-header">
 	<th><?php echo _('Object'); ?></th>
 	<th><?php echo _('Flag'); ?></th>
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 0fe68ace..176ad93b 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,8 +26,8 @@
 $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">
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header" align="center">
 	<td colspan="5">
 		<?php if ($view->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
 	</td>
diff --git a/templates/show_modules.inc.php b/templates/show_modules.inc.php
index 268393cc..19177b1c 100644
--- a/templates/show_modules.inc.php
+++ b/templates/show_modules.inc.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,7 +34,7 @@ $web_path = conf('web_path');
 
 <!-- Localplay Modules --> 
 <?php show_box_top(_('Localplay Modules')); ?>
-<table class="border" border="0" cellspacing="0">
+<table class="tabledata" border="0" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Module Name'); ?></th>
 	<th><?php echo _('Action'); ?></th>
@@ -66,7 +65,7 @@ foreach ($localplay_modules as $module) {
 
 <!-- Plugins --> 
 <?php show_box_top(_('Available Plugins')); ?>
-<table>
+<table class="tabledata">
 <tr class="table-header">
 	<td><?php echo _('Name'); ?></td>
 	<td><?php echo _('Description'); ?></td>
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php
index e09ce809..60dfee51 100644
--- a/templates/show_preference_box.inc.php
+++ b/templates/show_preference_box.inc.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,7 +34,7 @@ if ($GLOBALS['user']->has_access(100) AND conf('use_auth')) {
 ?>
 
 
-<table class="border" border="0" cellpadding="0" cellspacing="0" width="100%">
+<table class="tabledata" border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr class="odd">
 	<th colspan="3" class="header2" align="left"><?php echo $preferences['title']; ?></th>
 </tr>
diff --git a/templates/show_search.inc b/templates/show_search.inc
index 9984d835..e3e88e89 100644
--- a/templates/show_search.inc
+++ b/templates/show_search.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,6 +26,9 @@
 <?php show_box_top(_('Search Ampache') . "..."); ?>
 <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">
+	<td colspan="4">&nbsp;</td>
+</tr>
 <tr class="<?php echo flip_class(); ?>">
         <td><?php echo _('Keywords') ?></td>
         <td>
diff --git a/templates/show_similar_artists.inc b/templates/show_similar_artists.inc
index edc5c0e2..d48f5bf7 100644
--- a/templates/show_similar_artists.inc
+++ b/templates/show_similar_artists.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation. 
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,7 +23,7 @@ $web_path = conf('web_path');
 <?php show_box_top(_('Similar Artists')); ?>
 <form name="artists" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/artists.php?action=rename_similar&artist=<?php echo $artist_id;?>" style="Display:inline;">
 	<h3><?php _('Please check the artists you want to merge with the current one'); ?> (<span style='text-decoration: underline;'><?php echo $artist_name;?></span>)</h3>
-	<table class="border" cellspacing="0" cellpadding="0" border="0">
+	<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
 	<tr class="table-header">
 		<th>&nbsp;&nbsp;Select</th>
 		<th><?php echo _("Artist"); ?></th>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 0aca4c17..8e3c0247 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32,9 +31,9 @@ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $G
 ?>
 <?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">
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
 <?php if (is_object($GLOBALS['view'])) { ?>
-<tr class="even" align="center">
+<tr class="table-header" align="center">
         <td colspan="12">
         <?php if ($GLOBALS['view']->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
         </td>
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index 1c934493..634a8d19 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +19,7 @@
 
 */
 ?>
-<table>
+<table class="tabledata">
 <tr>
 	<td><?php echo _('Name'); ?>:</td>
 	<td>
diff --git a/templates/show_users.inc b/templates/show_users.inc
index 10ff4a18..f0c4997c 100644
--- a/templates/show_users.inc
+++ b/templates/show_users.inc
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,8 +29,8 @@ $admin_menu = "admin/";
 
 <?php show_box_top(); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0" border="0">
-<tr class="even" align="center">
-        <td colspan="8">
+<tr class="table-header" align="center">
+        <td colspan="11">
         <?php  if ($view->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
         </td>
 </tr>