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

typo

Browse source
This commit is contained in:
jeena 2013-07-17 15:59:56 +02:00
parent 85598a0d85
commit e43fde0d7d
7 changed files with 44 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controller/AdminController.php
View file

@ -3,7 +3,7 @@ class AdminController extends Katharsis_Controller_Abstract
{
public function indexAction()
{
if(!Access::isLogged()) $this->_location('gate');
if(!Access::isLoggedIn()) $this->_location('gate');
}
public function gateAction()

2
application/controller/PageController.php
View file

@ -11,7 +11,7 @@ class PageController extends Katharsis_Controller_Abstract
public function __call($method, $args)
{
$preview = false;
if(array_key_exists('preview', $this->_getAllParams()) && Access::isLogged())
if(array_key_exists('preview', $this->_getAllParams()) && Access::isLoggedIn())
{
$preview = true;
}

3
application/model/Access.php
View file

@ -5,7 +5,7 @@ class Access extends Katharsis_Model_Abstract
{
}
public static function isLogged()
public static function isLoggedIn()
{
if(isset($_SESSION['logged']) && $_SESSION['logged'] == 1)
{
@ -14,4 +14,3 @@ class Access extends Katharsis_Model_Abstract
return false;
}
}
?>

34
application/view/main.phtml
View file

@ -10,7 +10,7 @@
</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" />
<?php if(Access::isLogged()) { ?>
<?php if(Access::isLoggedIn()) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/admin.css" />
<?php } ?>
<link rel="shortcut icon" href="<?php echo $this->base ?>/img/favicon.ico" type="image/x-icon" />
@ -18,12 +18,12 @@
<meta name="Description" content="" />
<meta name="keywords" content="" />
</head>
<body<?php if(Access::isLogged()): ?> class="admin"<?php endif ?>>
<body<?php if(Access::isLoggedIn()): ?> class="admin"<?php endif ?>>
<div id="container">
<header>
<?php if(Access::isLogged()): ?>
<?php if(Access::isLoggedIn()): ?>
<ul id="adminNavigation">
<li>Admin Bereich</li>
<li><a href="<?php echo $this->base ?>/adminNavigation">Navigationen</a></li>
@ -34,9 +34,9 @@
<?php if($this->notices): ?>
<ul class="notices">
<?php foreach($this->notices as $notice): ?>
<?php foreach($this->notices as $notice): ?>
<li><?php echo $notice ?></li>
<?php endforeach ?>
<?php endforeach ?>
</ul>
<?php endif ?>
@ -45,22 +45,26 @@
<ul id="navi">
<?php foreach($this->mainNavigationItems as $item): ?>
<li <?php if($item['id'] == $this->activeMenuItem) echo 'class="active"'?>>
<li<?php if($item['id'] == $this->activeMenuItem) echo ' class="active"'?>>
<?php if($item['link']): ?>
<a href="<?php echo $item['link'] ?>"><?php echo $item['name'] ?></a>
<?php else: ?>
<a href="<?php echo $this->base ?>/<?php echo $item['controller'] ?>/<?php echo $item['action'] ?>"><?php echo $item['name'] ?></a>
<?php endif ?>
<?php foreach($item['children'] as $child): ?>
<li <?php if($child['id'] == $this->activeMenuItem) echo 'class="active"'?>>
<?php if($child['link']): ?>
<a href="<?php echo $child['link'] ?>"><?php echo $child['name'] ?></a>
<?php else: ?>
<a href="<?php echo $this->base ?>/<?php echo $child['controller'] ?>/<?php echo $child['action'] ?>"><?php echo $child['name'] ?></a>
<?php endif ?>
</li>
<?php endforeach ?>
<?php if(count($item['children']) > 0): ?>
<ul>
<?php foreach($item['children'] as $child): ?>
<li<?php if($child['id'] == $this->activeSubMenuItem) echo ' class="active"'?>>
<?php if($child['link']): ?>
<a href="<?php echo $child['link'] ?>"><?php echo $child['name'] ?></a>
<?php else: ?>
<a href="<?php echo $this->base ?>/<?php echo $child['controller'] ?>/<?php echo $child['action'] ?>"><?php echo $child['name'] ?></a>
<?php endif ?>
</li>
<?php endforeach ?>
</ul>
<?php endif ?>
</li>
<?php endforeach ?>
</ul>

2
library/DidgeridooArtwork/Controller/Plugin/Access.php
View file

@ -7,7 +7,7 @@ class DidgeridooArtwork_Controller_Plugin_Access extends Katharsis_Controller_Pl
{
$firstFive = substr(Katharsis_Request::getControllerName(), 0, 5);
if($firstFive == 'admin' && !Access::isLogged())
if($firstFive == 'admin' && !Access::isLoggedIn())
{
Katharsis_Request::setControllerName('admin');
Katharsis_Request::setActionName('index');

1
public/style/admin.css
View file

@ -3,7 +3,6 @@ body.admin footer {
}
#adminNavigation {
font-family: verdana;
background: #90CB93;
position: fixed;
bottom: 0;

29
public/style/main.css
View file

@ -51,8 +51,7 @@ img { max-width: 100%; }
}
#logo {
padding-top: 70px;
display: block;
float: left;
}
#logo img {
@ -60,27 +59,41 @@ img { max-width: 100%; }
}
#navi {
margin-top: 70px;
float: right;
right: 0px ;
list-style-type: none;
margin: -47px 0;
text-align: center;
padding: 12px 0;
}
#navi li {
display: inline;
#navi > li {
display: inline-block;
position: relative;
}
#navi li a {
color: black;
padding: 10px 12px;
text-decoration: none;
background-color: #90cb93;
background: #90cb93;
color: white;
}
#navi a:hover {
background: #84c684;
}
#navi ul {
display: none;
position: absolute;
text-align: left;
}
#navi > li:hover ul {
display: block;
}
#stage {
clear: both;
border-top: 5px solid #90cb93;
padding: 50px 0px;
}