* Updated CSS to improve compatibiliy and make appearance more consistant (Thx Spocky)

* Fixed some issues with the Amazon Album art gathering created when I re-wrote it

1 files changed, 35 insertions, 35 deletions

diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 553514b5..06962c10 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -22,20 +22,20 @@
 /**
  * This is kind of the wrong place to do this, but let's define the different submenu's that could possibly be 
  * displayed on this page, this calls the show_submenu($items); function which takes an array of items
- * that have ['title'] ['url'] and ['active'] url assumes no conf('web_path')
+ * that have ['title'] ['url'] ['active'] and ['cssclass'] url assumes no conf('web_path')
  */
 
-$admin_items[] = array('title'=>_('Users'),'url'=>'admin/users.php','active'=>$location['page']);
-$admin_items[] = array('title'=>_('Mail Users'),'url'=>'admin/mail.php','active'=>$location['page']);
-$admin_items[] = array('title'=>_('Catalog'),'url'=>'admin/index.php','active'=>$location['page']);
-$admin_items[] = array('title'=>_('Config'),'url'=>'admin/preferences.php','active'=>$location['page']);
-$admin_items[] = array('title'=>_('Access List'),'url'=>'admin/access.php','active'=>$location['page']);
+$admin_items[] = array('title'=>_('Users'),'url'=>'admin/users.php','active'=>$location['page'], 'cssclass'=>'sidebar_admin_users');
+$admin_items[] = array('title'=>_('Mail Users'),'url'=>'admin/mail.php','active'=>$location['page'], 'cssclass'=>'sidebar_admin_mail_users');
+$admin_items[] = array('title'=>_('Catalog'),'url'=>'admin/index.php','active'=>$location['page'], 'cssclass'=>'sidebar_admin_catalog');
+$admin_items[] = array('title'=>_('Config'),'url'=>'admin/preferences.php','active'=>$location['page'], 'cssclass'=>'sidebar_admin_config');
+$admin_items[] = array('title'=>_('Access List'),'url'=>'admin/access.php','active'=>$location['page'], 'cssclass'=>'sidebar_admin_access_list');
 
-$browse_items[] = array('title'=>_("Albums"),'url'=>'albums.php','active'=>$location['page']);
-$browse_items[] = array('title'=>_("Artists"),'url'=>'artists.php','active'=>$location['page']);
-$browse_items[] = array('title'=>_("Genre"),'url'=>'browse.php?action=genre','active'=>$location['page']);
-$browse_items[] = array('title'=>_('Song Title'),'url'=>'browse.php?action=song_title','active'=>$location['page']);
-$browse_items[] = array('title'=>_("Lists"),'url'=>'browse.php','active'=>$location['page']);
+$browse_items[] = array('title'=>_("Albums"),'url'=>'albums.php','active'=>$location['page'], 'cssclass'=>'sidebar_browse_albums');
+$browse_items[] = array('title'=>_("Artists"),'url'=>'artists.php','active'=>$location['page'], 'cssclass'=>'sidebar_browse_artists');
+$browse_items[] = array('title'=>_("Genre"),'url'=>'browse.php?action=genre','active'=>$location['page'], 'cssclass'=>'sidebar_browse_genre');
+$browse_items[] = array('title'=>_('Song Title'),'url'=>'browse.php?action=song_title','active'=>$location['page'], 'cssclass'=>'sidebar_browse_song_title');
+$browse_items[] = array('title'=>_("Lists"),'url'=>'browse.php','active'=>$location['page'], 'cssclass'=>'sidebar_browse_lists');
 //$browse_items[] = array('title'=>'File','url'=>'files.php','active'=>''); <!--pb1dft: this can be cleaned up -->
 
 $web_path = conf('web_path');
@@ -43,21 +43,21 @@ $web_path = conf('web_path');
 ?>
 <h3>&nbsp;</h3>
 <ul id="navlist">
-	<li<?php
+	<li id="sidebar_home"<?php
                 if ($location['page'] == "index.php"){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/index.php"><?php echo _('Home'); ?></a>
 	</li>
 <?php if ($GLOBALS['user']->has_access(100)) { ?>
-	<li<?php
+	<li id="sidebar_admin"<?php
                 if ($location['page'] == 'admin/index.php' ||
                     $location['page'] == 'admin/users.php' ||
                     $location['page'] == 'admin/mail.php' ||
                     $location['page'] == 'admin/catalog.php' ||
                     $location['page'] == 'admin/preferences.php' ||
                     $location['page'] == 'admin/access.php' ){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/admin/index.php"><?php echo _('Admin'); ?></a>
 	<?php
@@ -74,17 +74,17 @@ $web_path = conf('web_path');
 } // end if access 
 	?>
 	
-	<li<?php
+	<li id="sidebar_prefs"<?php
                 if ($location['page'] == "preferences.php" ){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/preferences.php"><?php echo _('Preferences'); ?></a>
 	</li>
-	<li<?php
+	<li id="sidebar_browse"<?php
                 if ($location['page'] == "browse.php" ||
                     $location['page'] == "artists.php" ||
                     $location['page'] == "albums.php" ){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/browse.php"><?php echo _('Browse'); ?></a> 
 		<?php 
@@ -99,26 +99,26 @@ $web_path = conf('web_path');
 			}
 		}
 		?>
-	<li<?php
+	<li id="sidebar_plists"<?php
                 if ($location['page'] == "playlist.php"){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/playlist.php"><?php echo _('Playlists'); ?></a>
 	</li>
-	<li<?php
+	<li id="sidebar_stats"<?php
                 if ($location['page'] == "stats.php"){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a>
 	</li>
-	<li<?php
+	<li id="sidebar_search"<?php
                 if ($location['page'] == "search.php"){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/search.php"><?php echo _('Search'); ?></a>
 	</li>
 <?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?>
-	<li>
+	<li id="sidebar_subsearch">
 		<form name="sub_search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline">
 		<input type="text" name="search_string" value="" size="5" />
 		<input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" /> 
@@ -128,16 +128,16 @@ $web_path = conf('web_path');
 		</form>
 	</li>
 <?php } // end if ($GLOBALS['theme']['orientation'] != 'horizontal')?>
-	<li<?php
+	<li id="sidebar_random"<?php
                 if ($location['page'] == "randomplay.php"){
-                    echo " id=\"activetopmenu\" ";
+                    echo " class=\"activetopmenu\" ";
                     }?>>
 		<a href="<?php echo $web_path; ?>/randomplay.php"><?php echo _('Random'); ?></a>
 	</li>
 <?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?> 
 	<li id="sidebar_form">
 		<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:8.7em;">
+		<select name="random" >
 			<option value="1">1</option>
 			<option value="5" selected="selected">5</option>
 			<option value="10">10</option>
@@ -149,9 +149,9 @@ $web_path = conf('web_path');
 			<option value="1000">1000</option>
 			<option value="-1"><?php echo _('All'); ?></option>
 		</select>
-		<?php show_genre_pulldown('genre','','','13','width:8.7em;'); ?>
+		<?php show_genre_pulldown('genre','','','13',''); ?>
 					<br />  
-		<select name="random_type" style="width:8.7em;">
+		<select name="random_type" >
 			<option value="Songs"><?php echo _('Songs'); ?></option>
 			<option value="length"><?php echo _('Minutes'); ?></option>
 			<option value="full_artist"><?php echo _('Artists'); ?></option>
@@ -159,18 +159,18 @@ $web_path = conf('web_path');
 			<option value="unplayed"><?php echo _('Less Played'); ?></option>
 		</select>
 		<br /> 
-		<?php show_catalog_pulldown('catalog','width:8.7em;'); ?>
+		<?php show_catalog_pulldown('catalog',''); ?>
 		<br />
 		<input class="smallbutton" type="submit" value="<?php echo _('Enqueue'); ?>" />
 		</form>
 	</li>
 <?php } // end if ($GLOBALS['theme']['orientation'] != 'horizontal') ?> 
 <?php if ($GLOBALS['user']->prefs['localplay_level'] > 0) { ?>
-	<li>
+	<li id="sidebar_localplay">
 		<a href="<?php echo $web_path; ?>/localplay.php"><?php echo _('Localplay'); ?></a>
 	</li>
 <?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?>
-	<li>
+	<li id="sidebar_localplay_ctrl">
 		<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
 	</li>
 <?php } // if horizontal orientation ?>
@@ -188,6 +188,6 @@ $web_path = conf('web_path');
 	</li>
 <?php } // if democratic play ?>
 <?php if (conf('use_auth')) { ?>
-	<li><a href="<?php echo $web_path; ?>/logout.php"><?php echo _('Logout'); ?></a></li>
+	<li id="sidebar_logout"><a href="<?php echo $web_path; ?>/logout.php"><?php echo _('Logout'); ?></a></li>
 <?php } // end (conf('use_auth'))?>
 </ul>