Theme made compatible with newest version of Ampache

3 files changed, 480 insertions, 212 deletions

diff --git a/contrib/themes/dark/screencap/01.jpg b/contrib/themes/dark/screencap/01.jpg
index 1dcc2c1f..8576d42c 100644
--- a/contrib/themes/dark/screencap/01.jpg
+++ b/contrib/themes/dark/screencap/01.jpg
diff --git a/contrib/themes/dark/templates/default.css b/contrib/themes/dark/templates/default.css
index f8d0a99e..e63ec6c1 100644
--- a/contrib/themes/dark/templates/default.css
+++ b/contrib/themes/dark/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,257 +19,513 @@
  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: #000000; 
-  font-family: Verdana; 
-  font-size: 12px; 
-  color: #A0A0A0;
+-->
+p { 
+	color: #9E9E9E;
 }
 
-p	
-{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: 12px; 
-}
-a	
-{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
+a { 
+	color: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
 }
 a:visited 
-{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
-}
-a:active  
-{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
-}
-.text-box 
-{
-  padding-left:5px;
-  padding-top:5px;
-  margin-bottom:10px;
-  display: table-cell;
-  background-color: #404040;
-  border-right:2px solid #606060;
-  border-bottom:2px solid #606060;
-  border-left:2px solid #606060;
-  border-top:2px solid #606060;
-}
-table.tabledata
-{
-}
-
-table.login
-{
-  padding: 5px 5px 5px 5px;
-}
-
-td	
-{ 
-  padding: 0px 8px 0px 8px;
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: 12px;
-}
-th
-{
-  padding-right: 10px;
-}
-input	
-{
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: 12px; 
-  font-weight: bold; 
-  background-color: #202020; 
-  border-style: solid;
-  border-width: 1px;
-  border-color: #606060;
-  margin: 3px 3px 3px 3px;
+	{ 
+	color: #9E9E9E; 	
+	font-family: Verdana, Helvetica, sans-serif; 
+	}
+a:active  { 
+	color: #9E9E9E; 
+	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: #282828;
+	border-right:2px solid #606060;
+	border-bottom:2px solid #606060;
+	border-left:2px solid #606060;
+	border-top:2px solid #606060;
+}
+.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: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px;
+}
+th {
+	padding-right: 10px;
+}
+input {
+	color: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	font-weight: bold; 
+	background-color: #282828; 
+	margin: 2px 2px 2px 2px;
 }
 select	{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: 12px; 
-  background-color: #202020; 
-}
-textarea 
-{ 
-  background-color: #202020;
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: 12px; 
-}
-.table-header
-{
-  background: #404040;
-  vertical-align: top;
-}
-.header1 
-{ 
-  color: #A0A0A0; 
-  font-family: Verdana; 
-  font-size: <?php echo conf('font_size') + 6; ?>px; 
-  font-weight: 900;
-}
-.header2
-{
-  color: #A0A0A0;
-  font-family: Verdana;
-  font-size: <?php echo conf('font_size') + 2; ?>px;
-  font-weight: 900;
-}
-.headrow 
-{
-  background:#404040;
-  font-size: 12px;
-}
-.odd 
-{
-  background:#303030;
-  font-size: 12px;
-}
-.even
-{
-  background:#202020;
-  font-size: 12px;
-}
-.blank
-{
-  background: #fff;
+	color: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+	background-color: #282828; 
+}
+textarea { 
+	background-color: #282828;
+	color: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 12px; 
+}
+.table-header {
+/*	background: url(../themes/classic/images/ampache-light-bg.gif) #000000 repeat-x;*/
+        background: #404040 repeat-x;
+	vertical-align: top;
+}
+    .header1 
+    { 
+	color: #9E9E9E; 
+	font-family: Verdana, Helvetica, sans-serif; 
+	font-size: 18px; 
+	font-weight: 900;
+    }
+    .header2
+    {
+    	color: #9E9E9E;
+	font-family: Verdana, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: 900;
+    }
+	.headrow 
+		{
+		background:#404040;
+		font-size: 12px;
+		}
+	.odd 
+		{
+		background:#303030;
+		font-size: 12px;
+		}
+	.even
+		{
+		background:#202020;
+		font-size: 12px;
+		}
+.blank {
+	background: #fff;
+}
+.border { 
+	background:#606060; 
+}
+.header { 
+	font-size: 12px; 
+}
+.error { 
+	color: #990033; 
+}
+.fatalerror {
+	padding-top: 3px;
+	padding-left: 3px;
+	padding-right: 3px;
+	display: table-cell;
+	padding-bottom: 3px;
+	color: #FF8080;
+ border-right:4px solid #FF8080;
+ border-bottom:4px solid #FF8080;
+ border-left:4px solid #FF8080;
+ border-top:4px solid #FF8080;		
+}
+.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: #000000 repeat-x;
+	padding-top: 0px;
+	margin-top: 0px;
+	margin-left: 0px;
+	margin-right: 0px; 
+	font-size: 12px;
+	font-family: Verdana;
+	color: #9E9E9E;
+}
+
+#maincontainer{
+	margin: 0px;
+}
+
+.alphabet { 
+	margin: 10px;
+	font-size: 10px; 
+	font-weight: normal; 
 }
-.border 
-{ 
-  background:#606060; 
+
+/* 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:#8B8B8B url("../themes/classic/images/content_corner.gif") no-repeat right top;
+}
+
+h3#content_title span {
+	text-align:left;
+}
+			
+/* Styles for Header */
+div#Header{
+	height:40px;
+	margin-bottom:3px;
+	padding:0px;
 }
-.header 
-{ 
-  font-size: 12px; 
+
+#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;
 }
-.error	
-{ 
-  color: #FF8080; 
-  font-weight: bold; 
+
+#Header h2 span {
+	font-size:10px;
+	margin-left:10px;
 }
-.fatalerror
-{
-  padding-top: 3px;
-  padding-bottom: 3px;
-  color: #FF8080;
-  border-right:4px solid #FF8080;
-  border-bottom:4px solid #FF8080;
-  border-left:4px solid #FF8080;
-  border-top:4px solid #FF8080;		
-  font-size: <?php echo conf('font_size')+2; ?>px;
-  font-weight: 900;
-  text-align: center;
+
+
+/* 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;
 }
-.disabled
-{
-  text-decoration: line-through;
+
+#sidebar h3 {
+    width: 120px;
+    height: 28px;
+    margin 0px;
+    padding: 0px;
+    background: transparent;
 }
-.alphabet 
-{ 
-  font-size: 12px; 
-  font-weight: normal; 
+
+#sidebar h3 span {
+        display:none
 }
 
-/*************** Main Menu *****************/
+#sidebar ul {
+        margin: 0px;
+        list-style: none;
+        font-family:Arial, Helvetica, Sans-Serif;
+        font-size:10px;
+        padding: 0px;
+        line-height: 1.0;
+	Background-color: #282828;
+}
 
-#mainmenu {
-  float: left;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  border: 1px solid #606060;
-  background: #282828;
+#sidebar li {
+    margin: 0;
+    float: left;
+    display: block;
+    border: 1px solid #606060;
+    padding: 5px 0px 5px 10px;
+    width: 10.5em;
+    background: #282828 repeat-x;
 }
 
-#mainmenu li {
-  float: left;
-  margin: 0;
-  padding: 0 10px 0 10px;
-  border-right: 1px solid #606060;
-  display: inline;
-  background: #282828;
+#sidebar ul.subnavside li {
+    border: 1px solid #606060;
+    background: #282828 no-repeat;
 }
 
-#mainmenu li.active {
-  background: #404040;
+#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;
 }
 
-#mainmenu a {
-  text-decoration: none;
+#sidebar li:hover, #sidebar li.sfhover {
+        color:#000000;
+	background: #404040 no-repeat;
 }
 
-#mainmenu a:hover {
-  text-decoration: underline;
+#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: #282828 no-repeat;
 }
 
-#mainmenu a:active {
+#sidebar #activetopmenu {
+        background: #404040 no-repeat;
+	}
+#sidebar #activesubmenu {
+        background:  #404040 no-repeat;
 }
+#sidebar li:hover, #sidebar li.sfhover {
+        left: auto;  /* this calls the submenu back when the parent li is hovered. */
+        background: #404040 no-repeat;
+}
+
+
+
+
+
+
+
+
 
-/*************** END Main Menu *************/
 
-/*************** Admin Menu *************/
 
-#adminmenu {
-  float: left;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  border: 1px solid #606060;
-  background: #282828;
+
+
+/* Styles for Now Playing */
+
+#np_container1{
+	width: 260px;
+	height: 18px;
+	padding: 0px;
+	margin: 0px;
+	background: #282828;
 }
 
-#adminmenu li {
-  float: left;
-  margin: 0;
-  padding: 0 10px 0 10px;
-  border-right: 1px solid #606060;
-  display: inline;
-  background: #282828;
+#np_container1 h1{
+	font-size: 10px;
+	font-weight: bold;
+	padding: 2px;
+	background: #282828;
+} 
+
+#np_container2{
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-color:#606060;
+	padding: 6px;
+	font-family: Verdana, sans-serif;
+	font-size: 10px;
+	line-height: 12px;
+	color: #9E9E9E;
+	background: #282828 ;
 }
 
-#adminmenu li.active {
-  background: #404040;
+	
+/* 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;
 }
 
-#adminmenu a {
-  text-decoration: none;
+#footer p {
+	color:#9E9E9E;
+	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: #202020;
+	margin:10px;
+	border: 1px solid #606060;
+}
+.box-title { 
+	border-bottom: solid 1px #606060;
+	font-weight: bold;
+	background: #404040;
+}
+.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: #404040;
+	border-right:2px solid #606060;
+	border-bottom:2px solid #606060;
+	border-left:2px solid #606060;
+	border-top:2px solid #606060;}
 
-#adminmenu a:hover {
-  text-decoration: underline;
+.text-action, .text-action li {
+	margin-top:5px;
+	list-style: none;
+	margin-bottom:5px;
+	padding-left:0px;
+}
+.text-action a, .text-action span {
+	background: #282828;
+	border:1px solid #606060;
+ 	padding-left:2px;
+	padding-right:2px;
+	text-decoration: none;
+}
+.text-action #pt_active {
+	background: #282828;
+	color: #9E9E9E;
+	border:1px solid #606060;
+}
+#nowplaying {
+	width:650px;
+	background: #404040;
+}
+.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;
 }
 
-#adminmenu a:active {
+#tablist li {
+        list-style: none;
+        margin: 0;
+        display: inline;
 }
 
-/*************** END Main Menu *************/
+#tablist li a {
+        padding: 3px 0.5em;
+        margin-left: 3px;
+        border: 1px solid #606060;
+        border-bottom: none;
+        background: #282828;
+        text-decoration: none;
+}
 
-/*************** Page Header *********************/
+#tablist li a:link { color: #9E9E9E; }
+#tablist li a:visited { color: #9E9E9E; }
 
-#pageheader {
+#tablist li a:hover {
+        color: #9E9E9E;
+        background: #404040;
+        border-color: #606060;
 }
 
-/*************** END Page Header *****************/
+#tablist li a#current {
+        color: #9E9E9E;
+        background: #404040;
+        border-color: #FFF;
+        border-bottom: 1px solid #606060;
+}
 
--->
-</style>
diff --git a/contrib/themes/dark/theme.cfg.php b/contrib/themes/dark/theme.cfg.php
index 47a4cbf1..2c18465e 100644
--- a/contrib/themes/dark/theme.cfg.php
+++ b/contrib/themes/dark/theme.cfg.php
@@ -16,7 +16,7 @@ name = "Dark"
 # This is just a way of giving credit to the 
 # person who actually created this theme
 # DEFAULT: N/A
-author = "Nedko Arnaudov"
+author = "Nedko Arnaudov modified by Terence Theijn"
 
 # Theme Maintainer
 # This is just a way of listing who is responsible for
@@ -28,7 +28,19 @@ maintainer = "Nedko Arnaudov <nedko@users.sourceforge.net>"
 # Version
 # This is the revision for this theme, It's up to the maintainer
 # or author to decide how they want to format this
-version = "1.2"
+version = "1.3"
+
+# 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
 ###################