From 6232e0f8d78c2555e64672341c54916cc0e8b3ed Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Thu, 28 Sep 2006 03:18:50 +0000
Subject: flatened out greyblock theme per a request

---
 templates/show_artist.inc | 6 +++---
 templates/sidebar.inc.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/templates/show_artist.inc b/templates/show_artist.inc
index 64e00a5a..d6d4f17f 100644
--- a/templates/show_artist.inc
+++ b/templates/show_artist.inc
@@ -29,7 +29,7 @@ $web_path = conf('web_path');
 <br />
 <?php require (conf('prefix') . '/templates/show_artist_box.inc.php'); ?>
 <!-- *** Multi-Album Art Display Thx MrBlahh Updated by clader *** -->
-<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
+<?php show_box_top(); ?>
 <form id="songs" method="post" enctype="multipart/form-data" action="artists.php">
 <table class="border" cellspacing="0" cellpadding="0" border="0">
 <tr class="table-header">
@@ -65,7 +65,7 @@ foreach ($albums as $album) {
 		<td>
 		<a href="<?php echo $web_path; ?>/song.php?action=album&amp;album_id=<?php echo $id; ?>"><?php echo _('Play'); ?></a>
 		<?php if (batch_ok()) { ?>
-			| <a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>"><?php echo _("Download"); ?></a>
+			| <a href="<?php echo $web_path; ?>/batch.php?action=alb&amp;id=<?php echo $album->id; ?>"><?php echo _('Download'); ?></a>
 		<?php } ?> 
 		</td>
 	</tr>
@@ -77,4 +77,4 @@ foreach ($albums as $album) {
 <input type="hidden" name="type" value="album" />
 <input type="hidden" name="artist_id" value="<?php echo $artist_id; ?>" />
 </form>
-<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
+<?php show_box_bottom(); ?>
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index d47e2711..9b4ce0d5 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -64,12 +64,12 @@ $web_path = conf('web_path');
                     }?>>
 		<a href="<?php echo $web_path; ?>/admin/index.php"><?php echo _('Admin'); ?></a>
 	<?php
-		if ($GLOBALS['theme']['submenu'] != 'simple') {
+		if ($GLOBALS['theme']['submenu'] != 'simple' AND $GLOBALS['theme']['submenu'] != 'full') {
 			show_submenu($admin_items); 
 			echo "\t</li>\n";
 		} 
 		else { 
-			if ($location['section'] == 'admin') {
+			if ($location['section'] == 'admin' || $GLOBALS['theme']['submenu'] == 'full') {
 				echo "\t</li>\n";
 				show_submenu($admin_items);
 			} 
@@ -91,12 +91,12 @@ $web_path = conf('web_path');
                     }?>>
 		<a href="<?php echo $web_path; ?>/browse.php"><?php echo _("Browse"); ?></a> 
 		<?php 
-		if ($GLOBALS['theme']['submenu'] != 'simple') { 
+		if ($GLOBALS['theme']['submenu'] != 'simple' AND $GLOBALS['theme']['submenu'] != 'full') { 
 			show_submenu($browse_items);
 			echo "\t</li>\n";
 		}
 		else { 
-			if ($location['section'] == 'browse') { 
+			if ($location['section'] == 'browse' || $GLOBALS['theme']['submenu'] == 'full') { 
 				echo "\t</li>\n";
 				show_submenu($browse_items);
 			}
-- 
cgit