diff options
| author | Astaf User <info@astaf.de> | 2014-06-27 14:33:50 +0200 |
|---|---|---|
| committer | Astaf User <info@astaf.de> | 2014-06-27 14:33:50 +0200 |
| commit | cb615cdc0f43e76cba5a61260afa37c88eda9603 (patch) | |
| tree | 514c032f27913ed99a03dc784d5478379cb9d86c /themes/astaf/views/layouts/main.php | |
| parent | 95fa990f86d31850bd5876866d5d3058dc650f5a (diff) | |
| parent | 4942419cea401d6303d2f415eb8c2a8302ae7113 (diff) | |
Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/www.astaf.de
Conflicts:
protected/config/main.php
Diffstat (limited to 'themes/astaf/views/layouts/main.php')
| -rw-r--r-- | themes/astaf/views/layouts/main.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/themes/astaf/views/layouts/main.php b/themes/astaf/views/layouts/main.php index 7847de1..60311e7 100644 --- a/themes/astaf/views/layouts/main.php +++ b/themes/astaf/views/layouts/main.php @@ -9,7 +9,6 @@ <!--[if lte IE 7]> <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/astaf/ie_patch_layout.css" rel="stylesheet" type="text/css" /> <![endif]--> - <decorator:head /> @@ -56,26 +55,25 @@ <li><a class="ym-skip" href="#main">Skip to main content (Press Enter)</a></li> </ul> - <header style="background-image:url('<?php echo Yii::app()->request->baseUrl; ?>/images/Altstadtfest_titel.jpg');"> <div class="ym-wrapper"> <div class="ym-wbox"> <h1><?php echo CHtml::encode(Yii::app()->name);?></h1> </div> </div> -</header> + <nav id="nav"> - <div class="ym-wrapper"> + <div class="ym-wrapper"> +<a href="#" id="menu-icon" >Menu</a> <div class="ym-hlist"> - <?php $this->widget('zii.widgets.CMenu',array( 'id' => 'mainmenu', 'items'=>array_merge(array( array('activeCssClass' => 'active'), //array('label'=>'Home', 'url'=>array('/site/index')), - array('label'=>'Home', 'url'=>array('/cms/sitecontent/view', 'page'=>'home')), + array('label'=>'Home', 'url'=>array('/cms/sitecontent/view', 'page'=>'home', 'id'=>'nav-home')), array('label'=>'Vereine', 'url'=>array('/verein/index')), array('label'=>'Programm', 'url'=>array('/veranstaltung/index')), ), @@ -107,6 +105,7 @@ </div> </div> </nav> +</header> <div id="main"> <div class="ym-wrapper"> <div class="ym-wbox"> |