Theme made compatible with newest version of Ampache

3 files changed, 544 insertions, 272 deletions

diff --git a/contrib/themes/Solar/screencap/01.jpg b/contrib/themes/Solar/screencap/01.jpg
index cffcd8b4..34392dc9 100755
--- a/contrib/themes/Solar/screencap/01.jpg
+++ b/contrib/themes/Solar/screencap/01.jpg
diff --git a/contrib/themes/Solar/templates/default.css b/contrib/themes/Solar/templates/default.css
index bc39d421..676ca4e2 100644
--- a/contrib/themes/Solar/templates/default.css
+++ b/contrib/themes/Solar/templates/default.css
@@ -1,268 +1,526 @@
-<?php

-/*

-

- Copyright (c) 2001 - 2005 Ampache.org

- All rights reserved.

-

- This program is free software; you can redistribute it and/or

- modify it under the terms of the GNU General Public License

- as published by the Free Software Foundation; either version 2

- of the License, or (at your option) any later version.

-

- This program is distributed in the hope that it will be useful,

- but WITHOUT ANY WARRANTY; without even the implied warranty of

- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- GNU General Public License for more details.

-

- You should have received a copy of the GNU General Public License

- along with this program; if not, write to the Free Software

- 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">

-<!--

-	body	

-		{ 

-		background: url(<?php echo conf('web_path'); ?>Solar/images/Solar.jpg); 

-		font-family: Verdana; 

-		font-size: 12px; 

-		color: #8B8B00;

-		}

-

-	p	

-		{ 

-		color: #8B8B00; 

-		font-family: Verdana; 

-		font-size: 12px; 

-		}

-	a	

-		{ 

-		color: #8B8B00; 

-		font-family: Verdana; 

-		}

-	a:visited 

-		{ 

-		color: #8B8B00; 

-		font-family: Verdana; 

-		}

-	a:active  

-		{ 

-		color: #8B8B00; 

-		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.tabledata

-    {

-    }

-

-	td	

-		{ 

-        padding: 0px 8px 0px 8px;

-		color: #8B8B00; 

-		font-family: Verdana; 

-		font-size: 12px;

-		}

-    th

-        {

-        padding-right: 10px;

-        }

-	input	

-		{

-		color: #8B8B00; 

-		font-family: Verdana; 

-		font-size: 12px; 

-		font-weight: bold; 

-		background-color: #000000; 

-	    	border-style: solid;

-	      	border-width: 1px;

-	        border-color: ;

-		margin: 2px 2px 2px 2px;

-		}

-	select	{ 

-		color: #8B8B00; 

-		font-family: Verdana; 

-		font-size: 12px; 

-		background-color: #000000; 

-		}

-	textarea 

-	{ 

-		color: #8B8B00; 

-		font-family: Verdana; 

-		font-size: 12px; 

-	}

-    .table-header

-    {

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Dark.jpg) #000000 repeat-x;

-        vertical-align: top;

-    }

-/*************** Main Menu *****************/

-    #mainmenu {

-        float: left;

-        width: 100%;

-        margin: 0;

-        padding: 0;

-        list-style: none;

-        border-top: 1px solid #FFFFFF;

-        border-bottom: 1px solid #000;

-        border-right: 1px solid #000;

-        border-left: 1px solid #000;

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Mid.jpg) #000000 repeat-x;

-    }

-    #mainmenu li {

-        float: left;

-        margin: 0;

-        padding: 0 10px 0 10px;

-        border-right: 1px solid #000;

-        display: inline;

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Light.jpg) #000000 repeat-x;

-    }

-    #mainmenu li.active {

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Dark.jpg) #000000 repeat-x;

-    }

-    #mainmenu a {

-        text-decoration: none;

-    }

-    #mainmenu a:hover {

-        color: #FFFF00;

-    }

-    #mainmenu a:active {

-        color: #FFFFFF;

-    }

-/*************** END Main Menu *************/

-/*************** Admin Menu *************/

-    #adminmenu {

-        float: left;

-        width: 100%;

-        margin: 0;

-        padding: 0;

-        list-style: none;

-        border-bottom: 1px solid #000;

-        border-right: 1px solid #000;

-        border-left: 1px solid #000;

-        border-top: 1px solid #000;

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Light.jpg) #000000 repeat;

-    }

-    #adminmenu li {

-        float: left;

-        margin: 0;

-        padding: 0 20px 0 20px;

-        border-right: 1px solid #000;

-        display: inline;

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Light.jpg) #000000 repeat-x;

-    }

-    #adminmenu li.active {

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Dark.jpg) #000000 repeat-x;

-    }

-    #adminmenu a {

-        text-decoration: none;

-    }

-    #adminmenu a:hover {

-        color: #FFFF00;

-    }

-    #adminmenu a:active {

-        color: #FFFFFF;

-    }

-/*************** END Main Menu *************/

-/*************** Page Header *********************/

-    #pageheader {

-        background: ;

-    }

-/*************** END Page Header *****************/

-    .navitem

-    {

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Light.jpg) #000000 repeat-x;

-        vertical-align: top;

-        text-align: center;

-    }

-    .header1 

-    { 

-	color: #8B8B00; 

-	font-family: Verdana; 

-	font-size: <?php echo conf('font_size') + 6; ?>px; 

-	font-weight: 900;

-    }

-    .header2

-    {

-    	color: #8B8B00;

-	font-family: Verdana;

-	font-size: <?php echo conf('font_size') + 2; ?>px;

-	font-weight: 900;

-    }

-    .active_navitem

-    {

-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/Dark.jpg)  repeat-x;

-        vertical-align: top;

-        text-align: center;

-    }

-	.headrow 

-		{

-		background:#FFFF00;

-		font-size: 12px;

-		}

-	.odd 

-		{

-		background:#FFFF00;

-		font-size: 12px;

-		}

-	.even

-		{

-		background:#FFFF00;

-		font-size: 12px;

-		}

-    .blank

-        {

-        background: #fff;

-        }

-	.border 

-		{ 

-		background:; 

-		}

-	.header 

-		{ 

-		font-size: 12px; 

-		}

- 	.error	

-		{ 

-		color: #990033; 

-		}

-	.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; ?>px;

-		font-weight: 900;

-		text-align: center;

-		}

-	.disabled

-		{

-		text-decoration: line-through;

-		}

-	.alphabet 

-		{ 

-		font-size: 12px; 

-		font-weight: normal; 

-		}

--->

-</style>

+<!--
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+-->
+p { 
+	color: #8B8B00;
+}
+
+a { 
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+}
+a:visited 
+	{ 
+	color: #8B8B00; 	
+	font-family: Verdana, Helvetica, sans-serif; 
+	}
+a:active  { 
+	color: #8B8B00; 
+	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: #FFFF00;
+	border-right:2px solid #000000;
+	border-bottom:2px solid #000000;
+	border-left:2px solid #000000;
+	border-top:2px solid #000000;
+}
+.selected_button {
+	background-color: #FFFF00;color:white;
+}
+.unselected_button {
+	/* there really isn't anything for this */
+}
+.display {}
+
+table.tabledata {}
+td { 
+	padding: 0px 8px 0px 8px;
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px;
+}
+th {
+	padding-right: 10px;
+}
+input {
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	font-weight: bold; 
+	background-color: #000000; 
+	margin: 2px 2px 2px 2px;
+}
+select	{ 
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	background-color: #000000; 
+}
+textarea { 
+	background-color: #000000;
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+}
+.table-header {
+/*	background: url(../themes/classic/images/ampache-light-bg.gif) #000000 repeat-x;*/
+        background: url(../images/Dark.jpg) #000000 repeat-x;
+	vertical-align: top;
+}
+    .header1 
+    { 
+	color: #8B8B00; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 18px; 
+	font-weight: 900;
+    }
+    .header2
+    {
+    	color: #8B8B00
+	font-family: Verdana, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: 900;
+    }
+	.headrow 
+		{
+		background:#FFFF00;
+		font-size: 12px;
+		}
+	.odd 
+		{
+		background:#FFFF00;
+		font-size: 12px;
+		}
+	.even
+		{
+		background:#FFFF00;
+		font-size: 12px;
+		}
+.blank {
+	background: #ffff00;
+}
+.border { 
+	background:#000000; 
+}
+.header { 
+	font-size: 12px; 
+}
+.error { 
+	color: #990033; 
+}
+.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: url(../images/Solar.jpg) repeat-x;
+	padding-top: 0px;
+	margin-top: 0px;
+	margin-left: 0px;
+	margin-right: 0px; 
+	font-size: 12px;
+	font-family: Verdana;
+	color: #8B8B00;
+}
+
+#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:#FFFF00 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:25px;
+}
+
+#sidebar h3 {
+    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: #000000;
+}
+
+#sidebar li {
+    margin: 0;
+    float: left;
+    display: block;
+    border: transparent;
+    border-top: 1px solid #FFFFFF;
+    padding: 5px 0px 5px 10px;
+    width: 10.5em;
+    background: #000000 repeat-x;
+}
+
+#sidebar ul.subnavside li {
+    border: 1px solid #000000;
+    background: url(../images/Mid.jpg) #000000 no-repeat;
+}
+
+#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;
+}
+
+#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: #000000 no-repeat;
+}
+
+
+#sidebar #activetopmenu {
+        background: url(../images/Dark.jpg) #000000 no-repeat;
+	}
+#sidebar #activesubmenu {
+        background: url(../images/Dark.jpg) #DDDDDD no-repeat;
+}
+#sidebar li:hover, #sidebar li.sfhover {
+        left: auto;  /* this calls the submenu back when the parent li is hovered. */
+        background: url(../images/Dark.jpg) #000000 no-repeat;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* 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: #FFFF00 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 #000000;
+}
+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: 80px;
+	padding-top:3px;
+	padding-left:10px;
+}
+#topbarright { 
+	float: right;
+	font-size: 10px;
+}
+#topbarleft, #topbarleft a{ 
+	float: left;
+}
+
+/* Box Related Styles */
+.box { 
+	padding:0px;
+	background: #FFFF00;
+	margin:10px;
+}
+.box-title { 
+	border-bottom: solid 1px #000000;
+	font-weight: bold;
+        background: url(../images/Dark.jpg) #000000 repeat-x;
+}
+.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: #FFFF00;
+	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: #FFFF00;
+	border:1px solid #000000;
+ 	padding-left:2px;
+	padding-right:2px;
+	text-decoration: none;
+}
+.text-action #pt_active {
+	background: #FFFF00;
+	color: #ffffff;
+	border:1px solid #000000;
+}
+#nowplaying {
+	width:650px;
+	background: #FFFF00;
+}
+.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 #000000;
+        border-bottom: none;
+        background: #FFFF00;
+        text-decoration: none;
+}
+
+#tablist li a:link { color: #8B8B00; }
+#tablist li a:visited { color: #8B8B00; }
+
+#tablist li a:hover {
+        color: #8B8B00;
+        background: #FF5500;
+        border-color: #000000;
+}
+
+#tablist li a#current {
+        color: #8B8B00;
+        background: #000000;
+        border-color: #FF5500;
+        border-bottom: 1px solid #FF5500;
+}
+
diff --git a/contrib/themes/Solar/theme.cfg.php b/contrib/themes/Solar/theme.cfg.php
index dac52d85..7ee192eb 100755
--- a/contrib/themes/Solar/theme.cfg.php
+++ b/contrib/themes/Solar/theme.cfg.php
@@ -16,16 +16,30 @@ name = "Solar"
 # This is just a way of giving credit to the 

 # person who actually created this theme

 # DEFAULT: N/A

-#author = "Nobody You known where to find"

+author = "TS modified by Terence Theijn"

 

 # Theme Maintainer

 # This is just a way of listing who is responsible for

 # maintaining this theme incase it's not working right

 # please include an e-mail address so you can be contacted

 # DEFAULT: N/A

-#maintainer = "TS"

-

-version = "1.0"

+maintainer = "TS"

+

+# 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

 ###################