Merge branch 'master' of github.com:jeena/seinheit.ch

This commit is contained in:
Logsol 2013-07-09 00:09:25 +02:00
commit 35717248ca
2 changed files with 6 additions and 2 deletions

View file

@ -46,7 +46,11 @@
<ul id="navi"> <ul id="navi">
<?php foreach($this->mainNavigationItems as $item): ?> <?php foreach($this->mainNavigationItems as $item): ?>
<li <?php if($item['id'] == $this->activeMenuItem) echo 'class="active"'?>> <li <?php if($item['id'] == $this->activeMenuItem) echo 'class="active"'?>>
<?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 ?>/<?php echo $item['controller'] ?>/<?php echo $item['action'] ?>"><?php echo $item['name'] ?></a>
<?php endif ?>
</li> </li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>

View file

@ -39,4 +39,4 @@ CREATE TABLE `page` (
-- --
INSERT INTO `page` (`title`, `url`, `content`) VALUES ("Home", "home", "Wilkommen bei Katharsis"); INSERT INTO `page` (`title`, `url`, `content`) VALUES ("Home", "home", "Wilkommen bei Katharsis");
INSERT INTO `navigation` (`name`, `controller`, `action`) VALUES ("Home", "page", "home"); INSERT INTO `navigation` (`name`, `link`) VALUES ("Home", "/");