From cb92d1a70dfe6e14c9f76b322bff038564acc7d6 Mon Sep 17 00:00:00 2001
From: Felix Rabinovich <virshu@users.sourceforge.net>
Date: Sun, 14 Dec 2008 04:16:38 +0000
Subject: 1. fix up the <link> and <script> elements in the dashboard <head>.
 2. made the images work properly

---
 core/controllers/admin.php                    |  6 ++++++
 themes/default_admin/views/dashboard.html.php | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/core/controllers/admin.php b/core/controllers/admin.php
index ee2d88ff..5fadd885 100644
--- a/core/controllers/admin.php
+++ b/core/controllers/admin.php
@@ -21,8 +21,14 @@ class Admin_Controller extends Controller {
   public function dashboard() {
     // giving default is probably overkill
     $theme_name = module::get_var("core", "active_admin_theme", "default_admin");
+    // For now, in order not to duplicate js and css, keep the regular ("item")
+    // theme in addition to admin theme.
+    // Be careful, though - new Theme_View sets global theme as well!
+    $item_theme_name = module::get_var("core", "active_theme", "default");
+    $item_theme = new Theme_View("album.html", "album", $item_theme_name);
 
     $template = new Theme_View("dashboard.html", "admin", $theme_name);
+    $template->item_theme = $item_theme;
 
     print $template;
   }
diff --git a/themes/default_admin/views/dashboard.html.php b/themes/default_admin/views/dashboard.html.php
index f5b00175..fa831a48 100644
--- a/themes/default_admin/views/dashboard.html.php
+++ b/themes/default_admin/views/dashboard.html.php
@@ -5,13 +5,13 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <title>G3: Admin Dashboard</title>
-    <link rel="stylesheet" href="../../lib/yui/reset-fonts-grids.css" type="text/css" media="screen,projection">
-    <link rel="stylesheet" href="../../themes/default/css/screen.css" type="text/css" media="screen,projection">
-    <script src="../../lib/jquery.js"></script>
-    <script src="../../lib/jquery-ui.packed.js"></script>
-    <link rel="stylesheet" href="../../themes/default/jquery/superfish.css" type="text/css" media="screen,projection">
-    <link rel="stylesheet" href="../../themes/default/jquery/superfish-navbar.css" type="text/css" media="screen,projection">
-    <script src="../../themes/default/jquery/superfish.js"></script>
+    <link rel="stylesheet" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" type="text/css" media="screen,projection">
+    <link rel="stylesheet" href="<?= $item_theme->url("css/screen.css") ?>" type="text/css" media="screen,projection">
+    <script src="<?= url::file("lib/jquery.js") ?>"></script>
+    <script src="<?= url::file("lib/jquery-ui.packed.js") ?>"></script>
+    <link rel="stylesheet" href="<?= $item_theme->url("jquery/superfish.css") ?>" type="text/css" media="screen,projection">
+    <link rel="stylesheet" href="<?= $item_theme->url("jquery/superfish-navbar.css") ?>" type="text/css" media="screen,projection">
+    <script src="<?= $item_theme->url("jquery/superfish.js") ?>"></script>
     <script type="text/javascript"> 
       $(document).ready(function(){ 
         $("ul.sf-menu").superfish({ 
@@ -38,7 +38,7 @@
         background-color: #e7e7e7;
         margin: -.4em;
         padding: .2em .6em;
-        background: #f4f4f4 url('../default/images/ico-draggable.png') no-repeat center right;
+        background: #f4f4f4 url('<?= $item_theme->url("images/ico-draggable.png") ?>') no-repeat center right;
         cursor: move;
       }
       .gClose {
@@ -68,7 +68,7 @@
             <li><a href="/index.php/album/1">View the Gallery</a></li>
             <li id="gLoginLink"><a href="/index.php/logout">Logout</a></li>
           </ul>
-          <img src="../default/images/logo.png" id="gLogo" alt="Gallery 3: Your Photos on Your Web Site" />
+          <img src="<?= $item_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><a href="#">Dashboard</a><li>
             <li><a href="#">General Settings</a><li>
@@ -142,7 +142,7 @@
                 <h2>Photo Stream</h2>
                 <div class="gBlockContent">
                   <p>Recent photos added to your Gallery</p>
-                  <img src="images/photostream.png" alt="" />
+                  <img src="<?= $theme->url("images/photostream.png") ?>" alt="" />
                   <p class="gWarning">Slider type of display. Show titles underneath or on hover. Draw a keyline around albums, or differentiate some how. Each will be linked to item view</p>
                 </div>
               </div>
-- 
cgit v1.2.3

