new interface which breaks all previous themes... and current themes, still under development

6 files changed, 13 insertions, 46 deletions

diff --git a/admin/access.php b/admin/access.php
index ca7111e6..45896950 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -36,9 +36,6 @@ if (!$user->has_access(100)) {
 
 show_template('header');
 
-show_menu_items('Admin');
-show_admin_menu('Access Lists');
-show_clear();
 if ( $action == 'show_confirm_delete' ) {
         show_confirm_action(_("Do you really want to delete this Access Record?"), "admin/access.php", "access_id=" . $_REQUEST['access_id'] . "&action=delete_host");
 }
@@ -73,7 +70,6 @@ else {
 	$list = $access->get_access_list();
 	include(conf('prefix') ."/templates/show_access_list.inc");
 }
-echo "<br /><br />";
 
-show_page_footer ('Admin', 'Access Lists',$user->prefs['display_menu']);
+show_footer();
 ?>
diff --git a/admin/catalog.php b/admin/catalog.php
index c3bf3675..7716a0b4 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -38,12 +38,6 @@ $catalog = new Catalog($_REQUEST['catalog_id']);
 
 show_template('header');
 
-/* Generate the menus */
-show_menu_items('Admin');
-show_admin_menu('Catalog');
-show_clear();
-
-
 /* Big switch statement to handle various actions */
 switch ($_REQUEST['action']) {
     case 'fixed':
@@ -285,6 +279,8 @@ switch ($_REQUEST['action']) {
 	include(conf('prefix') . '/templates/catalog.inc');
 
 } // end switch
-echo "<br /><br />";
-show_page_footer ('Admin', 'Catalog',$user->prefs['display_menu']);
+
+/* Show the Footer */
+show_footer();
+
 ?>
diff --git a/admin/index.php b/admin/index.php
index 3467f2c5..dfc682b3 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -48,20 +48,6 @@ if ( $action == 'Update Preferences' ) {
 }
 
 show_template('header'); 
-show_menu_items('Admin');
-
-if ( $action == 'show_site_preferences' ) {
-	show_admin_menu('Site Preferences');
-}
-elseif ( ($action == 'show_users') || ($action == 'show_new_user')) {
-	show_admin_menu('Users');
-}
-elseif ( $action == 'show_update_catalog' ) {
-	show_admin_menu('Catalog'); 
-}
-else {
-	show_admin_menu('...');
-}
 
 if ( $action == 'Update Preferences' ) {
 	$action = 'show_preferences';
@@ -88,6 +74,5 @@ else {
 	require (conf('prefix') . "/templates/show_admin_index.inc");
 } // if they didn't pick anything
 
-show_clear();
-show_page_footer ('Admin', '',$user->prefs['display_menu']);
+show_footer();
 ?>
diff --git a/admin/mail.php b/admin/mail.php
index 2d5a0802..a69b0ead 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -83,10 +83,6 @@ if ( empty($subject) ) {
 }
 
 show_template('header');
-
-show_menu_items('Admin');
-show_admin_menu('Mail Users');
-show_clear();
 ?>
 
 <form name="mail" method="post" action="<?php echo conf('web_path'); ?>/admin/mail.php" enctype="multipart/form-data">
@@ -130,6 +126,4 @@ show_clear();
 
 </form>
 <br /><br />
-<?php  
-show_page_footer ('Admin', 'Mail Users',$user->prefs['display_menu']);
-?>
+<?php show_footer(); ?>
diff --git a/admin/preferences.php b/admin/preferences.php
index 5e64be43..46f4e6fb 100644
--- a/admin/preferences.php
+++ b/admin/preferences.php
@@ -73,9 +73,6 @@ switch(scrub_in($_REQUEST['action'])) {
 
 // HEADER
 show_template('header');
-show_menu_items('Admin');
-show_admin_menu('Admin Preferences');
-show_clear();
 // HEADER
 
 // Set Target
@@ -86,5 +83,7 @@ require (conf('prefix') . "/templates/show_preferences.inc");
 
 
 // FOOTER
-show_page_footer ('Admin', 'Admin Preferences',$user->prefs['display_menu']);
+show_footer();
+
+
 ?>
diff --git a/admin/users.php b/admin/users.php
index 4a2f0ed6..b2d6da22 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -39,10 +39,6 @@ $action = scrub_in($_REQUEST['action']);
 
 show_template('header');
 
-show_menu_items('Admin');
-show_admin_menu('Users');
-show_clear();
-
 $user_id = scrub_in($_REQUEST['user']);
 $temp_user = new User($user_id);
  
@@ -182,6 +178,7 @@ switch ($action) {
 
 }
 
-echo "<br /><br />";
-show_page_footer ('Admin', 'Users',$user->prefs['display_menu']);
+/* Show the footer */
+show_footer();
+
 ?>