fixed the 0 rating hover and removed some redudent definitions from the stylesheet

6 files changed, 45 insertions, 40 deletions

diff --git a/lib/themes.php b/lib/themes.php
index aac16330..3c89a00a 100644
--- a/lib/themes.php
+++ b/lib/themes.php
@@ -75,8 +75,6 @@ function get_theme($name) {
 */
 function set_theme_colors($theme_name,$user_id) { 
 
-	
-
 	if (make_bool($user_id)) { 
 		$user_sql = "`user`='$user_id' AND";
 	}
@@ -87,18 +85,20 @@ function set_theme_colors($theme_name,$user_id) {
 	*/
 	$theme = get_theme($theme_name);	
 	$GLOBALS['theme'] = $theme;
-	if (!count($theme['color'])) { return false; }
+	if (!count($theme)) { return false; }
 
-	foreach ($theme['color'] as $key=>$color) { 
+	foreach ($theme as $key=>$color) { 
 
 		$sql = "SELECT id FROM preferences WHERE name='" . sql_escape($key) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 		$results = mysql_fetch_array($db_results);
-
-		$sql = "UPDATE user_preference SET `value`='" . sql_escape($color) . "' WHERE $user_sql " . 
-			" preference='" . $results[0] . "'";
-		$db_results = mysql_query($sql, dbh());
+		// Quick hack this needs to be fixed
+		if ($results) { 
+			$sql = "UPDATE user_preference SET `value`='" . sql_escape($color) . "' WHERE $user_sql " . 
+				" preference='" . $results[0] . "'";
+			$db_results = mysql_query($sql, dbh());
+		}
 
 	} // theme colors
 
diff --git a/templates/menustyle.inc b/templates/menustyle.inc
index aa4fa5b7..3207b01b 100644
--- a/templates/menustyle.inc
+++ b/templates/menustyle.inc
@@ -157,43 +157,49 @@
                z-index: 2;
                left: 0px;
        }
-       .star-rating a.zero-stars {
+       li.zero-stars a:hover { 
+       		background: url(<?Php echo conf('web_path'); ?>/images/ratings/x.gif);
+		height: 15px;
+		left: 80px;
+		display: block;
+	}
+       a.zero-stars {
 	       background: url(<?php echo conf('web_path'); ?>/images/ratings/x_off.gif);
-	       position: absolute;
 	       height: 15px;
+	       left: 80px;
 	       display: block;
 	}
-       .star-rating a.one-stars{
+       a.one-stars{
                left: 0px;
        }
-       .star-rating a.one-stars:hover{
+       a.one-stars:hover{
                width:16px;
        }
-       .star-rating a.two-stars{
+       a.two-stars{
                left:16px;
        }
-       .star-rating a.two-stars:hover{
+       a.two-stars:hover{
                width: 32px;
        }
-       .star-rating a.three-stars{
+       a.three-stars{
                left: 32px;
        }
-       .star-rating a.three-stars:hover{
+       a.three-stars:hover{
                width: 48px;
        }
-       .star-rating a.four-stars{
+       a.four-stars{
                left: 48px;
        }       
-       .star-rating a.four-stars:hover{
+       a.four-stars:hover{
                width: 64px;
        }
-       .star-rating a.five-stars{
+       a.five-stars{
                left: 64px;
        }
-       .star-rating a.five-stars:hover{
+       a.five-stars:hover{
                width: 80px;
        }
-       .star-rating li.current-rating{
+       li.current-rating{
                background: url(<?php echo conf('web_path'); ?>/images/ratings/star_rating.gif) left bottom;
                position: absolute;
                height: 15px;
diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index a440d919..ef2aafea 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -31,10 +31,10 @@ echo "<ul class=\"star-rating\">\n";
 
 /* Handle the "Not rated" possibility */
 if ($rating->rating == '-1') { 
-	echo "<li><a href=\"" . $base_url . "&amp;rating=-1\" title=\"don't play\" class=\"zero-stars\">-1</a></li>\n";
+	echo "<li class=\"zero-stars\"><a href=\"" . $base_url . "&amp;rating=-1\" title=\"don't play\" class=\"zero-stars\">-1</a></li>\n";
 }
 else { 
-	echo "<li><a href=\"" . $base_url . "&amp;rating=-1\" title=\"remove rating\" class=\"zero-stars\">-1</a></li>\n";
+	echo "<li class=\"zero-stars\"><a href=\"" . $base_url . "&amp;rating=-1\" title=\"remove rating\" class=\"zero-stars\">-1</a></li>\n";
 }
 // decide width of rating. image is 16 px wide
 $width = $rating->rating*16;
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 5a474b0e..f3dfa9a1 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -45,7 +45,7 @@ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $G
 	<th><?php echo _("Genre"); ?></th>
 	<th><?php echo _("Action"); ?></th>
 	<?php if (conf('ratings') || conf('ratings')=="false") { ?>
-		<th><?php echo _("Rating"); ?></th>
+		<th width="90px"><?php echo _("Rating"); ?></th>
 	<? } ?>            
 </tr>
 <?php
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index ed2111bc..b939c7eb 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -26,17 +26,17 @@
  * that have ['title'] ['url'] and ['active'] url assumes no conf('web_path')
  */
 
-$admin_items[] = array('title'=>_("Users"),'url'=>'admin/users.php','active'=>'');
-$admin_items[] = array('title'=>_("Mail Users"),'url'=>'admin/mail.php','active'=>'');
-$admin_items[] = array('title'=>_("Catalog"),'url'=>'admin/catalog.php','active'=>'');
-$admin_items[] = array('title'=>_("Site Preferences"),'url'=>'admin/preferences.php','active'=>'');
-$admin_items[] = array('title'=>_("Access List"),'url'=>'admin/access.php','active'=>'');
+$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/catalog.php','active'=>$location['page']);
+$admin_items[] = array('title'=>_("Site Preferences"),'url'=>'admin/preferences.php','active'=>$location['page']);
+$admin_items[] = array('title'=>_("Access List"),'url'=>'admin/access.php','active'=>$location['page']);
 
-$browse_items[] = array('title'=>_("Albums"),'url'=>'albums.php','active'=>'');
-$browse_items[] = array('title'=>_("Artists"),'url'=>'artists.php','active'=>'');
-$browse_items[] = array('title'=>_("Genre"),'url'=>'browse.php?action=genre','active'=>'');
-$browse_items[] = array('title'=>_("Lists"),'url'=>'browse.php','active'=>'');
-//$browse_items[] = array('title'=>'File','url'=>'files.php','active'=>'');
+$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'=>_("Lists"),'url'=>'browse.php','active'=>$location['page']);
+//$browse_items[] = array('title'=>'File','url'=>'files.php','active'=>''); <!--pb1dft: this can be cleaned up -->
 
 $web_path = conf('web_path');
 ?>
@@ -46,7 +46,7 @@ $web_path = conf('web_path');
                 if ($location['page'] == "index.php"){
                     echo " id=\"activetopmenu\" ";
                     }?>>
-		<a href="<?php echo $web_path; ?>/index.php" id="current"><?php echo _("Home"); ?></a>
+		<a href="<?php echo $web_path; ?>/index.php"><?php echo _("Home"); ?></a>
 	</li>
 <?php if ($GLOBALS['user']->has_access(100)) { ?>
 	<li<?php
diff --git a/templates/subnavbar.inc.php b/templates/subnavbar.inc.php
index 2f36704d..552f17c2 100644
--- a/templates/subnavbar.inc.php
+++ b/templates/subnavbar.inc.php
@@ -29,10 +29,9 @@
 <ul class="subnavside">
 <?php 
 	foreach ($items as $item) { 
-		if ($item['active']) { 
-			$li_id 	= "id=\"subactive\"";
-			$a_id	= "id=\"subcurrent\"";
+		if ($item['url'] == $item['active']) { 
+			$li_id 	= "id=\"activesubmenu\"";
 		} ?>
-		<li <?php echo $li_id; ?>><a href="<?php echo conf('web_path') . "/" .  $item['url']; ?>" <?php echo $a_id; ?>><?php echo $item['title']; ?></a></li>
-	<?php unset($li_id,$a_id); } // END foreach ($items as $item) ?>
+		<li <?php echo $li_id; ?>><a href="<?php echo conf('web_path') . "/" .  $item['url']; ?>"><?php echo $item['title']; ?></a></li>
+	<?php unset($li_id); } // END foreach ($items as $item) ?>
 </ul>