tweaks from sigger

4 files changed, 24 insertions, 96 deletions

diff --git a/themes/burgundy/templates/style.inc b/themes/burgundy/templates/style.inc
index c0aed80e..da89d7fc 100644
--- a/themes/burgundy/templates/style.inc
+++ b/themes/burgundy/templates/style.inc
@@ -200,11 +200,15 @@
 		width:160px;
 		background: <?php echo conf('base_color2'); ?>;
 		}
+/* These three lines make a menu horizontal */
+	#content { float: left; }
+	#sidebar li { float: left; }
+	#sidebar li ul { margin: 0.5em 0 0 -1.1em; }
 /**
  * Div Definitions
  * These define how the page is layed out, be careful with these as changes to them
  * can cause drastic layout changes
- */
+
 	#maincontrainer
 		{
 			margin: 0px;
@@ -304,7 +308,7 @@
 		margin-left:0px;
 		margin-top: 35px;
 		}
-/**
+
  * End Div Definitions
  * This is the end of the main structure def's
  */
diff --git a/themes/burgundy/theme.cfg.php b/themes/burgundy/theme.cfg.php
index bf93db81..c7246a0d 100644
--- a/themes/burgundy/theme.cfg.php
+++ b/themes/burgundy/theme.cfg.php
@@ -39,7 +39,7 @@ orientation = "horizontal"
 # If this is set to simple the sub menu's will only be shown when you're on one of the 
 # respective pages. If you want to make the menu's something like the classic theme
 # comment this out
-submenu = "simple"
+# submenu = "simple"
 
 # Theme Colors
 ###################
diff --git a/themes/classic/theme.cfg.php b/themes/classic/theme.cfg.php
index 123f99d7..3597c20e 100644
--- a/themes/classic/theme.cfg.php
+++ b/themes/classic/theme.cfg.php
@@ -25,6 +25,18 @@ name = "Classic Ampache"
 # DEFAULT: N/A
 #maintainer = "Ben Shields <foo@ampache.org>"
 
+# Orientation
+# This was added as of 3.3.2-Alpha4, this tells Ampache if this theme
+# uses vertical or horizontal orientation of the menu, if this is a horizontal
+# theme then it will not show the quick search and quick random play forms
+orientation = "vertical"
+
+# Submenu
+# If this is set to simple the sub menu's will only be shown when you're on one of the
+# respective pages. If you want to make the menu's something like the classic theme
+# comment this out
+submenu = "simple"
+
 # Theme Colors
 ###################
 [color]
diff --git a/themes/greyblock/templates/style.inc b/themes/greyblock/templates/style.inc
index a79297c6..204c074e 100644
--- a/themes/greyblock/templates/style.inc
+++ b/themes/greyblock/templates/style.inc
@@ -27,24 +27,6 @@
 */
 ?>
 
-<script type="text/javascript" language="javascript">
-<!-- Begin Suckerfish hover menu JS
-// function needed for IE.  attaches mouseover/out events to give/remove css class .sfhover (fake hover)
-sfHover = function(navlist) {
-var sfEls = document.getElementById("navlist").getElementsByTagName("LI");
-for (var i=0; i <sfEls.length; i++) {
-    sfEls[i].onmouseover=function() {
-        this.className+=" sfhover";
-    }
-    sfEls[i].onmouseout=function() {
-        this.className=this.className.replace(new RegExp("sfhover\\b"), "");
-    }
-} // end for
-} // end function for sfHover
-if (window.attachEvent) window.attachEvent("onload", sfHover);
-// End Suckerfish hover menu JS-->
-</script>
-
 <style type="text/css">
 <!--
 	body	
@@ -223,11 +205,15 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 		padding-left: 0px;
 		background: <?php echo conf('base_color2'); ?>;
 		}
+/* These three lines make a menu vertical */
+        #content { float: none; }
+        #sidebar li { float: none; }
+        #sidebar li ul { margin: -1.5em 0 0 9em; }
 /**
  * Div Definitions
  * These define how the page is layed out, be careful with these as changes to them
  * can cause drastic layout changes
- */
+
 	#maincontainer
 		{
 			margin: 0px;
@@ -247,80 +233,6 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 		{
 			float: left;
 		}
-	#navcontainer ul li
-		{
-			float:left; 
-			width:100%;
-		}
-
-	.subnavbutton 
-		{
-			background-color: <?php echo conf('row_color1'); ?>;
-			text-align:center;
-			text-decoration: none;
-			color: <?php echo conf('font_color2'); ?>;
-		}
-
-	#content
-		{ 
-		margin-left:0px;
-		}
-/**
- * Experimental for menus (Thx Sigger)
- * TO DO: Fill in 1px border around menus & submenu items 
- * Make padding appply to the li, not just an a.  Moving paddng: to li throws off the dropdown menu alignment.
- */
-    #sidebar {
-	clear: both;
-	height: 100%;
-        margin: 0;
-        float: left;
- /*       width: 110px;  /* this controls the width of the sidebar.  horizontal menu needs more width */
-        padding: 0;
-        list-style: none;
-        border: 1px solid #000;
-	line-height: 1;
-    }
-    #sidebar ul {
-	margin: 0px;
-	list-style: none;
-	padding: 0px;
-        font-family: verdana, arial, Helvetica, sans-serif;
-	line-height: 1;
-    }
-    #sidebar li {
-/*        margin: 0 0 1px 0; */
-	margin: 0;
-        display: block;   
-	border-bottom: 1px solid white;
-	border-left: 1px solid white;
-	border-right: 1px solid white;
-	padding: 5px 0px 5px 10px;   
-	width: 10em;
-	background-color: <?php echo conf('row_color2'); ?>;
-    }
-    #sidebar a, .navbutton {
-	display: block;  /*Not sure why this is neccesary, but it is for IE*/
-	text-decoration: none;
-	}
-    #sidebar li:hover, #sidebar li.sfhover {
-        color: <?php echo conf('font_color2'); ?>;
-	background-color: <?php echo conf('row_color3'); ?>;
-    }
-    #sidebar li:active {
-        background-color: <?php echo conf('row_color1'); ?>;
-    }
-    #sidebar li ul {
-	float: left;
-	position: absolute;	
-	width: 12em; 
-	margin: -1.5em 0 0 10em;  
-/* -2em 0 0 10em for vertical menu puts the submenu back up and to the right of the hovered menu item by "the right amount"*/
-	left: -999em;  /* this puts the submenu item way off to the left until it's called back by a hover (below) */
-    }
-    #sidebar li:hover ul, #sidebar li.sfhover ul {
-	left: auto;  /* this calls the submenu back when the parent li is hovered. */
-    }
 /**
  * End Div Definitions
  * This is the end of the main structure def's