new coolness from sigger

1 files changed, 35 insertions, 37 deletions

diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 60ac95a9..79a62283 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -35,10 +35,11 @@ $admin_items[] = array('title'=>'Access List','url'=>'admin/access.php','active'
 $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'=>'');
 
 ?>
-<div id="navcontainer">
+<!-- <div id="navcontainer">  --> <!--sigger: appears this div is not neccesary and duplicates #sidebar -->
 	<ul id="navlist">
 		<li id="active">
 			<a href="<?php echo conf('web_path'); ?>/index.php" id="current"><?php echo _("Home"); ?></a>
@@ -46,15 +47,17 @@ $browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','activ
 		<?php if ($GLOBALS['user']->has_access(100)) { ?>
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/admin/index.php"><?php echo _("Admin"); ?></a>
-		<?php 
-			if ($location['section'] == 'admin') {  
-                                if ($GLOBALS['theme']['orientation'] == 'vertical') { echo "\t</li>"; }
-                                show_submenu($admin_items);
-                                if ($GLOBALS['theme']['orientation'] != 'vertical') { echo "\t</li>"; }
+		<?php
+			if ($GLOBALS['theme']['submenu'] != 'simple') {
+				show_submenu($admin_items); 
+				echo "\t</li>\n";
+			} 
+			else { 
+				if ($location['section'] == 'admin') {  
+					echo "\t</li>\n";
+	                                show_submenu($admin_items);
+				} 
                         } // end if browse sub menu
-                        else {
-                                echo "\t</li>";
-                        }	
 		
 		} // end if access 
 		?>
@@ -62,15 +65,17 @@ $browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','activ
 			<a href="<?php echo conf('web_path'); ?>/preferences.php"><?php echo _("Preferences"); ?></a>
 		</li>
 		<li>
-			<a href="<?php echo conf('web_path'); ?>/browse.php"><?php echo _("Browse"); ?></a>
+			<a href="<?php echo conf('web_path'); ?>/browse.php"><?php echo _("Browse"); ?></a> 
 		<?php 
-			if ($location['section'] == 'browse') { 
-				if ($GLOBALS['theme']['orientation'] == 'vertical') { echo "\t</li>"; }
+			if ($GLOBALS['theme']['submenu'] != 'simple') { 
 				show_submenu($browse_items);
-				if ($GLOBALS['theme']['orientation'] != 'vertical') { echo "\t</li>"; }
-			} // end if browse sub menu
-			else {
-				echo "\t</li>";
+				echo "\t</li>\n";
+			}
+			else { 
+				if ($location['section'] == 'browse') { 
+					echo "\t</li>\n";
+					show_submenu($browse_items);
+				}
 			}
 		?>
 		<?php if ($GLOBALS['user']->prefs['upload']) { ?>
@@ -88,31 +93,24 @@ $browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','activ
 		<?php } ?>
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/search.php"><?php echo _("Search"); ?></a>
-		</li>
-	</ul>
 	<?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?>
-	<ul class="subnavside">
-		<li class="subnavbutton">
+	<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="8" />
-        	        <input class="smallbutton" type="submit" value="<?php echo _("Search"); ?>" />
+			<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"); ?>" /> 
         	        <input type="hidden" name="action" value="quick_search" />
         	        <input type="hidden" name="method" value="fuzzy" />
         	        <input type="hidden" name="object_type" value="song" />
         	        <input type="hidden" name="search_object[]" value="all" />		
 			</form>
 		</li>
-	</ul>
 	<?php } ?>
-	<ul>
 		<li>
 			<a href="<?php echo conf('web_path'); ?>/randomplay.php"><?php echo _("Random Play"); ?></a>
 		</li>
-	</ul>
-	<?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?>
-	<ul class="subnavside">
-		<li class="subnavbutton">
-			<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php" style="Display:inline">
+	<?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">
 			<input type="hidden" name="action" value="m3u" />
 			<select name="random" style="width:110px;">
 				<option value="1">1</option>
@@ -126,7 +124,8 @@ $browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','activ
 				<option value="1000">1000</option>
 				<option value="-1"><?php echo _("All"); ?></option>
 			</select>
-			<br />
+		        <?php show_genre_pulldown('genre','','','13','width:110px;'); ?>
+						<br />  
 			<select name="Quantifier" style="width:110px;">
 				<option value="Songs"><?php echo _("Songs"); ?></option>
 				<option value="Minutes"><?php echo _("Minutes"); ?></option>
@@ -134,16 +133,15 @@ $browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','activ
 				<option value="Albums"><?php echo _("Albums"); ?></option>
 				<option value="Less Played"><?php echo _("Less Played"); ?></option>
 			</select>
-			<br />
-			<?php show_catalog_pulldown('catalog','width:110px;'); ?>
-			<br />
+			<br /> 
 			<input type="hidden" name="aaction" value="Play!" />
 			<input class="smallbutton" type="submit" name="aaction" value="<?php echo _("Enqueue"); ?>" />
 			</form>
 		</li>
-	</ul>
-	<?php } ?>
+	<?php } ?> 
 		<?php if (conf('use_auth')) { ?>
-			<ul><li><a href="<?php echo conf('web_path'); ?>/logout.php">Logout</a></li></ul>
+			<li><a href="<?php echo conf('web_path'); ?>/logout.php">Logout</a></li>
 		<?php } ?>
-</div>
+	</li> </ul>
+	
+<!-- </div> -->