wupis

4 files changed, 38 insertions, 18 deletions

diff --git a/lib/general.lib.php b/lib/general.lib.php
index 654bc5ac..5eb5a6c1 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -692,7 +692,8 @@ function show_info_box ($title, $type, $items) {
 
         $web_path = conf('web_path');
         $popular_threshold = conf('popular_threshold');
-
+require (conf('prefix') . '/templates/show_box.inc.php');
+return true;
        echo "<table class=\"border\" cellspacing=\"1\" cellpadding=\"3\" width=\"100%\" border=\"0\">";
        echo "   <tr class=\"table-header\">";
 
diff --git a/templates/default.css b/templates/default.css
index e2f094f7..c6ea0848 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -92,7 +92,7 @@ textarea {
 	font-size: 12px; 
 }
 .table-header {
-	background: url(themes/classic/images/ampache-light-bg.gif) #dddddd repeat-x;
+	background: url(../themes/classic/images/ampache-light-bg.gif) #dddddd repeat-x;
 	vertical-align: top;
 }
     .header1 
@@ -192,7 +192,7 @@ body{
 	margin-top:7px;
 	margin-left:135px;
 	/*float:left;  use for horizontal menu; comment out otherwise */
-	/* background:#fff url("themes/classic/images/bg_content.gif") repeat-y right top; */
+	/* background:#fff url("../themes/classic/images/bg_content.gif") repeat-y right top; */
 }
 
 h3#content_title{
@@ -202,7 +202,7 @@ h3#content_title{
 	color:#fff;
 	margin:0px;
 	padding:0px;
-	background:#8B8B8B url("themes/classic/images/content_corner.gif") no-repeat right top;
+	background:#8B8B8B url("../themes/classic/images/content_corner.gif") no-repeat right top;
 }
 
 h3#content_title span {
@@ -217,7 +217,7 @@ div#Header{
 }
 
 #Header h1 { 
-	background: transparent url("themes/classic/images/bg_login_0.jpg") no-repeat top left; 
+	background: transparent url("../themes/classic/images/bg_login_0.jpg") no-repeat top left; 
 	border:0px; 
 	width: 439px; 
 	height: 84px; 
@@ -256,7 +256,7 @@ div#sidebar{
 	position:absolute;
 	left:5px;
 	top:87px;
-	background:url("themes/classic/images/bg_navigation.gif") repeat-y left;	
+	background:url("../themes/classic/images/bg_navigation.gif") repeat-y left;	
 }
 
 #sidebar h3 {
@@ -265,7 +265,7 @@ div#sidebar{
 	height: 28px; 
 	margin:0px;
 	padding:0px; 
-	background: transparent url("themes/classic/images/sidebar_top.jpg") no-repeat left; 
+	background: transparent url("../themes/classic/images/sidebar_top.jpg") no-repeat left; 
 
 }
 	
@@ -335,7 +335,7 @@ div#sidebar{
 	height: 18px;
 	padding: 0px;
 	margin: 0px;
-	background: #fff url("themes/classic/images/tb_tab.jpg") no-repeat top left;
+	background: #fff url("../themes/classic/images/tb_tab.jpg") no-repeat top left;
 }
 
 #np_container1 h1{
@@ -353,7 +353,7 @@ div#sidebar{
 	font-size: 10px;
 	line-height: 12px;
 	color: #000;
-	background: #D6D6D4 url("themes/classic/images/bg_row.jpg") repeat top left;
+	background: #D6D6D4 url("../themes/classic/images/bg_row.jpg") repeat top left;
 }
 
 	
@@ -365,7 +365,7 @@ div#sidebar{
 	text-align:center;
 }
 #container h1{
-	background:url("themes/classic/images/bg_login_0.jpg") no-repeat;
+	background:url("../themes/classic/images/bg_login_0.jpg") no-repeat;
 	height:81px;
 	margin-bottom:8px;
 }
@@ -373,7 +373,7 @@ div#sidebar{
 	display:none;
 }
 #container div{
-	background:url("themes/classic/images/bg_login_1.jpg") no-repeat;
+	background:url("../themes/classic/images/bg_login_1.jpg") no-repeat;
 	height:285px;
 }
 #loginp_0{
@@ -501,22 +501,22 @@ li.current-rating{
 }
 /* Box Related Styles */
 .box-left-top { 
-	background: url(themes/classic/images/topleft.gif) no-repeat;
+	background: url(../themes/classic/images/topleft.gif) no-repeat;
 	height:16px;
 }
 .box-left-bottom {
-        background: url(themes/classic/images/bottomleft.gif) no-repeat;
+        background: url(../themes/classic/images/bottomleft.gif) no-repeat;
 	height:18px;
 }
 .box-left { 
-	background: url(themes/classic/images/left.gif);
+	background: url(../themes/classic/images/left.gif);
 }
 .box-bottom { 
-	background: url(themes/classic/images/bottom.gif);
+	background: url(../themes/classic/images/bottom.gif);
 	height:18px;
 }
 .box-right-bottom { 
-	background: url(themes/classic/images/bottomright.gif) no-repeat;
+	background: url(../themes/classic/images/bottomright.gif) no-repeat;
 }
 .confirmation-box {
 	padding-left:5px;
diff --git a/templates/show_box.inc b/templates/show_box.inc.php
index bf0f10a1..324912c9 100644
--- a/templates/show_box.inc
+++ b/templates/show_box.inc.php
@@ -20,17 +20,31 @@
 
 */
 ?>
-<table class="border" cellspacing="1" cellpadding="3">
-<tr align="center">
+<table class="border" cellspacing="0" cellpadding="0">
+<tr>
+	<td class="box-left-top"></td>
+	<td class="box-top"></td>
+	<td class="box-right-top"></td>
+</tr>
+<tr>
+	<td class="box-left" rowspan="2"></td>
 	<td background="<?php echo conf('web_path'); ?>/images/ampache-light-bg.gif" bgcolor="#c0c0c0"><?php echo $title; ?></td>
+	<td class="box-right" rowspan="2"></td>
 </tr>
 <tr>
 	<td class="even">
+	<ol>
 	<?php
 		foreach ($items as $item) {
 			echo $item;
 		}
 	?>
+	</ol>
 	</td>
 </tr>
+<tr>
+        <td class="box-left-bottom"></td>
+        <td class="box-bottom"></td>
+        <td class="box-right-bottom"></td>
+</tr>
 </table>
diff --git a/templates/tool_box.inc b/templates/tool_box.inc
index 02f6dd13..44619609 100644
--- a/templates/tool_box.inc
+++ b/templates/tool_box.inc
@@ -28,6 +28,11 @@
 ?>
 
 <table class="border" cellspacing="1" cellpadding="3" >
+<tr class="box-top">
+        <td class="box-left-top"></td>
+        <td class="box-center-top"></td>
+        <td class="box-right-top"></td>
+</tr>
 <tr class="table-header" align="center">
 	<th><?php echo $title; ?></th>
 </tr>