Theme made compatible with newest version of Ampache

3 files changed, 492 insertions, 222 deletions

diff --git a/contrib/themes/simple_h/screencap/01.jpg b/contrib/themes/simple_h/screencap/01.jpg
index c97eb33b..60e082a9 100644
--- a/contrib/themes/simple_h/screencap/01.jpg
+++ b/contrib/themes/simple_h/screencap/01.jpg
diff --git a/contrib/themes/simple_h/templates/default.css b/contrib/themes/simple_h/templates/default.css
index ffc9cc2b..81611f39 100644
--- a/contrib/themes/simple_h/templates/default.css
+++ b/contrib/themes/simple_h/templates/default.css
@@ -1,7 +1,7 @@
-<?php
+<!--
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,242 +19,498 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+-->
+p { 
+	color: #000000;
+}
 
-/*!
- @header Style File
- @discussion this is the css that is included on every page of
- 	ampache, mod this to change the look and feel of the site
-*/
-?>
-<style type="text/css">
-<!--
-  body { 
-    background: url(<?php echo conf('web_path'); ?>simple_h;
-    background-position: bottom right;
-    background-attachment: fixed;
-    background-repeat: no-repeat;
-    font-family: Verdana; 
-    font-size: 12px; 
-    color: #222;
-  }
-
-  a { 
-    color: #222; 
-    font-family: Verdana; 
-  }
-
-  .text-box {
-    padding-left:5px;
-    padding-top:5px;
-    margin-bottom:10px;
-    background-color: ;
-    border-right:2px solid ;
-    border-bottom:2px solid ;
-    border-left:2px solid ;
-    border-top:2px solid ;
-  }
-
-  table.border {
-    border-top: solid;
-    border-style: none none none solid;
-    border-color: #4786d4;
-    border-width: thin;
-    padding-left: 5px;
-  }
-
-  td { 
-    padding: 0px 8px 0px 8px;
-    color: #222; 
-    font-family: Verdana; 
-    font-size: 12px;
-  }
-
-  th {
-    padding-right: 10px;
-  }
-
-  input	{
-    color: #222; 
-    font-family: Verdana; 
-    font-size: 12px; 
-    font-weight: bold; 
-    background-color: ;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #4786d4; /* ; */
-    margin: 2px 2px 2px 2px;
-    padding: 2px;
-  }
-
-  select { 
-    color: #222; 
-    font-family: Verdana; 
-    font-size: 12px; 
-    background-color: ; 
-  }
-
-  textarea { 
-    color: #222; 
-    font-family: Verdana; 
-    font-size: 12px; 
-  }
-
-  .table-header {
-    background:  repeat-x;
-    vertical-align: top;
-  }
-
-/*************** Main Menu *****************/
-    #mainmenu {
-        float: left;
-        width: 100%;
-        margin: 0;
-        padding: 0;
-        list-style: none;
-        border-top: 0px solid #000;
-        border-bottom: 0px solid #000;
-        border-right: 0px solid #000;
-        border-left: 0px solid #000;
-        background:  repeat-x;
-    }
-    #mainmenu li {
-        float: left;
-        margin: 0;
-        padding: 0 10px 0 10px;
-        border-right: 0px solid #000;
-        display: inline;
-        background:  repeat-x;
-    }
-    #mainmenu li.active {
-        background:  rep
-    }
-    #mainmenu a {
-        text-decoration: bold;
-    }
-    #mainmenu a:hover {
-        color: #000;
-    }
-    #mainmenu a:active {
-        color: #00a;
-    }
-/*************** END Main Menu *************/
-/*************** Admin Menu *************/
-    #adminmenu {
-        float: left;
-        width: 100%;
-        margin: 0;
-        padding: 0;
-        list-style: none;
-        border-bottom: 0px solid #000;
-        border-right: 0px solid #000;
-        border-left: 0px solid #000;
-        border-top: 0px solid #000;
-        background:  repeat;
-    }
-    #adminmenu li {
-        float: left;
-        margin: 0;
-        padding: 0 20px 0 20px;
-        border-right: 0px solid #000;
-        display: inline;
-        background:  repeat-x;
-    }
-    #adminmenu li.active {
-        background:  repeat-x;
-    }
-    #adminmenu a {
-        text-decoration: none;
-    }
-    #adminmenu a:hover {
-        color: #000;
-    }
-    #adminmenu a:active {
-        color: #000;
-    }
-/*************** END Main Menu *************/
-/*************** Page Header *********************/
-    #pageheader {
-        background: ;
-    }
-/*************** END Page Header *****************/
-    .navitem
-    {
-        background:  repeat-x;
-        vertical-align: top;
-        text-align: center;
-    }
+a { 
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+}
+a:visited 
+	{ 
+	color: #000000; 	
+	font-family: Verdana, Helvetica, sans-serif; 
+	}
+a:active  { 
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+}
+.text-box {
+	display: table-cell;
+	padding-left:5px;
+	padding-top:5px;
+	padding-right:5px;
+	margin-bottom:10px;
+	background-color: #FFFFFF;
+	border-right:2px solid #4786D4;
+	border-bottom:2px solid #4786D4;
+	border-left:2px solid #4786D4;
+	border-top:2px solid #4786D4;
+}
+.selected_button {
+	background-color: black;color:white;
+}
+.unselected_button {
+	/* there really isn't anything for this */
+}
+.display {}
+
+table.tabledata {}
+td { 
+	padding: 0px 8px 0px 8px;
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px;
+}
+th {
+	padding-right: 10px;
+}
+input {
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	font-weight: bold; 
+	background-color: #FFFFFF; 
+	margin: 2px 2px 2px 2px;
+}
+select	{ 
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	background-color: #FFFFFF; 
+}
+textarea { 
+	background-color: #FFFFFF;
+	color: #0000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+}
+.table-header {
+	background: #4786D4 repeat-x;
+	vertical-align: top;
+}
     .header1 
     { 
-	color: #222; 
-	font-family: Verdana; 
-	font-size: <?php echo conf('font_size') + 6; ?>px; 
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 18px; 
 	font-weight: 900;
     }
     .header2
     {
-    	color: #222;
-	font-family: Verdana;
-	font-size: <?php echo conf('font_size') + 2; ?>px;
+    	color: #000000;
+	font-family: Verdana, Helvetica, sans-serif;
+	font-size: 14px;
 	font-weight: 900;
     }
-    .active_navitem
-    {
-        background:  repeat-x;
-        vertical-align: top;
-        text-align: center;
-    }
 	.headrow 
 		{
-		background:;
+		background:#FFFFFF;
 		font-size: 12px;
 		}
 	.odd 
 		{
-		background:;
+		background:#FFFFFF;
 		font-size: 12px;
 		}
 	.even
 		{
-		background:;
+		background:#FFFFFF;
 		font-size: 12px;
 		}
-    .blank
-        {
-        background: #fff;
-        }
-	.border 
-		{ 
-		background:; 
-		}
-	.header 
-		{ 
-		font-size: 12px; 
-		}
- 	.error	
-		{ 
-		color: #FF0000; 
-		}
-	.fatalerror
-		{
-		padding-top: 3px;
-		padding-bottom: 3px;
-		color: #FF0000;
-                border-right:4px solid #FF0000;
-                border-bottom:4px solid #FF0000;
-                border-left:4px solid #FF0000;
-                border-top:4px solid #FF0000;		
-		font-size: <?php echo conf('font_size')+2; ?>px;
-		font-weight: 900;
-		text-align: center;
-		}
-	.disabled
-		{
-		text-decoration: line-through;
-		}
-	.alphabet 
-		{ 
-		font-size: 12px; 
-		font-weight: normal; 
-		}
--->
-</style>
+.blank {
+	background: #fff;
+}
+.border { 
+	background:#000000; 
+}
+.header { 
+	font-size: 12px; 
+}
+.error { 
+	color: #FF0000; 
+}
+.fatalerror {
+	padding-top: 3px;
+	padding-left: 3px;
+	padding-right: 3px;
+	display: table-cell;
+	padding-bottom: 3px;
+	color: #990033;
+ border-right:4px solid #FF0000;
+ border-bottom:4px solid #FF0000;
+ border-left:4px solid #FF0000;
+ border-top:4px solid #FF0000;		
+}
+.disabled {
+	text-decoration: line-through;
+}
+.smallbutton {
+	border:0px;
+	padding-left:1px;
+	padding-right:1px;
+	font-size: 11px;
+	cursor: pointer;
+}
+/* ////////////////////////////////////////////////////////////////*/	
+/* De aqui pa'bajo, ros esta creando una hoja de estilos unica para todo Ampache  */
+
+/* General style rules  */
+body{ 
+	padding-top: 0px;
+	margin-top: 0px;
+	margin-left: 0px;
+	margin-right: 0px; 
+	background-color:#FFFFFF;
+	font-family:Arial, Helvetica, Sans-Serif;
+	color: #000000;
+	background: url(../images/headph2-1.png) #FFFFFF no-repeat fixed bottom right;
+}
+
+#maincontainer{
+	margin: 0px;
+}
+
+.alphabet { 
+	margin: 10px;
+	font-size: 10px; 
+	font-weight: normal; 
+}
+
+/* Content block */
+#content {
+	postion:absolute;
+	float: left;
+	clear: both;
+	margin-left:15px;
+	/*float:left;  use for horizontal menu; comment out otherwise */
+	/* background:#fff url("../themes/classic/images/bg_content.gif") repeat-y right top; */
+}
+
+h3#content_title{
+	font-family:Arial,Helvetica,Sans-Serif;
+	font-size:12px;
+	line-height:32px;
+	color:#fff;
+	margin:0px;
+	padding:0px;
+	background:#000000 url("../themes/classic/images/content_corner.gif") no-repeat right top;
+}
+
+h3#content_title span {
+	text-align:left;
+}
+			
+/* Styles for Header */
+div#Header{
+	height:120px;
+	margin-bottom:3px;
+	padding:0px;
+}
+
+#Header h1 { 
+	background: transparent url("../themes/classic/images/bg_login_0.jpg") no-repeat top left; 
+	border:0px; 
+	width: 439px; 
+	height: 84px; 
+	float: left;
+	margin:0px;
+	padding:0px;
+}
+	
+#Header h1 span {
+	display:none
+}
+
+#Header h2 { 
+	background: transparent url(001/h2.gif) no-repeat top left; 
+	margin-top: 75px;  
+	width: 200px; 
+	height: 18px; 
+	float: right;
+}
+
+#Header h2 span {
+	font-size:10px;
+	margin-left:10px;
+}
+
+
+/* Sidebar */
+/**
+ * Experimental for menus (Thx Sigger)
+ * TO DO: Fill in 1px border around menus & submenu items
+ * Make padding apply to the li, not just an a.  Moving padding: to li throws off the dropdown menu alignment.
+ */
+ 
+div#sidebar{
+	clear:both;
+	position:absolute;
+	left:5px;
+	top:60px;
+}
+
+#sidebar h3 {
+	border:0px; 
+	width: 120px; 
+	height: 28px; 
+	margin:0px;
+	padding:0px; 
+	background: transparent; 
+
+}
+	
+#sidebar h3 span {
+	display:none
+}
+
+#sidebar ul {
+	margin: 0px;
+	list-style: none;
+	font-family:Arial, Helvetica, Sans-Serif;
+	font-size:10px;
+	padding: 0px;
+	line-height: 1.0;
+	background-color:#FFFFFF;
+}
+
+#sidebar li {
+    margin: 0;
+    float: left;
+    display: block;
+    border-bottom: 1px solid #4786D4;
+    border-left: 1px solid #4786D4;
+    border-right: 1px solid #4786D4;
+    border-top: 1px solid #4786D4;
+    padding: 5px 0px 5px 10px;
+    width: 10.5em;
+    background-color: #FFFFFF;
+}
+
+#sidebar a, .navbutton {
+    display: block;  /*Not sure why this is neccesary, but it is for IE*/
+    text-decoration: underline;
+}
+
+#sidebar li:hover, #sidebar li.sfhover {
+	color: #000000;
+       background-color: #FFFFFF;
+}
+
+#sidebar li:active {
+	background-color:#FFFFFF;
+	z-index:30;
+}
+   
+#sidebar li ul {
+    float: left;
+    position: absolute;
+    width: 9em;
+/*	margin: -1.5em 0 0 10.5em; /* for vertical menu; comment out otherwise */
+	margin: 0.5em 0 0 -1.1em;  /* for horizontal menu;  comment out otherwise */ 
+        left: -999em;  /* this -999em puts the submenu item way off to the left until it's called back by a hover (below) */
+	z-index:30;
+}
+
+#sidebar li:hover ul, #sidebar li.sfhover ul {
+	left: auto;  /* this calls the submenu back when the parent li is hovered. */
+       background-color: #FFFFFF;
+}
+
+#navlist ul li:hover {
+       background-color: #FFFFFF;
+
+}
+
+/* Styles for Now Playing */
+
+#np_container1{
+	width: 260px;
+	height: 18px;
+	padding: 0px;
+	margin: 0px;
+	background: #fff url("../themes/classic/images/tb_tab.jpg") no-repeat top left;
+}
+
+#np_container1 h1{
+	font-size: 10px;
+	font-weight: bold;
+	padding: 2px;
+}
+
+#np_container2{
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-color:#ddd #999 #999 #ccc;
+	padding: 6px;
+	font-family: Verdana, sans-serif;
+	font-size: 10px;
+	line-height: 12px;
+	color: #000;
+	background: #D6D6D4 url("../themes/classic/images/bg_row.jpg") repeat top left;
+}
+
+	
+/* Styles for Login template  */
+#container{
+	margin:100px auto 0px auto;
+	width:437px;
+	font-size: 12px;
+	text-align:center;
+}
+#container h1{
+	background:url("../themes/classic/images/bg_login_0.jpg") no-repeat;
+	height:81px;
+	margin-bottom:8px;
+}
+#container h1 span{
+	display:none;
+}
+#container div{
+	background:url("../themes/classic/images/bg_login_1.jpg") no-repeat;
+	height:285px;
+}
+#loginp_0{
+	color:#333;
+	margin-top:0px;
+	padding-top:60px;
+}
+.loginp_1{
+	text-align:right;
+	padding-right:100px;
+}
+.loginp_1 span{
+	font-weight:bold;
+}
+.loginp_1 input{
+	border:1px solid #999;
+}
+input.text_input {
+width:12em;
+}
+.loginp_1 input.check_input {
+margin-right:5em;
+} 
+/* Footer */
+#footer {
+	margin-left: 150px;
+	margin-bottom: 10px;
+}
+
+#footer p {
+	color:#999999;
+	font-size:10px;
+}
+#topbar { 
+	height: 120px;
+	padding-top:3px;
+	padding-left:10px;
+}
+#topbarright { 
+	float: right;
+	font-size: 10px;
+}
+#topbarleft, #topbarleft a{ 
+	float: left;
+}
+
+/* Box Related Styles */
+.box { 
+	padding:0px;
+	background: #FFFFFF;
+	margin:10px;
+	border: 1px solid #4786D4;
+}
+.box-title { 
+	border-bottom: solid 1px #4786D4;
+	font-weight: bold;
+}
+.box-left-top { display:none; }
+.box-left-bottom { display:none; }
+.box-left { display:none; }
+.box-bottom { display:none; }
+.box-right-bottom { display:none; }
+.box-right-top { display:none; }
+.box-right { display:none; }
+.box-top { display:none; }
+
+.confirmation-box {
+	padding-left:5px;
+	padding-top:5px;
+ 	padding-right:5px;
+	margin-bottom:10px;
+	display: table-cell;
+	background-color: #FFFFFF;
+	border-right:2px solid #4786D4;
+	border-bottom:2px solid #4786D4;
+	border-left:2px solid #4786D4;
+	border-top:2px solid #4786D4;}
+
+.text-action, .text-action li {
+	margin-top:5px;
+	list-style: none;
+	margin-bottom:5px;
+	padding-left:0px;
+}
+.text-action a, .text-action span {
+	background: #FFFFFF;
+	border:1px solid #4786D4;
+ 	padding-left:2px;
+	padding-right:2px;
+	text-decoration: none;
+}
+.text-action #pt_active {
+	background: #FFFFFF;
+	color: #000000;
+	border:1px solid #4786D4;
+}
+#nowplaying {
+	width:650px;
+	background: #FFFFFF;
+}
+.np_row {
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+.np_cell {
+	margin: 10px;
+}
+#tablist {
+        padding: 3px 0;
+        margin: 12px 0 0 0;
+        font: bold 12px Verdana, sans-serif;
+}
+
+#tablist li {
+        list-style: none;
+        margin: 0;
+        display: inline;
+}
+
+#tablist li a {
+        padding: 3px 0.5em;
+        margin-left: 3px;
+        border: 1px solid #4786D4;
+        border-bottom: none;
+        background: #FFFFFF;
+        text-decoration: none;
+}
+
+#tablist li a:link { color: #000000; }
+#tablist li a:visited { color: #000000; }
+
+#tablist li a:hover {
+        color: #4786D4;
+        background: #FFFFFF;
+        border-color: #4786D4;
+}
+
+#tablist li a#current {
+        color: #4786D4;
+        background: #FFFFFF;
+        border-color: #4786D4;
+        border-bottom: 1px solid #4786D4;
+}
+
diff --git a/contrib/themes/simple_h/theme.cfg.php b/contrib/themes/simple_h/theme.cfg.php
index 608576cb..d1541c05 100644
--- a/contrib/themes/simple_h/theme.cfg.php
+++ b/contrib/themes/simple_h/theme.cfg.php
@@ -16,7 +16,7 @@ name = "Simple_h"
 # This is just a way of giving credit to the 
 # person who actually created this theme
 # DEFAULT: N/A
-author = "Lars Olafsen"
+author = "Lars Olafsen modified by Terence Theijn"
 
 # Theme Maintainer
 # This is just a way of listing who is responsible for
@@ -25,7 +25,21 @@ author = "Lars Olafsen"
 # DEFAULT: N/A
 #maintainer = "Lars Olafsen" larsolafsen@gmail.com
 
-version = "1.0"
+# Version
+# This is the version of the Theme (usefull if you've updated it)
+version = "1.1"
+
+# 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 = "horizontal"
+
+# 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"
 
 #Image Credits
 #Please give credit where credit is due