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

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

Browse source
This commit is contained in:
Logsol 2013-07-10 14:12:56 +02:00
commit f96b0d64dc
6 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
.DS_Store
config/admin.ini
config/database.config.ini
public/img/header

4
application/controller/PageController.php
View file

@ -29,10 +29,10 @@ class PageController extends Katharsis_Controller_Abstract
foreach($pageData as $key => $value) {
$this->_view->{$key} = $value;
}
$this->_view->content = DidgeridooArtwork_Page_Plugin::render($this->_view->content);
$content = $this->_view->render('page/post');
$content = $this->_view->render('Page/post');
$this->_view->stageContent = $content;
echo $this->_view->render('main');
die();

13
application/view/Page/post.phtml
View file

@ -1,3 +1,12 @@
this is my site
<?php if($this->header_image): ?>
<img id="header_image" src="<?php echo $this->base ?>/img/header/<?php echo $this->header_image ?>" alt="">
<?php endif ?>
Title (<?php echo $this->title; ?>)
<h1><?php echo $this->title ?></h1>
<?php if($this->subtitle): ?>
<h2><?php echo $this->subtitle ?></h2>
<?php endif ?>
<div id="content">
<?php echo $this->content ?>
</div>

15
application/view/main.phtml
View file

@ -59,20 +59,7 @@
</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>
<?php echo $this->stageContent ?>
</article>
<footer>

8
library/DidgeridooArtwork/Page/Plugin/Base.php Normal file
View file

@ -0,0 +1,8 @@
<?php
class DidgeridooArtwork_Page_Plugin_Base extends DidgeridooArtwork_Page_Plugin_Abstract
{
public function render($params)
{
return $this->_view->base;
}
}

12
public/style/main.css
View file

@ -4,7 +4,6 @@ html, body {
body {
background: white;
font-family: "Trebuchet MS", "Lucida Grande", verdana, arial, georgia;
font-size: 1em;
margin: 0;
@ -38,6 +37,8 @@ h2 + h3 {
font-weight: bold;
}
img { max-width: 100%; }
#container {
min-width: 750px;
max-width: 1100px;
@ -138,15 +139,6 @@ h2 + h3 {
font-size: 1.2em;
}
#stage img {
border: 1px solid #888;
background-color: white;
padding: 5px;
margin: 0 0 1em 1em;
float: right;
border-radius: 2px;
}
#angebote {
float: right;
text-align: right;