Theme made compatible with newest version of Ampache

2 files changed, 443 insertions, 290 deletions

diff --git a/contrib/themes/IL01/templates/default.css b/contrib/themes/IL01/templates/default.css
index 1d31a8e3..c4c0285d 100644
--- a/contrib/themes/IL01/templates/default.css
+++ b/contrib/themes/IL01/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,381 +19,518 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
-/*!
- @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">
-<!--
-
-/* Main
----------------------------------*/
-body {
-	background: #4B67A0;
-	font-family: Verdana; 
-	font-size: 12px; 
+-->
+p { 
 	color: #000000;
-	padding: 0; 
-	margin: 0;
 }
 
-p {
+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; 
-	font-size: 12pt;
-	margin: 8px;
-	white-space: normal;
+	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: #F5F5F5;
+	border-right:2px solid #000000;
+	border-bottom:2px solid #000000;
+	border-left:2px solid #000000;
+	border-top:2px solid #000000;
+}
+.selected_button {
+	background-color: #F5F5F5;
+	color: #000000;
+}
+.unselected_button {
+	/* there really isn't anything for this */
+}
+.display {}
 
-a {
+table.tabledata {}
+td { 
+	padding: 0px 8px 0px 8px;
 	color: #000000; 
-	font-family: Verdana; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px;
 }
-
-a:visited { 
+th {
+	padding-right: 10px;
+}
+input {
 	color: #000000; 
-	font-family: Verdana; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	font-weight: bold; 
+	background-color: #F5F5F5; 
+	margin: 2px 2px 2px 2px;
 }
-
-a:hover {
-	text-decoration: underline;
+select	{ 
+	color: #000000; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	background-color: #F5F5F5; 
 }
-
-a:active {
+textarea { 
+	background-color: #F5F5F5;
 	color: #000000; 
-	font-family: Verdana; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
 }
-
-/* Page Header 
----------------------------------*/
-#pageheader {
-	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/top_fill.jpg) #F5F5F5 repeat-x;
+.table-header {
+        background: url(../images/tablebg.jpg) #F5F5F5 repeat-x;
+	vertical-align: top;
 }
-
-#pageheader img {
-	text-align: left;
-	border: 0px;
+    .header1 
+    { 
+	color: #FFFFFF; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 18px; 
+	font-weight: 900;
+    }
+    .header2
+    {
+    	color: #000000;
+	font-family: Verdana, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: 900;
+    }
+	.headrow 
+		{
+		background:#F3F3F3;
+		font-size: 12px;
+		}
+	.odd 
+		{
+		background:#EDEDED;
+		font-size: 12px;
+		}
+	.even
+		{
+		background:#F9F9F9;
+		font-size: 12px;
+		}
+.blank {
+	background: #fff;
 }
-
-/* Main Menu
----------------------------------*/
-#mainmenu {
-	width: 100%;
-	height: 31px; 
-	overflow: hidden;
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 0;
-	padding: 6px 0 0 0;
-	float: left;
-	background: url(<?php echo conf('web_path'); ?>IL01/images/bg_menubar.jpg) top repeat-x;
+.border { 
+	background:#D1D0D1; 
 }
-
-#mainmenu li {
-	list-style: none; 
-	display: inline;
-	top: 15px;
-	height: 31px;
-	margin: 5px;
-	padding: 10px 8px 10px 5px;
-	text-align: center;
-	vertical-align: middle;
-    background: url(<?php echo conf('web_path'); ?>IL01/images/button_sep.jpg) bottom right no-repeat;
-	font-size: <?php echo conf('font_size') - 1; ?>pt; 
+.header { 
+	font-size: 12px; 
 }
-
-#mainmenu li.active {
-	font-weight: bold;
-	text-decoration: none;
+.error { 
+	color: #990033; 
 }
-
-#mainmenu a {
-	text-decoration: underline;
+.fatalerror {
+	padding-top: 3px;
+	padding-left: 3px;
+	padding-right: 3px;
+	display: table-cell;
+	padding-bottom: 3px;
+	color: #990033;
+ border-right:4px solid #990033;
+ border-bottom:4px solid #990033;
+ border-left:4px solid #990033;
+ border-top:4px solid #990033;		
+}
+.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{
+        background-color: #4C669F;
+	padding-top: 0px;
+	margin-top: 0px;
+	margin-left: 0px;
+	margin-right: 0px; 
+	font-size: 12px;
+	font-family: Verdana;
+	color: #000000;
 }
 
-#mainmenu a:active {
-	color: #00a;
+#maincontainer{
+	margin: 0px;
 }
 
-#mainmenu a:hover {
-	color: #000;
-	text-decoration: none;
+.alphabet { 
+	margin: 10px;
+	font-size: 10px; 
+	font-weight: normal; 
 }
 
-/* Admin Menu
----------------------------------*/
-#adminmenu {
-	width: 100%;
-	height: 31px; 
-	overflow: hidden;
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 0;
-	padding: 6px 0 0 0;
+/* 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:#F5F5F5 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;
+	background: url("../images/top_fill.jpg") repeat-x ; 
+}
+
+#Header h1 { 
+	background: transparent url("../themes/classic/images/bg_login_0.jpg") no-repeat top left; 
+	border:0px; 
+	width: 439px; 
+	height: 84px; 
 	float: left;
-	background: url(<?php echo conf('web_path'); ?>IL01/images/tablebg.jpg) top repeat-x;
+	margin:0px;
+	padding:0px;
+}
+	
+#Header h1 span {
+	display:none
 }
 
-#adminmenu li {
-	white-space: nowrap;
-	float: left;
-	padding: 0 2em 0 2em;
-	border-right: 1px solid #000;
-	display: inline;
+#Header h2 { 
+	background: transparent url(001/h2.gif) no-repeat top left; 
+	margin-top: 75px;  
+	width: 200px; 
+	height: 18px; 
+	float: right;
 }
 
-#adminmenu li.active {
-	text-decoration: underline;
+#Header h2 span {
+	font-size:10px;
+	margin-left:10px;
 }
 
-#adminmenu a {
-	text-decoration: none;
+
+/* 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:100px;
 }
 
-#adminmenu a:hover {
-	color: #000;
+#sidebar h3 {
+    width: 120px;
+    height: 28px;
+    margin 0px;
+    padding: 0px;
+    background: transparent;
 }
 
-#adminmenu a:active {
-	color: #000;
+#sidebar h3 span {
+        display:none
 }
 
-/* table styles
----------------------------------*/
-table.tabledata {
-	margin-left: 12px;
+#sidebar ul {
+        margin: 0px;
+        list-style: none;
+        font-family:Arial, Helvetica, Sans-Serif;
+        font-size:10px;
+        padding: 0px;
+        line-height: 1.0;
+	Background-color: #F5F5F5;
 }
 
-.table-header {
-	height: 20px;
-	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/tablebg.jpg) #F5F5F5 repeat-x;
-	vertical-align: top;
-	text-align: center;
+#sidebar li {
+    margin: 0;
+    float: left;
+    display: block;
+    border: 1px solid #F5F5F5;
+    padding: 5px 0px 5px 10px;
+    width: 10.5em;
+    background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
 }
 
-.border {
-	background:#D1D0D1;
-	margin-left: 12px;
+#sidebar ul.subnavside li {
+    border: 1px solid #F5F5F5;
+    background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
 }
 
-td {
-	padding: 2px 10px 2px 10px;
-	color: #000000; 
-	font-family: Verdana; 
-	font-size: 12pt;
-	white-space: nowrap;
+#sidebar a, .navbutton {
+    display: block;  /*Not sure why this is neccesary, but it is for IE*/
+    text-decoration: none;
+    text-align: center;
+    padding:0px 12px 0px 0px;
+    margin:0px;
 }
 
-th {
-	padding-right: 10px;
-	font-weight: bold;
+#sidebar li:hover, #sidebar li.sfhover {
+        color:#000000;
+	background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
+        background-color:#F5F5F5;
 }
 
-tr td a {
-	text-decoration:none;
-	font-weight: 500;
+#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;
+    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;
+    background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
 }
 
-/* alphabet styles
----------------------------------*/
-.alphabet {
-	font-size: 12pt; 
-	font-weight: normal;
-	margin-left: 10px;
-	margin-right: 10px;
-	padding: 2px;
-	background-color: #FFFFFF;
+#sidebar #activetopmenu {
+        background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
+	}
+#sidebar #activesubmenu {
+        background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
+}
+#sidebar li:hover, #sidebar li.sfhover {
+        left: auto;  /* this calls the submenu back when the parent li is hovered. */
+        background: url(../images/bg_menubar.jpg) #F5F5F5 repeat-x;
 }
 
-.alphabet a {
-	background-color: #FFFFFF;
-	text-decoration: none;
+
+
+
+
+
+
+
+
+
+
+
+
+/* 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;
 }
 
-.alphabet a:hover {
-	text-decoration: underline;
+#np_container1 h1{
+	font-size: 10px;
+	font-weight: bold;
+	padding: 2px;
 }
 
-.alphabet a:active {
-	background-color: #DDDDDD;
-	text-decoration: underline;
-	font-size: <?php echo conf('font_size') + 3; ?>pt;
+#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;
 }
 
-/* text-box styles
----------------------------------*/
-.text-box {
-	font-color: #F3F3F3;
-	padding-left:5px;
-	padding-top:5px;
+	
+/* Styles for Login template  */
+#container{
+	margin:100px auto 0px auto;
+	width:437px;
+	font-size: 12px;
+	text-align:center;
 }
-
-.text-box ul {
-	padding: 10px;
+#container h1{
+	background:url("../themes/classic/images/bg_login_0.jpg") no-repeat;
+	height:81px;
+	margin-bottom:8px;
 }
-
-.text-box a {
-	color: #FFFFFF;
+#container h1 span{
+	display:none;
 }
-
-.text-box li {
-	background:  url(<?php echo conf('web_path'); ?>IL01/images/vineta.gif) no-repeat 3px 4px;
-	list-style: none;
-	margin: 0px;
-	padding: 0 0 0 13px;
-	line-height: 15px;
-	font-size: 12px; 
+#container div{
+	background:url("../themes/classic/images/bg_login_1.jpg") no-repeat;
+	height:285px;
 }
-/* Various Styles and Headers
----------------------------------*/
-.header1 {
-	margin-left: 12px;
-	margin-bottom: 5px;
-	color: #FFFFFF;
-	font-family: Verdana; 
-	font-size: <?php echo conf('font_size') + 3; ?>pt;
-	font-weight: 500;
+#loginp_0{
+	color:#333;
+	margin-top:0px;
+	padding-top:60px;
 }
-
-.header1 a {
-	color: #FFFFFF;
-	text-decoration: underline;
+.loginp_1{
+	text-align:right;
+	padding-right:100px;
 }
-
-.header2 {
-	background: url(<?php echo conf('web_path'); ?>IL01/images/y_bg.jpg) no-repeat;
-	height: 55px;
-	width: 580px;
-	margin: 8px;
-	padding: 18px 30px 10px 19px;
-	color: #000000;
-	font-family: Verdana;
-	font-size: <?php echo conf('font_size') + 1; ?>pt;
-	font-weight: 500;
+.loginp_1 span{
+	font-weight:bold;
 }
-
-.error { 
-	color: #990033;
-	background: url(<?php echo conf('web_path'); ?>IL01/images/exclamation_20.gif) top no-repeat;
-	background-color: #FFFFFF;
-	width: 200px;
-	padding: 20px 10px 5px 20px; 
-	margin: 12px;
+.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;
 }
 
-input {
-	color: #000000; 
-	font-family: Verdana; 
-	font-size: 12px; 
-	font-weight: bold; 
-	background-color: #F5F5F5; 
-	padding: 1px;
-	margin: 1px;
-	vertical-align: middle;
-	border: 1px solid #4B67A0;
-	cursor: pointer;
+#footer p {
+	color:#999999;
+	font-size:10px;
 }
+#topbar { 
+	float: left;
+	top:20px;
+	height: 140px;
+	padding-top:3px;
+	padding-left:10px;
 
-input.button {
-	color: #000000;
-	margin: 2px;
+}
+#topbarright { 
+	float: right;
 	font-size: 10px;
-	background-color: #ffffff;
-	border: 1px solid;
 }
-
-input.button:hover {
-	color: #ffffff;
-	background-color: #4B67A0;
-	border: 1px solid #4B67A0;
+#topbarleft, #topbarleft a{ 
+	float: left;
 }
 
-select {	
-	padding: 1px;
-	border: 1px solid #4B67A0;
-	margin: 1px;
-	vertical-align: middle;
-	color: #000000; 
-	font-family: Verdana; 
-	font-size: 12px; 
-	font-weight: bold; 
-	background-color: #F5F5F5; 
-}
+/* Box Related Styles */
+.box { 
+	padding:0px;
+	background: #4C669F;
+	margin:10px;
+background:transparent; 
+border: 1px solid #000000;
 
-textarea {
-	background-color: #F5F5F5;
-	color: #000000; 
-	font-family: Verdana; 
-	font-size: 12pt; 
 }
-
-.button {
-	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/tablebg.gif) #F5F5F5 repeat-x;
-	padding: 2px;
-	border: 0;
-	margin: 2px;
+.box-title { 
+	border-bottom: solid 1px #EEFF65;
+	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; }
 
-ol li a {
-	white-space: nowrap;
-	text-decoration:none;
-	font-weight: 500;
+.confirmation-box {
+	padding-left:5px;
+	padding-top:5px;
+ 	padding-right:5px;
+	margin-bottom:10px;
+	display: table-cell;
+	background-color: #EEFF65;
+	border-right:2px solid #000000;
+	border-bottom:2px solid #000000;
+	border-left:2px solid #000000;
+	border-top:2px solid #000000;}
+
+.text-action, .text-action li {
+	margin-top:5px;
+	list-style: none;
+	margin-bottom:5px;
+	padding-left:0px;
+}
+.text-action a, .text-action span {
+	background: #F5F5F5;
+	border:1px solid #000000;
+ 	padding-left:2px;
+	padding-right:2px;
+	text-decoration: none;
 }
-
-.login {
-	border-top: 1px solid white;
-	border-bottom: 1px solid white;
-	border-right: 1px solid white;
-	border-left: 1px solid white;
+.text-action #pt_active {
+	background: #000000;
+	color: #ffffff;
+	border:1px solid #000000;
 }
-
-.odd {
-	background:#EDEDED;
-	font-size: 12pt;
-	padding: 10px;
+#nowplaying {
+	width:650px;
+	background: #404040;
 }
-
-.even {
-	background:#F9F9F9;
-	font-size: 12pt;
-	padding: 10px;
+.np_row {
+	padding-top: 3px;
+	padding-bottom: 3px;
 }
-
-.headrow {
-	background:#f3f3f3;
-	font-size: 12pt;
+.np_cell {
+	margin: 10px;
 }
-
-.blank {
-	background: #fff;
+#tablist {
+        padding: 3px 0;
+        margin: 12px 0 0 0;
+        font: bold 12px Verdana, sans-serif;
 }
 
-.header {
-	font-size: 12pt; 
+#tablist li {
+        list-style: none;
+        margin: 0;
+        display: inline;
 }
 
-.fatalerror {
-	padding-top: 3px;
-	padding-bottom: 3px;
-	color: #990033;
-	border-right:4px solid #990033;
-	border-bottom:4px solid #990033;
-	border-left:4px solid #990033;
-	border-top:4px solid #990033;		
-	font-size: <?php echo conf('font_size')+2; ?>pt;
-	font-weight: 900;
-	text-align: center;
+#tablist li a {
+        padding: 3px 0.5em;
+        margin-left: 3px;
+        border: 1px solid #cccccc;
+        border-bottom: none;
+        background: #F5F5F5;
+        text-decoration: none;
 }
 
-.disabled {
-	text-decoration: line-through;
-}
+#tablist li a:link { color: #222222; }
+#tablist li a:visited { color: #000000; }
 
--->
-</style>
+#tablist li a:hover {
+        color: #000000;
+        background: #EEFF65;
+        border-color: #000000;
+}
 
+#tablist li a#current {
+        color: #000000;
+        background: #F5F5F5;
+        border-color: #000000;
+        border-bottom: 1px solid #000000;
+}
 
diff --git a/contrib/themes/IL01/theme.cfg.php b/contrib/themes/IL01/theme.cfg.php
index 749f1570..d950b0b5 100644
--- a/contrib/themes/IL01/theme.cfg.php
+++ b/contrib/themes/IL01/theme.cfg.php
@@ -16,7 +16,7 @@ name = "IL01"
 # This is just a way of giving credit to the 
 # person who actually created this theme
 # DEFAULT: N/A
-author = "Rodrigo Galindo (ros)"
+author = "Rodrigo Galindo (ros) modified by Terence Theijn"
 
 # Theme Maintainer
 # This is just a way of listing who is responsible for
@@ -25,6 +25,22 @@ author = "Rodrigo Galindo (ros)"
 # DEFAULT: N/A
 #maintainer = "Rodrigo Galindo <ros@interleucina.org>"
 
+# 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"
+
 # Theme Colors
 ###################
 [color]