From ce4538f32a0db36e0f39d2e4ea15488abdc387df Mon Sep 17 00:00:00 2001
From: jeena <spam@jeenaparadies.net>
Date: Fri, 19 Jul 2013 16:35:05 +0200
Subject: [PATCH] page navi

---
 application/view/main.phtml                                | 5 +++--
 library/DidgeridooArtwork/Controller/Plugin/Navigation.php | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/view/main.phtml b/application/view/main.phtml
index 8537214..24f9df8 100644
--- a/application/view/main.phtml
+++ b/application/view/main.phtml
@@ -43,7 +43,7 @@
 					<?php if($item['link']): ?>
 						<a href="<?php echo $item['link'] ?>"><?php echo $item['name'] ?></a>
 					<?php else: ?>
-						<a href="<?php echo $this->base ?>/<?php echo $item['controller'] ?>/<?php echo $item['action'] ?>"><?php echo $item['name'] ?></a>
+						<a href="<?php echo $this->base ."/". ($item['controller'] != "page" ? $item['controller'] . "/" : "") . $item['action'] ?>"><?php echo $item['name'] ?></a>
 					<?php endif ?>
 
 					<?php if(count($item['children']) > 0): ?>
@@ -53,7 +53,8 @@
 								<?php if($child['link']): ?>
 									<a href="<?php echo $child['link'] ?>"><?php echo $child['name'] ?></a>
 								<?php else: ?>
-									<a href="<?php echo $this->base ?>/<?php echo $child['controller'] ?>/<?php echo $child['action'] ?>"><?php echo $child['name'] ?></a>
+									<a href="<?php echo $this->base ."/". ($child['controller'] != "page" ? $child['controller'] . "/" : "") . $child['action'] ?>">
+									<?php echo $child['name'] ?></a>
 								<?php endif ?>
 							</li>
 						<?php endforeach ?>
diff --git a/library/DidgeridooArtwork/Controller/Plugin/Navigation.php b/library/DidgeridooArtwork/Controller/Plugin/Navigation.php
index a2b491a..d6acace 100644
--- a/library/DidgeridooArtwork/Controller/Plugin/Navigation.php
+++ b/library/DidgeridooArtwork/Controller/Plugin/Navigation.php
@@ -8,7 +8,6 @@ class DidgeridooArtwork_Controller_Plugin_Navigation extends Katharsis_Controlle
 		$navigation = new Navigation();
 		$view->mainNavigationItems = $navigation->getAllItems();
 
-
 		/*
 		$sql = "SELECT id, name, controller, action, link FROM navigation WHERE parent_id IS NULL AND active = 1 ORDER BY sorting";
 		$view->mainNavigationItems = $this->_con->fetchAll($sql);