separate dashboard and components controllers

diff --git a/ipf/admin/app.php b/ipf/admin/app.php
index e6c5904e6a4b3641a95711e20de8dfe19ecc8bc1..27f8f524e71919b02a71a4f26a91a5cb3259bba4 100644 (file)
--- a/ipf/admin/app.php
+++ b/ipf/admin/app.php
@@ -8,6 +8,9 @@ class IPF_Admin_App extends IPF_Application
     public static function urls($prefix='admin')
     {
         return array('prefix' => '#^/'.$prefix.'/', 'urls' => array(
+            array('controller' => 'IPF_Admin_Dashboard_Controller', 'urls' => array(
+                array('regex' => '$#', 'func' => 'index'),
+            )),
             array('controller' => 'IPF_Admin_FileBrowser_Controller', 'urls' => array(
                 array('regex' => 'filebrowser/rename/$#', 'method' => 'POST', 'func' => 'rename'),
                 array('regex' => 'filebrowser/move/$#',   'method' => 'POST', 'func' => 'move'),
@@ -16,8 +19,7 @@ class IPF_Admin_App extends IPF_Application
                 array('regex' => 'filebrowser/upload/$#', 'method' => 'POST', 'func' => 'upload'),
                 array('regex' => 'filebrowser/$#'),
             )),
-            array('controller' => 'IPF_Admin_Controller', 'urls' => array(
-                array('regex' => '$#',                                              'func' => 'index'),
+            array('controller' => 'IPF_Admin_Components_Controller', 'urls' => array(
                 array('regex' => '([\w\_\-]+)/([\w\_\-]+)/$#i',                     'func' => 'listItems'),
                 array('regex' => '([\w\_\-]+)/([\w\_\-]+)/reorder/$#i',             'func' => 'reorder'),
                 array('regex' => '([\w\_\-]+)/([\w\_\-]+)/add/$#i',                 'func' => 'addItem'),

diff --git a/ipf/admin/component.php b/ipf/admin/component.php
index f07523cc1e1c30cd28517b234b4ab208144481ba..e6835316d9a929c55ededc377c7639497653787b 100644 (file)
--- a/ipf/admin/component.php
+++ b/ipf/admin/component.php
@@ -166,7 +166,7 @@ abstract class IPF_Admin_Component
     {
         $url = @$this->request->POST['ipf_referrer'];
         if (!$url)
-            $url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Controller', 'listItems'), array($this->app->slug(), $this->slug()));
+            $url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Components_Controller', 'listItems'), array($this->app->slug(), $this->slug()));
         return new IPF_HTTP_Response_Redirect($url);
     }
 

diff --git a/ipf/admin/controllers/components.php b/ipf/admin/controllers/components.php
index 399b65c422242d405e0a7bf98b0e013ca94bb7a5..89954d3c853ea709de448a27e058d05b8d6bcac3 100644 (file)
--- a/ipf/admin/controllers/components.php
+++ b/ipf/admin/controllers/components.php
@@ -1,18 +1,7 @@
 <?php
 
-class IPF_Admin_Controller extends IPF_Admin_Base_Controller
+class IPF_Admin_Components_Controller extends IPF_Admin_Base_Controller
 {
-    function index()
-    {
-        $this->ensureUserIsStaff();
-
-        $context = array(
-            'page_title' => __('Site Administration'),
-            'admin_log' => IPF_Admin_Log::recent(),
-        );
-        return $this->render('admin/index.html', $context);
-    }
-
     function listItems()
     {
         $component = $this->getComponent(array('view'));

diff --git a/ipf/admin/controllers/dashboard.php b/ipf/admin/controllers/dashboard.php
new file mode 100644 (file)
index 0000000..e751c20
--- /dev/null
+++ b/ipf/admin/controllers/dashboard.php
@@ -0,0 +1,16 @@
+<?php
+
+class IPF_Admin_Dashboard_Controller extends IPF_Admin_Base_Controller
+{
+    function index()
+    {
+        $this->ensureUserIsStaff();
+
+        $context = array(
+            'page_title' => __('Site Administration'),
+            'admin_log' => IPF_Admin_Log::recent(),
+        );
+        return $this->render('admin/index.html', $context);
+    }
+}
+

diff --git a/ipf/admin/controllers/user.php b/ipf/admin/controllers/user.php
index 6c3b3c58127f6b8beff138305fc234846f90af16..bfbb50bee34525d821faf77b6f0df229d70b5cba 100644 (file)
--- a/ipf/admin/controllers/user.php
+++ b/ipf/admin/controllers/user.php
@@ -6,7 +6,7 @@ class IPF_Admin_User_Controller extends IPF_Admin_Base_Controller
     {
         $success_url = trim(\PFF\Arr::get($this->request->REQUEST, 'next', ''));
         if (!$success_url)
-            $success_url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Controller', 'index'));
+            $success_url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Dashboard_Controller', 'index'));
 
         if ($this->request->method == 'POST') {
             $form = new IPF_Admin_Forms_Login($this->request->POST);
@@ -38,7 +38,7 @@ class IPF_Admin_User_Controller extends IPF_Admin_Base_Controller
     {
         $success_url = trim(\PFF\Arr::get($this->request->REQUEST, 'next', ''));
         if (!$success_url)
-            $success_url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Controller', 'index'));
+            $success_url = IPF_HTTP_URL::urlForView(array('IPF_Admin_Dashboard_Controller', 'index'));
 
         if (!$this->request->user->isAnonymous() && $this->request->user->is_superuser) {
             $user = \PFF\Container::auth()->findUser($this->params[1]);

diff --git a/ipf/admin/log.php b/ipf/admin/log.php
index 9425db46889a0460ab4eb3d0fe68d451dc84c8ee..22dbdce3def1b64c7349424972b78514557442b1 100644 (file)
--- a/ipf/admin/log.php
+++ b/ipf/admin/log.php
@@ -29,7 +29,7 @@ class IPF_Admin_Log
 
     public static function logObject($component, $action, $object, $object_id=null)
     {
-        $url = $object_id ? IPF_HTTP_URL::urlForView(array('IPF_Admin_Controller', 'editItem'), array($component->app->slug(), $component->slug(), $object_id)) : '';
+        $url = $object_id ? IPF_HTTP_URL::urlForView(array('IPF_Admin_Components_Controller', 'editItem'), array($component->app->slug(), $component->slug(), $object_id)) : '';
         self::log($component->request->user, $action, (string)$object, $component->verbose_name(), $url);
     }
 }

diff --git a/ipf/admin/templates/admin/base.html b/ipf/admin/templates/admin/base.html
index d63ba65006216f38be2c1b484ca338bb5b3958fc..ddaebbbbf08fa7eaa5062f910f961276fc0c2fbd 100644 (file)
--- a/ipf/admin/templates/admin/base.html
+++ b/ipf/admin/templates/admin/base.html
@@ -42,7 +42,7 @@
             <h3>{$app.name}</h3>
             <ul>
               {foreach $app.components as $component}
-              <li><a href="{url array('IPF_Admin_Controller', 'listItems'), array($app.path, $component->slug())}">{$component->verbose_name()}</a></li>
+              <li><a href="{url array('IPF_Admin_Components_Controller', 'listItems'), array($app.path, $component->slug())}">{$component->verbose_name()}</a></li>
               {/foreach}
             </ul>
           </li>

diff --git a/ipf/admin/templates/admin/change.html b/ipf/admin/templates/admin/change.html
index 910df4f2664cb8cfa0a84968bc943580ae4d28c2..df215032de4ebe45df7b64043c66148fb1179161 100644 (file)
--- a/ipf/admin/templates/admin/change.html
+++ b/ipf/admin/templates/admin/change.html
@@ -9,8 +9,8 @@
 
 {block breadcrumbs}
 <div class="breadcrumbs">
-  <a href="{url array('IPF_Admin_Controller', 'index')}">{trans 'Home'}</a> &raquo;
-  <a href="{url array('IPF_Admin_Controller', 'listItems'), array($app->slug(), $component->slug())}">{$classname}</a> &raquo;
+  <a href="{url array('IPF_Admin_Dashboard_Controller', 'index')}">{trans 'Home'}</a> &raquo;
+  <a href="{url array('IPF_Admin_Components_Controller', 'listItems'), array($app->slug(), $component->slug())}">{$classname}</a> &raquo;
   {$page_title}
 </div>
 {/block}
@@ -38,7 +38,7 @@
               {/block}
             </fieldset>
             <div class="submit-row change-form">
-                {if ($mode=='change') && $component->isAccessible(array('delete'))}<p class="float-left"><a href="{url array('IPF_Admin_Controller', 'deleteItem'), array($app->slug(), $component->slug(), $object_id)}?ipf_referrer={$ipf_referrer}" class="deletelink">{trans 'Delete'}</a></p>{/if}
+                {if ($mode=='change') && $component->isAccessible(array('delete'))}<p class="float-left"><a href="{url array('IPF_Admin_Components_Controller', 'deleteItem'), array($app->slug(), $component->slug(), $object_id)}?ipf_referrer={$ipf_referrer}" class="deletelink">{trans 'Delete'}</a></p>{/if}
                 {if ($mode=='change') && $component->isAccessible(array('change'))}<input type="submit" value="{trans 'Save'}" class="default" />{/if}
                 {if ($mode=='add') && $component->isAccessible(array('add'))}<input type="submit" value="{trans 'Add'}" class="default" />{/if}
                 <input type="button" value="{trans 'Cancel'}" onclick="javascript:history.back();" />

diff --git a/ipf/admin/templates/admin/delete.html b/ipf/admin/templates/admin/delete.html
index 7b991b271124905062cd145cef853820f1a4725f..d73ae9706afe297e00f11b9fff0e75f4804d4e7a 100644 (file)
--- a/ipf/admin/templates/admin/delete.html
+++ b/ipf/admin/templates/admin/delete.html
@@ -2,9 +2,9 @@
 
 {block breadcrumbs}
 <div class="breadcrumbs">
-  <a href="{url array('IPF_Admin_Controller', 'index')}">{trans 'Home'}</a> &raquo;
-  <a href="{url array('IPF_Admin_Controller', 'listItems'), array($app->slug(), $component->slug())}">{$classname}</a> &raquo;
-  <a href="{url array('IPF_Admin_Controller', 'editItem'), array($app->slug(), $component->slug(), $object_id)}">{$object}</a> &raquo;
+  <a href="{url array('IPF_Admin_Dashboard_Controller', 'index')}">{trans 'Home'}</a> &raquo;
+  <a href="{url array('IPF_Admin_Components_Controller', 'listItems'), array($app->slug(), $component->slug())}">{$classname}</a> &raquo;
+  <a href="{url array('IPF_Admin_Components_Controller', 'editItem'), array($app->slug(), $component->slug(), $object_id)}">{$object}</a> &raquo;
   {$page_title}
 </div>
 {/block}

diff --git a/ipf/admin/templates/admin/index.html b/ipf/admin/templates/admin/index.html
index 8ad6a408a8f1e3a8111254fafaf816ee0cb641f3..5d77d45a0ccf32648cc485fe0ba32327360738b7 100644 (file)
--- a/ipf/admin/templates/admin/index.html
+++ b/ipf/admin/templates/admin/index.html
@@ -14,9 +14,9 @@
                <tbody>
         {foreach $app.components as $component}
         <tr>
-            <th scope="row"><a href="{url array('IPF_Admin_Controller', 'listItems'), array($app.path, $component->slug())}">{$component->verbose_name()}</a></th>
-            <td>{if $component->isAccessible(array('add'))}<a class="addlink" href="{url array('IPF_Admin_Controller', 'addItem'), array($app.path, $component->slug())}">{trans 'Add'}</a>{/if}</td>
-            <td><a class="changelink" href="{url array('IPF_Admin_Controller', 'listItems'), array($app.path, $component->slug())}">{trans 'Change'}</a></td>
+            <th scope="row"><a href="{url array('IPF_Admin_Components_Controller', 'listItems'), array($app.path, $component->slug())}">{$component->verbose_name()}</a></th>
+            <td>{if $component->isAccessible(array('add'))}<a class="addlink" href="{url array('IPF_Admin_Components_Controller', 'addItem'), array($app.path, $component->slug())}">{trans 'Add'}</a>{/if}</td>
+            <td><a class="changelink" href="{url array('IPF_Admin_Components_Controller', 'listItems'), array($app.path, $component->slug())}">{trans 'Change'}</a></td>
         </tr>
         {/foreach}
         </tbody>

diff --git a/ipf/admin/templates/admin/items.html b/ipf/admin/templates/admin/items.html
index 8d6799e6935c31e196fdf3c3386bcc30bbac770b..e6786eea57b7c63432f3c88fb621733627c15cba 100644 (file)
--- a/ipf/admin/templates/admin/items.html
+++ b/ipf/admin/templates/admin/items.html
@@ -1,6 +1,6 @@
 {extends "admin/base.html"}
 
-{block breadcrumbs}<div class="breadcrumbs"><a href="{url array('IPF_Admin_Controller', 'index')}">{trans 'Home'}</a> &raquo; {$page_title}</div>{/block}
+{block breadcrumbs}<div class="breadcrumbs"><a href="{url array('IPF_Admin_Dashboard_Controller', 'index')}">{trans 'Home'}</a> &raquo; {$page_title}</div>{/block}
 
 {block content}
 <div id="content" class="flex">

diff --git a/ipf/admin/templates/admin/logout.html b/ipf/admin/templates/admin/logout.html
index 243e937d903e29c1e5657d5594fba0fe7e139eea..bb2eda2e87de9760d2460268a210c358ee756356 100644 (file)
--- a/ipf/admin/templates/admin/logout.html
+++ b/ipf/admin/templates/admin/logout.html
@@ -7,7 +7,7 @@
 <div id="content" class="colM">
 <h1>Logged out</h1>
 <p>Thanks for spending some quality time with the Web site today.</p>
-<p><a href="{url array('IPF_Admin_Controller', 'index')}">Log in</a> again.</p>
+<p><a href="{url array('IPF_Admin_Dashboard_Controller', 'index')}">Log in</a> again.</p>
 <br class="clear"/>
 </div>
 {/block}