diff --git a/application/modules/blog/views/scripts/index/archive.phtml b/application/modules/blog/views/scripts/index/archive.phtml deleted file mode 100644 index 7722c88..0000000 --- a/application/modules/blog/views/scripts/index/archive.phtml +++ /dev/null @@ -1,10 +0,0 @@ -

translate('u:archive') ?>

- -

translate('BLOG_ARCHIVE_INTRO') ?>

- - \ No newline at end of file diff --git a/application/modules/default/controllers/IndexController.php b/application/modules/default/controllers/IndexController.php index 12132a7..dd29044 100644 --- a/application/modules/default/controllers/IndexController.php +++ b/application/modules/default/controllers/IndexController.php @@ -21,13 +21,7 @@ class IndexController extends Fiktiv_Controller_Action public function aboutAction() { - //$dbLayer = Fiktiv_Db_Service::getInstance(); - //$me = $dbLayer->users->findByEmail('fredric@fiktivkod.org'); - - $dataLayer = $this->_helper->dataService(); - $me = $dataLayer->User->findByEmail('fredric@fiktivkod.org'); - echo $me; - + } public function test() diff --git a/application/modules/default/views/layout/default.phtml b/application/modules/default/views/layout/default.phtml index 4fbba37..302f820 100644 --- a/application/modules/default/views/layout/default.phtml +++ b/application/modules/default/views/layout/default.phtml @@ -40,8 +40,8 @@ - Cookies - - Behind the site + Cookies - + Behind the site diff --git a/application/modules/default/views/scripts/index/about.phtml b/application/modules/default/views/scripts/index/about.phtml index f635566..f218b7f 100644 --- a/application/modules/default/views/scripts/index/about.phtml +++ b/application/modules/default/views/scripts/index/about.phtml @@ -1,3 +1,17 @@ -

translate('uw:about') ?>

+ +

translate('uw:about') ?>

+
+

translate('ABOUT_TXT') ?>

-

translate('ABOUT_TXT') ?>

\ No newline at end of file + + + +

translate('uw:behind the site') ?>

+
+

translate('ABOUT_TXT_BTS') ?>

+ + + +

translate('uw:cookies') ?>

+
+

translate('ABOUT_TXT_COOKIES') ?>

\ No newline at end of file diff --git a/public/css/default.css b/public/css/default.css index 7fa7dc7..e7ead89 100644 --- a/public/css/default.css +++ b/public/css/default.css @@ -13,6 +13,8 @@ h1,h2 { margin: 10px 0 0; font: normal 2.2em Arial; color: #464e64; } h2 { border-bottom: solid 1px #c4cde3; } h3 { font: normal 1.6em "Verdana, Helvetica"; } +h1.leap { margin-bottom: 15px; } + p { line-height: 1.6em; padding: 0 0 8px; } code {