jeena/seinheit.ch
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
jeena 2013-07-08 22:11:45 +02:00
commit 9119550d1c
6 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controller/IndexController.php
View file

@ -27,8 +27,6 @@ class IndexController extends Katharsis_Controller_Abstract
*/ */
public function indexAction() public function indexAction()
{ {
$this->_view->someVariableName = 'Katharsis';
echo $this->_view->render('welcome');
} }
/** /**

15
application/view/Index/index.phtml
View file

@ -1,15 +0,0 @@
<html>
<head>
<title>Swiss Didgeridoo Artwork - Schweizer Holz Didgeridoo bester Qualit&auml;t</title>
<link rel="stylesheet" type="text/css" href="/style/main.css" />
<link rel="shortcut icon" href="/img/leafs/favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta name="Description" content="Bei uns findest du alles rund ums Didgeridoo - Qualitäts Instrumente aus einheimischen Hölzern - Taschen - Mundstücke - Musik - Konzertkalender - Unterricht -Therapie - Clapstick - Trommel Reparaturen - Diverse Links" />
<meta name="keywords" content="Didgeridoo, Didjeridoo, Yidaki, Clapstick, Mundstück, Holzblasinstrument, Australisches Instrument, Didgeridoo Reparaturen, Didgeridoo Konzert, Trommel Reparaturen, Didgeridoo Unterricht, Zirkularatmung, Rhythmus Didgeridoo" />
</head>
<body id="index">
<a href="<?php echo $this->base ?>/page/home" title="Klick!" alt="Willkommensbild">
<img src="<?php echo $this->base ?>/img/leafs/index.png" />
</a>
</body>
</html>

73
application/view/main.phtml Normal file
View file

@ -0,0 +1,73 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>
Seinheit
<?php if(Navigation::getTitle()): ?>
- <?php echo Navigation::getTitle(); ?>
<?php endif ?>
</title>
<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="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 name="Description" content="" />
<meta name="keywords" content="" />
</head>
<body>
<div id="container">
<header>
<?php if(Access::isLogged()): ?>
<ul id="adminNavigation">
<li>Admin Bereich</li>
<li><a href="<?php echo $this->base ?>/adminNavigation">Navigationen</a></li>
<li><a href="<?php echo $this->base ?>/adminPage">Pages</a></li>
<li><a href="<?php echo $this->base ?>/admin/logout">Ausloggen</a></li>
</ul>
<?php endif ?>
<?php if($this->notices): ?>
<ul class="notices">
<?php foreach($this->notices as $notice): ?>
<li><?php echo $notice ?></li>
<?php endforeach ?>
</ul>
<?php endif ?>
<nav>
<a id="logo" href="<?php echo $this->base ?>/"><img src="<?php echo $this->base ?>/img/logo.png" alt="SEINHEIT logo"/></a>
<ul id="navi">
<?php foreach($this->mainNavigationItems as $item): ?>
<li <?php if($item['id'] == $this->activeMenuItem) echo 'class="active"'?>>
<a href="<?php echo $this->base ?>/<?php echo $item['controller'] ?>/<?php echo $item['action'] ?>"><?php echo $item['name'] ?></a>
</li>
<?php endforeach ?>
</ul>
</nav>
</header>
<article id="stage">
<?php if($this->headerImage): ?>
<img id="header_image" src="<?php echo $this-headerImage ?>" alt="">
<?php endif ?>
<h1><?php echo Navigation::getTitle(); ?></h1>
<?php if(Navigation::getSubtitle()): ?>
<h2><?php echo Navigation::getSubtitle(); ?></h2>
<?php endif ?>
<div id="content">
<?php echo $this->stageContent ?>
</div>
</article>
</div>
</body>
</html>

4
library/Katharsis/Controller/Plugin/Autorender.php
View file

@ -15,6 +15,7 @@ class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin
*/ */
public function postController() public function postController()
{ {
$view = Katharsis_View::getInstance(); $view = Katharsis_View::getInstance();
$view->controllerAction = false; $view->controllerAction = false;
@ -28,5 +29,8 @@ class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin
$view = Katharsis_View::getInstance(); $view = Katharsis_View::getInstance();
echo $view->render('main'); echo $view->render('main');
var_dump($view->render('main'));
die('');
} }
} }

10
library/Katharsis/Controller/Plugin/StartSession.php Normal file
View file

@ -0,0 +1,10 @@
<?php
class Katharsis_Controller_Plugin_StartSession extends Katharsis_Controller_Plugin_Abstract
{
public function preController()
{
session_write_close();
session_start();
}
}
?>

7
public/index.php
View file

@ -12,8 +12,15 @@ chdir('..');
require_once('library/Katharsis/Bootstrap.php'); require_once('library/Katharsis/Bootstrap.php');
Katharsis_Autoload::init(); Katharsis_Autoload::init();
//Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_SetNames());
Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_StartSession());
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Notice());
Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_Autorender()); Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_Autorender());
Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Access());
//Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Navigation());
try { try {
Katharsis_Bootstrap::run(); Katharsis_Bootstrap::run();