From c67234974d578cacfd354b103e1f166e8ea2c426 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 18 Dec 2008 07:32:34 +0000
Subject: Refactor site admin menu into a theme function and build the menus in
 the various modules.  In the process, rename xxx_menu::site_navigation() to
 just xxx_menu::site().  And add xxx_menu::admin().

The menus are the same as before, but I changed the HTML to be
consistent with the way that we do it in the regular site, and this
broke the superfish styles.  I don't know how to fix this.. help me
Chad!
---
 themes/admin_default/views/admin.html.php | 35 +++----------------------------
 themes/default/views/header.html.php      |  2 +-
 2 files changed, 4 insertions(+), 33 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 8b3cede3..c221612f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -73,38 +73,9 @@
             <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li>
           </ul>
           <img src="<?= $theme->url("images/logo.png") ?>" id="gLogo" alt="Gallery 3: Your Photos on Your Web Site" />
-          <ul id="gSiteAdminMenu" class="sf-menu sf-navbar">
-            <li id="dashboard">
-              <a href="<?= url::site("admin/dashboard") ?>">Dashboard</a>
-              <li>
-            <li><a href="#">General Settings</a><li>
-            <li class="current"><a href="#">Content</a>
-              <ul>
-                <li><a href="#">Comments</a>
-                  <ul>
-                    <li><a href="#">Comment moderation</a></li>
-                  </ul>
-                </li>
-                <li><a href="#">Tags</a><li>
-              </ul>
-            </li>
-            <li><a href=#>Modules</a></li>
-            <li><a href=#>Presentation</a>
-              <ul>
-                <li><a href="#">Themes</a></li>
-                <li><a href="#">Image sizes</a><li>
-              </ul>
-            </li>
-            <li><a href="#">Users/Groups</a>
-              <ul>
-                <li><a href="<?= url::site("admin/users") ?>">List Users</a></li>
-                <li><a href="#">Create new user</a><li>
-                <li><a href="#">Edit Profile</a></li>
-              </ul>
-            </li>
-            <li><a href="#">Maintenance</a><li>
-            <li><a href="#">Statistics</a><li>
-          </ul>
+          <div id="gSiteAdminMenu" class="gClearFix">
+            <?= $theme->admin_menu() ?>
+          </div>
           <!--ul id="gBreadcrumbs" class="gClearFix">
             <li><a href="#">Dashboard</a></li>
           </ul-->
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 89d105fb..d6b055e4 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -3,7 +3,7 @@
 <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 
 <div id="gSiteMenu" class="gClearFix">
-<?= $theme->site_navigation() ?>
+<?= $theme->site_menu() ?>
 </div>
 
 <?= $theme->header_bottom() ?>
-- 
cgit v1.2.3