Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/www.astaf.de

Conflicts:
	protected/config/main.php

3 files changed, 80 insertions, 14 deletions

diff --git a/css/astaf/layout.css b/css/astaf/layout.css
index f7a2762..43ea7fe 100644
--- a/css/astaf/layout.css
+++ b/css/astaf/layout.css
@@ -96,3 +96,65 @@
   ul#navigation li ul span {  /* aktuelle Unterseite kennzeichnen */
     background-color: maroon;
   }
+  
+  #menu-icon{
+    display: none;
+
+	/*background: #4C8FEC url('/images/wetter/dust.png') center;*/
+  }
+
+ 
+
+@media only screen and (max-width : 640px) {
+
+	#submenu {
+	font-size:1.5em;
+		line-height:2.5em;
+	}
+	#menu-icon {
+
+		display:inline-block;
+		background: transparent;
+		color: #aaa;
+		font-size:1.5em;
+		line-height:2.5em;
+		padding: 0 0.5em;
+		text-shadow: 0 1px 1px rgba(0,0,0,.5);
+		text-decoration: none;
+		width: auto;
+		
+	}
+	nav .ym-hlist {
+		display:none;	
+	}
+	nav:hover .ym-hlist {
+		display:block;	
+	}
+	nav ul#mainmenu, nav:active ul#mainmenu { 
+
+		display: none;
+
+	}
+
+	nav li {
+
+		text-align: center;
+		width: 100%;
+		padding: 10px 0;
+		margin: 0;
+		font-size:1.5em;
+
+	}
+
+	nav:hover ul#mainmenu {
+
+		display: block;
+
+	}
+	
+	.ym-hlist ul li a, .ym-hlist ul li strong {
+		font-size: 1.5em;	
+	}
+}
+  
+  
\ No newline at end of file
diff --git a/protected/config/main.php b/protected/config/main.php
index ab7ab8f..3305301 100644
--- a/protected/config/main.php
+++ b/protected/config/main.php
@@ -20,7 +20,7 @@ return array(
 		'application.models.*',
 		'application.components.*',
 		'application.extensions.ddeditor.*',
-		'application.extensions.wetter.*',
+	//	'application.extensions.wetter.*',
 		'application.modules.cms.models.*',
 	//	'application.extensions.extckeditor.*',
 	),
@@ -58,6 +58,7 @@ return array(
 		'urlManager'=>array(
 			'urlFormat'=>'path',
 			'rules'=>array(
+				'Programm/<tag:\w+>'=>'veranstaltung/index',
 				'<controller:\w+>/<id:\d+>'=>'<controller>/view',
 				'<controller:\w+>/<action:\w+>/<id:\d+>'=>'<controller>/<action>',
 				'<controller:\w+>/<action:\w+>'=>'<controller>/<action>',
@@ -70,10 +71,10 @@ return array(
 		// uncomment the following to use a MySQL database
 		
 		'db'=>array(
-			'connectionString' => 'mysql:host=database;dbname=astaf_2012',
+			'connectionString' => 'mysql:host=localhost;dbname=astaf',
 			'emulatePrepare' => true,
-			'username' => 'astaf',
-			'password' => 'AsTaF4',
+			'username' => 'root',
+			'password' => '',
 			'charset' => 'utf8',
 			'tablePrefix' => 'tbl_'
 		),
@@ -85,15 +86,19 @@ return array(
 		'log'=>array(
 			'class'=>'CLogRouter',
 			'routes'=>array(
-				array(
+				'file'=>array(
 					'class'=>'CFileLogRoute',
-					'levels'=>'error, warning',//, debug,trace',
+					'levels'=>'error, warning, debug, trace',
+						'categories'=>'system.db.*',
 				),
 				// uncomment the following to show log messages on web pages
 				
-				/*array(
+				'web'=>array(
 					'class'=>'CWebLogRoute',
-				),*/
+						
+						'levels'=>'trace, info, error, warning',
+						'categories'=>'system.db.*',
+				),
 				
 			),
 		),
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">