From b03fc52d3b56b474bc760b30582a2a3514a402e7 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 29 Nov 2005 22:29:07 +0000
Subject: new themes!

---
 .../themes/Clean/images/ampache-light-bg_lg.GIF    | Bin 0 -> 92 bytes
 contrib/themes/Clean/screencap/01.jpg              | Bin 0 -> 98880 bytes
 contrib/themes/Clean/screencap/02.jpg              | Bin 0 -> 75275 bytes
 contrib/themes/Clean/templates/style.inc           | 270 ++++++++++-----------
 contrib/themes/Clean/theme.cfg.php                 |   6 +-
 5 files changed, 132 insertions(+), 144 deletions(-)
 create mode 100644 contrib/themes/Clean/images/ampache-light-bg_lg.GIF
 create mode 100644 contrib/themes/Clean/screencap/01.jpg
 create mode 100644 contrib/themes/Clean/screencap/02.jpg

(limited to 'contrib/themes/Clean')

diff --git a/contrib/themes/Clean/images/ampache-light-bg_lg.GIF b/contrib/themes/Clean/images/ampache-light-bg_lg.GIF
new file mode 100644
index 00000000..5ae371ea
Binary files /dev/null and b/contrib/themes/Clean/images/ampache-light-bg_lg.GIF differ
diff --git a/contrib/themes/Clean/screencap/01.jpg b/contrib/themes/Clean/screencap/01.jpg
new file mode 100644
index 00000000..a8696c60
Binary files /dev/null and b/contrib/themes/Clean/screencap/01.jpg differ
diff --git a/contrib/themes/Clean/screencap/02.jpg b/contrib/themes/Clean/screencap/02.jpg
new file mode 100644
index 00000000..ab1f8fb8
Binary files /dev/null and b/contrib/themes/Clean/screencap/02.jpg differ
diff --git a/contrib/themes/Clean/templates/style.inc b/contrib/themes/Clean/templates/style.inc
index 9badb331..1f5cf5fc 100755
--- a/contrib/themes/Clean/templates/style.inc
+++ b/contrib/themes/Clean/templates/style.inc
@@ -31,72 +31,76 @@
 	with css, I'm sure this could be done much more effeciently...
 */
 $border2="1pt solid Silver";
-$font1="font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;";
 ?>
 <style type="text/css">
 <!--
-body{
-	<?php echo $font1;?>
-	color: <?php echo conf('font_color1'); ?>;
-}
-
-p{
-	<?php echo $font1;?>
-	color: <?php echo conf('font_color1'); ?>;
-}
-ol{list-style:decimal;}
-ul{list-style:disc;}
-a{<?php echo $font1;?>font-weight: lighter;color:<?php echo conf('font_color2'); ?>;}
-a:link {text-decoration: none;}
-a:visited {text-decoration: none;}
-a:hover {text-decoration: underline;}
-a:active {text-decoration: underline;}
-.text-box{border: thin outset;}
-TABLE{border-collapse: separate;empty-cells:show;<?php echo $font1;?>}
+body{
+	font-family: Arial,Helvetica,sans-serif;
+   	color: <?php echo conf('font_color1'); ?>;
+	font-size: <?php echo conf('font_size'); ?>px;
+}
+p{
+    	font-family: Arial,Helvetica,sans-serif;
+   	color: <?php echo conf('font_color1'); ?>;
+	font-size: <?php echo conf('font_size'); ?>px;
+}
+ol{list-style:decimal;}
+ul{list-style:disc;}
+a{
+	color: <?php echo conf('font_color2'); ?>;
+	font-weigth:bolder;
+}
+a:link {text-decoration: none;}
+a:visited {text-decoration: none;}
+a:hover {text-decoration: underline;}
+a:active {text-decoration: underline;}
+
+img{border: 2px outset silver;}
+p img{border: none;}/*no border for ampache logo */
+.text-box{border: thin outset;}
+H3{font-size: <?php echo conf('font_size')+2; ?>px;}
+TABLE{
+	border-collapse: separate;
+	empty-cells:show;
+}
 td{color: <?php echo conf('font_color3'); ?>;padding: 0px 8px 0px 8px;}
 th{
 	border: <?php echo $border2;?>;
 	padding: 0px 8px 0px 8px;
 	vertical-align: top;
 	text-align: center;
-	<?php echo $font1;?>
-	font-style: normal;/*overrige default bolding on th*/
+	font-weight: normal;/*override default bolding on th's*/
 }
 input{
 	color: <?php echo conf('font_color3'); ?>;
-	font-size: 10px;
-	/*height:10px;*/
-}	
+	font-size: <?php echo conf('font_size'); ?>px;
+}
 select{ 
 	color: <?php echo conf('font_color3'); ?>;
-	font-size: 10px;
-	/*height:10px;*/
-}
+	font-size: <?php echo conf('font_size'); ?>px;
+}
 textarea{ 
 	color: <?php echo conf('font_color3'); ?>;
-	font-size: 10px;
+	font-size: <?php echo conf('font_size'); ?>px;
 }
-.tabledata{border-collapse: collapse;}
-.table-header
-{
+.login{border: 2px ridge Silver;}
+.npsong td{border-bottom: <?php echo $border2;?>;border-top: <?php echo $border2;?>;}
+.tabledata{border-collapse: collapse;border: <?php echo $border2;?>;}
+.table-header{
 	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif)  <?php echo conf('base_color2')?> repeat-x;
 	vertical-align: top;
 	text-align: center;
-	<?php echo $font1;?>
 	border: <?php echo $border2;?>;
-}
-.table-header td{border: <?php echo $border2;?>;}
-.table-header th{border: <?php echo $border2;?>;}
-.tabledata .table-header th{border: <?php echo $border2;?>;}
-
-.navitem{/*compatiblity with older stylesheets*/
+}
+.table-header td{border: <?php echo $border2;?>;}/*override td and add border on all fields.
+
+.navitem{/*compatiblity with older version*/
 	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif)  <?php echo conf('base_color2')?> repeat-x;
 	vertical-align: top;
 	text-align: center;
 	border: <?php echo $border2;?>;
 }
-.active_navitem{/*compatiblity with older stylesheets*/
+.active_navitem{/*compatiblity with older version*/
 	background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-dark-bg.gif) <?php echo conf('bg_color1')?> repeat-x;
 	vertical-align: top;
 	text-align: center;
@@ -109,7 +113,7 @@ textarea{
 	font-weight: 900;
 }
 .header2{
-    color: <?php echo conf('font_color2'); ?>;
+    	color: <?php echo conf('font_color2'); ?>;
 	font-family: <?php echo conf('font'); ?>;
 	font-size: <?php echo conf('font_size') + 2; ?>px;
 	font-weight: 900;
@@ -123,75 +127,60 @@ textarea{
 
 .odd {/*odd rows in multi lined tables.*/
 	background: <?php echo conf('row_color1'); ?>;
-	border:none;
+	border:none;
+	text-align: left;
 }
 
-/*do the borders for them.  we'll just do edges on odds except for first/last rows. We repeat stuff in a fruitless effort to make this more cross browser compatible*/
-.odd td:{border:none;}
-.odd td:first-child{border-bottom: none;border-left: <?php echo $border2;?>;border-top: none;	border-right: none;}
-.odd td:last-child{border-bottom: none;border-left: none;border-top: none;border-right: <?php echo $border2;?>;}
-.odd:first-child td{border-bottom: none;border-left: none;border-top: <?php echo $border2;?>;border-right: none;}/*first row center tds*/
-.odd:first-child td:first-child{border-bottom: none;border-left:<?php echo $border2;?>;border-top:<?php echo $border2;?>;border-right: none;}/*first row left td*/
-.odd:first-child td:last-child{border-bottom: none;border-left: none;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}/*first row right td*/
-.odd:last-child td{border-bottom:<?php echo $border2;?>;border-left: none;border-top: none;border-right: none;}/*last row center tds*/
-.odd:last-child td:first-child{border-bottom:<?php echo $border2;?>;border-left:<?php echo $border2;?>;border-top: none;border-right: none;}/*last row left td*/
-.odd:last-child td:last-child{border-bottom:<?php echo $border2;?>;border-left: none;border-top: none;border-right:<?php echo $border2;?>;}/*last row right td*/
-.odd td table td{border:none;}
-.odd td table td:first-child{border:none;}/*skip embedded tables.  have to specify firs/last stuff (i think)*/
-.odd td table td:last-child{border:none;}
-.odd td table td table{border:<?php echo $border2;?>;}/*color swatches on preferences page*/
-.tabledata .odd td:{border:none;}/*have to repeat some stuff with tabledata for some browsers :(*/
-.tabledata .odd td:first-child{border-bottom: none;border-left: <?php echo $border2;?>;border-top: none;	border-right: none;}
-.tabledata .odd td:last-child{border-bottom: none;border-left: none;border-top: none;border-right: <?php echo $border2;?>;}
-.tabledata .odd:first-child td{border-bottom: none;border-left: none;border-top: <?php echo $border2;?>;border-right: none;}/*first row center tds*/
-.tabledata .odd:first-child td:first-child{border-bottom: none;border-left:<?php echo $border2;?>;border-top:<?php echo $border2;?>;border-right: none;}/*first row left td*/
-.tabledata .odd:first-child td:last-child{border-bottom: none;border-left: none;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}/*first row right td*/
-.tabledata .odd:last-child td{border-bottom:<?php echo $border2;?>;border-left: none;border-top: none;border-right: none;}/*last row center tds*/
-.tabledata .odd:last-child td:first-child{border-bottom:<?php echo $border2;?>;border-left:<?php echo $border2;?>;border-top: none;border-right: none;}/*last row left td*/
-.tabledata .odd:last-child td:last-child{border-bottom:<?php echo $border2;?>;border-left: none;border-top: none;border-right:<?php echo $border2;?>;}/*last row right td*/
-
-.even{
-	background:<?php echo conf('row_color2'); ?>;/*#E4E8F2;#DADCE2;#DADFE4;#D5E1E2;#E2DDD5;#E7F7FC;*/
-	text-align: left;/*for lists on homepage*/
-	<?php echo $font1;?>
-}
-
-/*specify sides/top & bottom on evens*/
-.even td{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:none;}
-.even td:first-child{border-bottom:<?php echo $border2;?>;border-left: <?php echo $border2;?>;border-top: <?php echo $border2;?>;border-right: none;}
-.even td:last-child{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}
-.even td table tr td{border:none;}/*skip embedded tables*/
-.even td table tr td:first-child{border:none;}
-.even td table tr td:last-child{border:none;}
-.even td table td table{border:<?php echo $border2;?>;}/*color swatches on preferences page*/
-.tabledata .even td{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:none;}/*have to repeat some stuff with tabledata for some browsers :(*/
-.tabledata .even td:first-child{border-bottom:<?php echo $border2;?>;border-left: <?php echo $border2;?>;border-top: <?php echo $border2;?>;border-right: none;}
-.tabledata .even td:last-child{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}
+/*do the borders for them.  we'll just do edges on odds except for first/last rows where we add the top or bottom.*/
+.odd td {border:none;}
+.odd td:first-child{border-left: <?php echo $border2;?>}
+.odd td:last-child{border-right: <?php echo $border2;?>;}
+.odd:first-child td{border-top: <?php echo $border2;?>}
+.odd:last-child td{border-bottom:<?php echo $border2;?>}
+/*special cases*/
+.odd td table tr td{border: none;}/*skip embedded tables*/
+.odd td table tr td:first-child{border:none;}
+.odd td table tr td:last-child{border:none;}
+.odd td table td table{border:<?php echo $border2;?>;}/*color swatches on preferences page*/
+
+
+.even{
+        background:<?php echo conf('row_color2'); ?>;
+        text-align: left;/*for lists on homepage*/
+        border:none;
+}
+/*specify sides/top & bottom on evens*/
+.even td{border-bottom:<?php echo $border2;?>;border-top:<?php echo $border2;?>;}
+.even td:first-child{border-bottom:<?php echo $border2;?>;border-left: <?php echo $border2;?>;border-top: <?php echo $border2;?>;}
+.even td:last-child{border-bottom:<?php echo $border2;?>;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}
+/*special cases*/
+.even td table tr td{border:none;}/*skip embedded tables*/
+.even td table tr td:first-child{border:none;}
+.even td table tr td:last-child{border:none;}
+.even td table td table{border:<?php echo $border2;?>;}/*color swatches on preferences page*/
+
+
 
 .border{
 	border-collapse: collapse;
 	border: <?php echo $border2;?>;
 	padding: 0px 0px 0px 0px;
 }
-/*do some clean up of unwanted borders in border class with embedded even */
-/*.border .even td{border:1pt solid Silver;}*//*border inside catalog stats on home page, and album listing*/
-.border .even td{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:none;}
-.border .even td:first-child{border-bottom:<?php echo $border2;?>;border-left: <?php echo $border2;?>;border-top: <?php echo $border2;?>;border-right: none;}
-.border .even td:last-child{border-bottom:<?php echo $border2;?>;border-left: none;border-top:<?php echo $border2;?>;border-right:<?php echo $border2;?>;}
-.border .even table .even td{border:none;}/*random selection on home page*/
-.border .even td table tr td{border:none;}/*prev next on artists/albums*/
-.border .even td table tr td:first-child{border:none;}/*prev next on artists/albums*/
-.border .even td table tr td:last-child{border:none;}/*prev next on artists/albums*/
-.border .even td table td{border:none;}/*border around 'from genre' on home*/
-.border .odd td:{border:none;}/*repeat some stuff from above for border class.  browser compatability*/
-.border .odd td:first-child{border-bottom: none;border-left: <?php echo $border2;?>;border-top: none;	border-right: none;}
-.border .odd td:last-child{border-bottom: none;border-left: none;border-top: none;border-right: <?php echo $border2;?>;}
-.border .odd td table td{border:none;}
-.border .odd td table td:first-child{border:none;}/*skip embedded tables.  have to specify firs/last stuff (i think)*/
-.border .odd td table td:last-child{border:none;}
-
+
+/*do some clean up of unwanted borders in border class with embedded even/odd classes */
+.border .even table .even td{border:none;}/*random selection on home page*/
+.border .even td table tr td{border:none;}/*prev next on artists/albums*/
+.border .even td table tr td:first-child{border:none;}/*prev next on artists/albums*/
+.border .even td table tr td:last-child{border:none;}/*prev next on artists/albums*/
+.border .odd td table td{border:none;}/*skip embedded tables.*/
+.border .odd td table td:first-child{border:none;}
+.border .odd td table td:last-child{border:none;}
+.border .table-header:first-child td font{/*override with defaults because  album header is hardcoded to big*/
+	font-size: <?php echo conf('font_size'); ?>px;
+	font-weight: bolder;
+}
+
 .blank{	background: #fff;}
-
 .header{font-size: <?php echo conf('font_size'); ?>px;}
 .error{	color: <?php echo conf('error_color'); ?>;}
 .fatalerror{
@@ -212,41 +201,39 @@ textarea{
 	font-weight: normal; 
 }
 /*************** Main Menu *****************/
-    #mainmenu {
-	    float: left;
-		width: 100%;
-		margin: 0;
-		padding: 0;
-		list-style: none;
-		border-top: <?php echo $border2;?>;
-		border-bottom: <?php echo $border2;?>;
-		border-right: <?php echo $border2;?>;
-		border-left: <?php echo $border2;?>;
-	    background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2');?> repeat-x;
-    }
-    #mainmenu li {
-    	float: left;
-	margin: 0;
-        padding: 0 10px 0 10px;
-	border-right: <?php echo $border2;?>;
-        display: inline;
-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2');?> repeat-x;
-    }
-    #mainmenu li.active {
-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-dark-bg.gif) <?php echo conf('base_color2');?> repeat-x;
-    }
-    #mainmenu a {
-        text-decoration: none;
-    }
-    #mainmenu a:hover {
-        color: #000;
-        text-decoration: underline;
-    }
-    #mainmenu a:active {
-        color: #00a;
-        text-decoration: underline;
-    }
-   
+#mainmenu {
+        float: left;
+        width: 100%;
+        margin: 0;
+        padding: 0;
+        list-style: none;
+	border-top: <?php echo $border2;?>;  
+        border-bottom: <?php echo $border2;?>;
+        border-right: <?php echo $border2;?>;
+        border-left: <?php echo $border2;?>;
+        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2');?> repeat-x;
+    }
+    #mainmenu li {
+        float: left;
+        margin: 0;
+        padding: 0 10px 0 10px;
+        border-right: <?php echo $border2;?>;
+        display: inline;
+    }
+    #mainmenu li.active {
+        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-dark-bg.gif) <?php echo conf('base_color2');?> repeat-x;
+    }
+    #mainmenu a {
+        text-decoration: none;
+    }
+    #mainmenu a:hover {
+        color: #000;
+        text-decoration: underline;
+    }
+    #mainmenu a:active {
+        color: #00a;
+        text-decoration: underline;
+    }
 /*************** END Main Menu *************/
 /*************** Admin Menu *************/
     #adminmenu {
@@ -257,15 +244,14 @@ textarea{
         list-style: none;
         border-bottom: <?php echo $border2;?>;
         border-right: <?php echo $border2;?>;
-		border-left: <?php echo $border2;?>;
-		border-top: <?php echo $border2;?>;
+	border-left: <?php echo $border2;?>;
         background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2')?> repeat;
     }
     #adminmenu li {
-		float: left;
+	float: left;
         margin: 0;
-        padding: 0 20px 0 20px;
-		border-right: <?php echo $border2;?>;
+        padding: 0 10px 0 10px;
+	border-right: <?php echo $border2;?>;
         display: inline;
         background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2');?> repeat-x;
     }
@@ -287,7 +273,9 @@ textarea{
 /*************** Page Header *********************/
     #pageheader {
         background: <?php echo conf('bgcolor1');?>;
+    	
     }
+    #pageheader img{border: none;}
 /*************** END Page Header *****************/
 -->
 </style>
diff --git a/contrib/themes/Clean/theme.cfg.php b/contrib/themes/Clean/theme.cfg.php
index 9bbc295a..5637c49d 100755
--- a/contrib/themes/Clean/theme.cfg.php
+++ b/contrib/themes/Clean/theme.cfg.php
@@ -37,7 +37,7 @@ maintainer = "J <jumperooter@yahoo.com>"
 bg_color1 = "#FFFFFF"
 
 # Background Color 2
-bg_color2 = "#E6EAC6"
+bg_color2 = "#D1D8D5"
 
 # Base Color 1
 base_color1 = "#bbbbbb"
@@ -57,8 +57,8 @@ font_color3 = "#666666"
 # Row Color 1-
 row_color1 = "#ffffff"
 
-# Row Color 2-FCFCF8
-row_color2 = "#F7FAFF"
+# Row Color 2-FCFCF8
 -"#F7FAFF"
+row_color2 = "#FAFAF8"
 
 # Row Color 3
 row_color3 = "#E6EAC6"
-- 
cgit