From 9a68a04790d3c4a13349b555e2788e255f189cbb Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Sat, 21 Feb 2015 14:53:23 +0100
Subject: [PATCH] Moving about page to a PageController for static pages.

---
 application/Bootstrap.php                          | 14 ++++++--------
 application/configs/navigation.xml                 | 10 +++++-----
 .../default/controllers/IndexController.php        |  4 ----
 .../modules/default/controllers/PageController.php | 11 +++++++++++
 .../modules/default/views/layout/default.phtml     |  4 ++--
 .../views/scripts/{index => page}/about.phtml      |  0
 6 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 application/modules/default/controllers/PageController.php
 rename application/modules/default/views/scripts/{index => page}/about.phtml (100%)

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 847f5fc..ca42b67 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -124,7 +124,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         // Set global lang param
         $router->setGlobalParam('lang', 'sv');
-
+        
         // Default route to default module
         $router->addRoute('default', new Zend_Controller_Router_Route(':lang/:controller/:action/*',
         array(
@@ -132,19 +132,17 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             'controller' => 'index',
             'action' => 'index'
         )));
-
-        // Allow "direct access" to index controller in default module
-        $router->addRoute('default-default', new Zend_Controller_Router_Route(':lang/:action/*',
+        
+        $router->addRoute('static-page', new Zend_Controller_Router_Route(':lang/:page/*',
         array(
             'module' => 'default',
-            'controller' => 'index',
-            'action'    => 'index'
+            'controller' => 'page',
+            'action'    => 'index',
         ),
         array(
-            'action' => '(about)'
+            'page' => '(about)'
         )));
 
-
         // Routes for blog module
         $router->addRoute('blog',new Zend_Controller_Router_Route(':lang/blog/:controller/:action/*',array(
             'module'        => 'blog',
diff --git a/application/configs/navigation.xml b/application/configs/navigation.xml
index adacaa5..d148da0 100644
--- a/application/configs/navigation.xml
+++ b/application/configs/navigation.xml
@@ -3,7 +3,7 @@
     <navigation>
         <start>
             <label>u:home</label>
-            <route>default-default</route>
+            <route>default</route>
             <module>default</module>
             <controller>index</controller>
         </start>
@@ -64,12 +64,12 @@
 
         <about>
             <label>uw:about</label>
-            <route>default-default</route>
+            <route>static-page</route>
             <module>default</module>
-            <controller>index</controller>
-            <action>about</action>
+            <controller>page</controller>
+            <action>index</action>
             <params>
-                <part>aboutf</part>
+                <page>about</page>
             </params>
         </about>
     </navigation>
diff --git a/application/modules/default/controllers/IndexController.php b/application/modules/default/controllers/IndexController.php
index fd4563a..b9763d2 100644
--- a/application/modules/default/controllers/IndexController.php
+++ b/application/modules/default/controllers/IndexController.php
@@ -5,8 +5,4 @@ class IndexController extends Fiktiv_Controller_Action
     public function indexAction()
     {
     }
-
-    public function aboutAction()
-    {
-    }
 }
\ No newline at end of file
diff --git a/application/modules/default/controllers/PageController.php b/application/modules/default/controllers/PageController.php
new file mode 100644
index 0000000..4181686
--- /dev/null
+++ b/application/modules/default/controllers/PageController.php
@@ -0,0 +1,11 @@
+<?php
+
+class PageController extends Zend_Controller_Action
+{
+    public function indexAction()
+    {
+        $page = $this->_getParam('page', 'index');
+        
+        $this->render($page);
+    }
+}
diff --git a/application/modules/default/views/layout/default.phtml b/application/modules/default/views/layout/default.phtml
index c2f23e5..21d38d0 100644
--- a/application/modules/default/views/layout/default.phtml
+++ b/application/modules/default/views/layout/default.phtml
@@ -38,8 +38,8 @@
         </span>
 
         <span class="float-right">
-            <a href="<?=$this->url(array('action' => 'about'),'default-default') ?>#cookies"><?=$this->translate('u:cookies')?></a> -
-            <a href="<?=$this->url(array('action' => 'about'),'default-default') ?>#about"><?=$this->translate('uw:about')?></a>
+            <a href="<?=$this->url(array('page' => 'about'), 'static-page') ?>#cookies"><?=$this->translate('u:cookies')?></a> -
+            <a href="<?=$this->url(array('page' => 'about'), 'static-page') ?>#about"><?=$this->translate('uw:about')?></a>
         </span>
     </div>
 </div>
diff --git a/application/modules/default/views/scripts/index/about.phtml b/application/modules/default/views/scripts/page/about.phtml
similarity index 100%
rename from application/modules/default/views/scripts/index/about.phtml
rename to application/modules/default/views/scripts/page/about.phtml