summaryrefslogtreecommitdiff
path: root/protected/views/layouts
diff options
context:
space:
mode:
authorPatrick Seeger <pseeger@ccwn.org>2012-05-20 16:58:26 +0200
committerPatrick Seeger <pseeger@ccwn.org>2012-05-20 16:58:26 +0200
commit4f959ffc80e64dc9ee8383826a546723d97305d9 (patch)
tree3a0704c0e3a9f44746739ccffa0d64acc5ab172d /protected/views/layouts
parentacec2b5dc35302147f9a9c73d837dce2f3f9958e (diff)
parent9aad228e1af661b9b39df83700d27e71697dc66f (diff)
Merge branch 'master' of ssh://proxy.ccwn.org:9044/home/ccwn/git-repos/admin.astaf.de
Diffstat (limited to 'protected/views/layouts')
-rw-r--r--protected/views/layouts/main.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 1e499bc..7a9f52e 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -13,6 +13,8 @@
<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/main.css" />
<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/form.css" />
+ <?php Html::registerJavascript("string.js"); ?>
+
<title><?php echo CHtml::encode($this->pageTitle); ?></title>
</head>
@@ -27,8 +29,8 @@
<div id="mainmenu">
<?php $this->widget('zii.widgets.CMenu',array(
'items'=>array(
- array("label"=>"Mein Verein", "url"=>array("/myverein"),
- "visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myverein"),
+ array("label"=>"Mein Verein", "url"=>array("/myVerein"),
+ "visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myVerein"),
array("label"=>"Vereine", "url"=>array("/verein/index"),
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "verein"),
array("label"=>"Standorte", "url"=>array("/standort/index"),
@@ -41,6 +43,8 @@
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myAngebot"),
array("label"=>"Veranstaltungen", "url"=>array("/veranstaltung/index"),
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "veranstaltung"),
+ array("label"=>"Veranstaltungen", "url"=>array("/myVeranstaltung/index"),
+ "visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myVeranstaltung"),
array("label"=>"Audit", "url"=>array("/auditTrail/admin"),
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "admin"),
array("label"=>"Benutzer", "url"=>array("/user/admin"),