From 5414825a71213e9643785492c54cb5288699a67b Mon Sep 17 00:00:00 2001
From: xgizzmo <xgizzmo@ampache>
Date: Tue, 27 Dec 2005 02:06:38 +0000
Subject: Fixed style.inc to pass w3c css test, And menu code tweakage

---
 templates/sidebar.inc.php   | 9 ++++++---
 templates/style.inc         | 4 ++--
 templates/subnavbar.inc.php | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 79a62283..38901424 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -61,6 +61,7 @@ $browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
 		
 		} // end if access 
 		?>
+		
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/preferences.php"><?php echo _("Preferences"); ?></a>
 		</li>
@@ -78,6 +79,7 @@ $browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
 				}
 			}
 		?>
+		
 		<?php if ($GLOBALS['user']->prefs['upload']) { ?>
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/upload.php"><?php echo _("Upload"); ?></a>
@@ -93,8 +95,9 @@ $browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
 		<?php } ?>
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/search.php"><?php echo _("Search"); ?></a>
+		</li>
 	<?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?>
-	<li>
+		<li>
 			<form name="sub_search" method="post" action="<?php echo conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
 			<input type="text" name="search_string" value="<?php echo scrub_out($_REQUEST['search_string']); ?>" size="5" />
         	        <input class="smallbutton" type="submit" value="<?php echo _("Search"); ?>" /> 
@@ -110,7 +113,7 @@ $browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
 		</li>
 	<?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?> 
 		<li>
-			<form name="random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php" style="Display:inline">
+			<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php" style="Display:inline">
 			<input type="hidden" name="action" value="m3u" />
 			<select name="random" style="width:110px;">
 				<option value="1">1</option>
@@ -142,6 +145,6 @@ $browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
 		<?php if (conf('use_auth')) { ?>
 			<li><a href="<?php echo conf('web_path'); ?>/logout.php">Logout</a></li>
 		<?php } ?>
-	</li> </ul>
+	</ul>
 	
 <!-- </div> -->
diff --git a/templates/style.inc b/templates/style.inc
index 730554c3..862c109c 100644
--- a/templates/style.inc
+++ b/templates/style.inc
@@ -280,14 +280,14 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
         padding: 0;
         list-style: none;
         border: 1px solid #000;
-	line-height: 1;
+	line-height: 1.0;
     }
     #sidebar ul {
 	margin: 0px;
 	list-style: none;
 	padding: 0px;
         font-family: verdana, arial, Helvetica, sans-serif;
-	line-height: 1;
+	line-height: 1.0;
     }
     #sidebar li {
 /*        margin: 0 0 1px 0; */
diff --git a/templates/subnavbar.inc.php b/templates/subnavbar.inc.php
index a7064fd3..396fa97c 100644
--- a/templates/subnavbar.inc.php
+++ b/templates/subnavbar.inc.php
@@ -26,7 +26,7 @@
  */
 
 ?>
-	<ul id="subnavside">
+	<ul class="subnavside">
 <?php 
 	foreach ($items as $item) { 
 		if ($item['active']) { 
-- 
cgit