From ae70bce26c2f39da93c85a082602d58dcf13652e Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 24 Sep 2006 03:15:05 +0000
Subject: more updates to the theme stuff

---
 lib/class/genre.class.php |  4 +++-
 lib/init.php              |  2 +-
 lib/ui.lib.php            | 27 ++++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index 49b21c52..5723ec7a 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -274,10 +274,12 @@ class Genre {
 	 */
 	function show_match_list($match) { 
 
+		require (conf('prefix') . '/templates/show_box_top.inc.php');
 		show_alphabet_list('genre','browse.php',$match,'genre');
 		/* Detect if it's Browse, and if so don't fill it in */
 		if ($match == 'Browse') { $match = ''; } 
-		show_alphabet_form($match,_("Show Genres starting with"),"browse.php?action=genre&amp;match=$match");
+		show_alphabet_form($match,_('Show Genres starting with'),"browse.php?action=genre&amp;match=$match");
+		require (conf('prefix') . '/templates/show_box_bottom.inc.php');
 
 	} // show_match_list
 
diff --git a/lib/init.php b/lib/init.php
index 329d1494..865593fa 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.2 Build (002)';
+$results['version']		= '3.3.2 Build (003)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 7bca9ed2..f4783b53 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -210,7 +210,6 @@ 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);
@@ -224,7 +223,7 @@ function show_alphabet_list ($type,$script="artist.php",$selected="false",$actio
 
 	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
 
 /**
@@ -627,7 +626,7 @@ function show_local_catalog_info() {
 	if (!mysql_num_rows($db_results)) {
 		$items[] = "<span align=\"center\" class=\"error\">" . _("No Catalogs Found!") . "</span><br />";
 		$items[] = "<a href=\"" . conf('web_path') . "/admin/catalog.php?action=show_add_catalog\">" ._("Add a Catalog") . "</a>";
-		show_info_box(_("Catalog Statistics"),'catalog',$items);
+		show_info_box(_('Catalog Statistics'),'catalog',$items);
 		return false;
 	}
 
@@ -1264,4 +1263,26 @@ function show_catalog_select($name='catalog',$catalog_id=0,$style='') {
 
 } // show_catalog_select
 
+/**
+ * show_box_top
+ * This function requires the top part of the box
+ * it takes title as an optional argument
+ */
+function show_box_top($title='') { 
+
+	require (conf('prefix') . '/templates/show_box_top.inc.php');	
+
+} // show_box_top
+
+/**
+ * show_box_bottom
+ * This function requires the bottom part of the box
+ * it does not take any arguments
+ */
+function show_box_bottom() { 
+
+	require (conf('prefix') . '/templates/show_box_bottom.inc.php');
+
+} // show_box_bottom
+
 ?>
-- 
cgit