Merge branch 'master' of github.com:jeena/seinheit.ch
This commit is contained in:
commit
e378498bf3
2 changed files with 5 additions and 0 deletions
|
@ -27,6 +27,8 @@ class IndexController extends Katharsis_Controller_Abstract
|
||||||
*/
|
*/
|
||||||
public function indexAction()
|
public function indexAction()
|
||||||
{
|
{
|
||||||
|
$controller = new PageController();
|
||||||
|
$controller->homeAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -10,6 +10,9 @@
|
||||||
</title>
|
</title>
|
||||||
<link href='http://fonts.googleapis.com/css?family=Amaranth' rel='stylesheet' type='text/css'>
|
<link href='http://fonts.googleapis.com/css?family=Amaranth' rel='stylesheet' type='text/css'>
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/main.css" />
|
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/main.css" />
|
||||||
|
<?php if(Access::isLogged()) { ?>
|
||||||
|
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/admin.css" />
|
||||||
|
<?php } ?>
|
||||||
<link rel="shortcut icon" href="<?php echo $this->base ?>/img/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="<?php echo $this->base ?>/img/favicon.ico" type="image/x-icon" />
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<meta name="Description" content="" />
|
<meta name="Description" content="" />
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue