Created admin controller and made admin obey admin theme settings

4 files changed, 36 insertions, 5 deletions

diff --git a/core/config/config.php b/core/config/config.php
index 9d08aef3..0f57baae 100644
--- a/core/config/config.php
+++ b/core/config/config.php
@@ -119,6 +119,7 @@ $config['extension_prefix'] = 'MY_';
 $config['modules'] = array(
   MODPATH . 'forge',
   THEMEPATH . 'default',
+  THEMEPATH . 'default_admin'
 );
 
 if (defined('TEST_MODE')) {
diff --git a/core/controllers/admin.php b/core/controllers/admin.php
new file mode 100644
index 00000000..10c0b120
--- /dev/null
+++ b/core/controllers/admin.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");

+/**

+ * Gallery - a web based photo album viewer and editor

+ * Copyright (C) 2000-2008 Bharat Mediratta

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or (at

+ * your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.

+ */

+class Admin_Controller extends Controller {

+  public function dashboard() {

+    // giving default is probably overkill

+    $theme_name = module::get_var("core", "active_admin_theme", "default_admin");

+

+    $template = new Theme_View("dashboard.html", "admin", $theme_name);

+

+    print $template;

+  }

+}

+

diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php
index a8952315..ecf4c184 100644
--- a/core/helpers/core_menu.php
+++ b/core/helpers/core_menu.php
@@ -66,7 +66,7 @@ class core_menu_Core {
           Menu::factory("link")
           ->id("site_admin")
           ->label(_("Site Admin"))
-          ->url(url::file("themes/default_admin/dashboard.html")));
+          ->url(url::site("admin/dashboard")));
       }
     }
   }
diff --git a/themes/default_admin/dashboard.html b/themes/default_admin/views/dashboard.html.php
index d53b5cd4..e3456d98 100644
--- a/themes/default_admin/dashboard.html
+++ b/themes/default_admin/views/dashboard.html.php
@@ -5,12 +5,12 @@
     <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="../default/css/screen.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="../default/jquery/superfish.css" type="text/css" media="screen,projection">
-    <link rel="stylesheet" href="../default/jquery/superfish-navbar.css" type="text/css" media="screen,projection">
-    <script src="../default/jquery/superfish.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>
     <script type="text/javascript"> 
       $(document).ready(function(){ 
         $("ul.sf-menu").superfish({