From 34238a29aade796f30911c567eace0e1518eb470 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sat, 23 Sep 2006 23:28:18 +0000
Subject: to keep infamys eyes from bleeding

---
 lib/general.lib.php | 36 +-----------------------------------
 lib/ui.lib.php      | 25 +++----------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

(limited to 'lib')

diff --git a/lib/general.lib.php b/lib/general.lib.php
index 5eb5a6c1..7fcb86e9 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -692,41 +692,7 @@ 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\">";
-
-
-        if ($type == 'your_song') {
-                echo "<td>$title - <a href=\"$web_path/song.php?action=your_popular_songs&amp;limit=$popular_threshold\">" . _('Play') . "</a></td>\n";
-        }
-        elseif ($type == 'song') {
-                echo "<td>$title - <a href=\"$web_path/song.php?action=popular_songs&amp;limit=$popular_threshold\">" . _('Play') . "</a></td>\n";
-        }
-        else {
-                echo "<td>$title</td>\n";
-        }
-
-        print <<<ECHO
-  </tr>
-  <tr class="even">
-    <td align="left">
-      <ol>
-
-ECHO;
-
-        foreach ($items as $item) {
-                echo "$item\n";
-        }
-
-        print <<<ECHO
-      </ol>
-    </td>
-  </tr>
-</table>
-
-ECHO;
+	require (conf('prefix') . '/templates/show_box.inc.php');
 
 } // show_info_box
 
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 3b7d7150..7bca9ed2 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -83,26 +83,6 @@ function clear_now_playing() {
 
 } // clear_now_playing
 
-/**
- *  show_tool_box
- * shows the toolbox
- */
-function show_tool_box ($title, $items) {
-
-	include(conf('prefix') . "/templates/tool_box.inc");
-
-}// show_tool_box
-
-/**
- *  show_box
- * shows a generic box
- */
-function show_box($title,$items) {
-
-	include(conf('prefix') . "/templates/show_box.inc");
-
-} // show_box
-
 /**
  *  show_menu_items
  * shows menu items
@@ -229,7 +209,8 @@ function show_alphabet_list ($type,$script="artist.php",$selected="false",$actio
 
 	$style_name = "style_" . strtolower($selected);
 	${$style_name} = "style=\"font-weight:bold;\"";
-
+	unset($title);
+	require (conf('prefix') . '/templates/show_box_top.inc.php'); 
 	echo "<div class=\"alphabet\">";
 	foreach ($list as $l) {
 		$style_name = "style_" . strtolower($l);
@@ -242,8 +223,8 @@ function show_alphabet_list ($type,$script="artist.php",$selected="false",$actio
 	} // if we are on the albums page
 
 	echo " <a href=\"". conf('web_path') ."/$script?action=$action&amp;match=Show_all\" $style_show_all>" . _("Show all") . "</a>";
-
 	echo "</div>\n";
+	require (conf('prefix') . '/templates/show_box_bottom.inc.php');
 } // show_alphabet_list
 
 /**
-- 
cgit