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-08 23:57:37 +02:00
commit 8d5a30b335
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
application/controller/AdminController.php
View file

@ -34,7 +34,10 @@ class AdminController extends Katharsis_Controller_Abstract
private function getPassword() private function getPassword()
{ {
$admin_ini = parse_ini_file('config/admin.ini'); $path = 'config/admin.ini';
if(!is_readable($path)) die($path . " not found");
$admin_ini = parse_ini_file($path);
$password = $admin_ini["password"]; $password = $admin_ini["password"];
return $password; return $password;

2
application/view/AdminPage/image.phtml
View file

@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="/style/main.css" /> <link rel="stylesheet" type="text/css" href="/style/main.css" />
<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="Swiss Didgeridoo Artwork - Online Shop" /> <meta name="Description" content="Swiss Didgeridoo Artwork - Online Shop" />
</head> </head>
<body> <body>
<div style="padding: 10px;"> <div style="padding: 10px;">

2
application/view/main.phtml
View file

@ -57,7 +57,7 @@
<article id="stage"> <article id="stage">
<?php if($this->headerImage): ?> <?php if($this->headerImage): ?>
<img id="header_image" src="<?php echo $this-headerImage ?>" alt=""> <img id="header_image" src="<?php echo $this->headerImage ?>" alt="">
<?php endif ?> <?php endif ?>
<h1><?php echo Navigation::getTitle(); ?></h1> <h1><?php echo Navigation::getTitle(); ?></h1>

15
config/dbinit.sql
View file

@ -16,7 +16,7 @@ CREATE TABLE `navigation` (
`active` tinyint(1) NOT NULL DEFAULT '1', `active` tinyint(1) NOT NULL DEFAULT '1',
`sorting` int(11) DEFAULT NULL, `sorting` int(11) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=69 DEFAULT CHARSET=utf8; ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-- --
-- Table structure for table `page` -- Table structure for table `page`
@ -26,10 +26,17 @@ DROP TABLE IF EXISTS `page`;
CREATE TABLE `page` ( CREATE TABLE `page` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(256) NOT NULL, `title` varchar(256) NOT NULL,
`subtitle` varchar(256) NOT NULL, `subtitle` varchar(256) DEFAULT NULL,
`url` varchar(256) NOT NULL, `url` varchar(256) NOT NULL,
`content` text NOT NULL, `content` text DEFAULT NULL,
`active` tinyint(1) NOT NULL DEFAULT '1', `active` tinyint(1) NOT NULL DEFAULT '1',
`header_image` varchar(256) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=36 DEFAULT CHARSET=utf8; ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
--
-- Data
--
INSERT INTO `page` (`title`, `url`, `content`) VALUES ("Home", "home", "Wilkommen bei Katharsis");
INSERT INTO `navigation` (`name`, `controller`, `action`) VALUES ("Home", "page", "home");