diff --git a/library/DidgeridooArtwork/Page/Plugin/Base.php b/library/DidgeridooArtwork/Page/Plugin/Base.php index c4cbaba..9d0defa 100644 --- a/library/DidgeridooArtwork/Page/Plugin/Base.php +++ b/library/DidgeridooArtwork/Page/Plugin/Base.php @@ -1,8 +1,8 @@ _view->base; + return $this->_view->base . '/' . $after; } } \ No newline at end of file diff --git a/library/Local/Controller/Plugin/PageRewrite.php b/library/Local/Controller/Plugin/PageRewrite.php index 169c5af..debf04d 100644 --- a/library/Local/Controller/Plugin/PageRewrite.php +++ b/library/Local/Controller/Plugin/PageRewrite.php @@ -3,9 +3,13 @@ class Local_Controller_Plugin_PageRewrite extends Katharsis_Controller_Plugin_Ab { public function preController() { - $page = Katharsis_Request::getControllerName(); + $controller = Katharsis_Request::getControllerName(); - if(substr($page, 0, 5) === 'admin') { + if($controller === 'page') { + return; + } + + if(substr($controller, 0, 5) === 'admin') { return; } @@ -14,11 +18,11 @@ class Local_Controller_Plugin_PageRewrite extends Katharsis_Controller_Plugin_Ab $defaultSites = explode(", ", Katharsis_Registry::getInstance()->defaults['sites']); } - if(in_array($page, $defaultSites)) { + if(in_array($controller, $defaultSites)) { return; } Katharsis_Request::setControllerName('page'); - Katharsis_Request::setActionName($page); + Katharsis_Request::setActionName($controller); } } \ No newline at end of file diff --git a/public/file/Diplomarbeit-Kinga-Pannek-2012.pdf b/public/file/Diplomarbeit-Kinga-Pannek-2012.pdf new file mode 100644 index 0000000..3034b6b Binary files /dev/null and b/public/file/Diplomarbeit-Kinga-Pannek-2012.pdf differ diff --git a/public/img/page/1374247043.png b/public/img/page/1374247043.png new file mode 100644 index 0000000..5842cdf Binary files /dev/null and b/public/img/page/1374247043.png differ diff --git a/public/img/page/1374247259.png b/public/img/page/1374247259.png new file mode 100644 index 0000000..361fccd Binary files /dev/null and b/public/img/page/1374247259.png differ diff --git a/public/style/main.css b/public/style/main.css index 874f987..ab033bf 100644 --- a/public/style/main.css +++ b/public/style/main.css @@ -265,4 +265,10 @@ div .col:last-child { margin-right: 0; } .box.cite h2 { background: #216f85; -} \ No newline at end of file +} + +.border { + border: 1px solid #ccc; + padding: 10px; + background: white; +} \ No newline at end of file