Assets etc aus git genommen, erste ansicht vereinslist

3 files changed, 45 insertions, 15 deletions

diff --git a/themes/astaf/views/layouts/column1.php b/themes/astaf/views/layouts/column1.php
new file mode 100644
index 0000000..00f4009
--- /dev/null
+++ b/themes/astaf/views/layouts/column1.php
@@ -0,0 +1,3 @@
+<?php $this->beginContent('//layouts/main'); ?>
+	<?php echo $content; ?>
+<?php $this->endContent(); ?>
\ No newline at end of file
diff --git a/themes/astaf/views/layouts/column2.php b/themes/astaf/views/layouts/column2.php
new file mode 100644
index 0000000..4139e9f
--- /dev/null
+++ b/themes/astaf/views/layouts/column2.php
@@ -0,0 +1,5 @@
+<?php $this->beginContent('//layouts/main'); ?>
+		<?php echo $content; ?>
+
+
+<?php $this->endContent(); ?>
\ No newline at end of file
diff --git a/themes/astaf/views/layouts/main.php b/themes/astaf/views/layouts/main.php
index 4152c44..3707925 100644
--- a/themes/astaf/views/layouts/main.php
+++ b/themes/astaf/views/layouts/main.php
@@ -26,7 +26,7 @@
 
 </ul>
 
-<header>
+<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>
@@ -42,13 +42,16 @@
 			$this->widget('zii.widgets.CMenu',array(
 			'items'=>array_merge(array(
 					array('activeCssClass' => 'active'),
-				array('label'=>'Home', 'url'=>array('/site/index')),
-				array('label'=>'About', 'url'=>array('/cmsPage/view', 'id'=>'1')),
-				array('label'=>'Contact', 'url'=>array('/site/contact')),
+				//array('label'=>'Home', 'url'=>array('/site/index')),
+				array('label'=>'Home', 'url'=>array('/cms/sitecontent/view', 'page'=>'home')),
+				),
+				Cms::getMenuPoints(1),
+				array(
+				//array('label'=>'About', 'url'=>array('/cmsPage/view', 'id'=>'1')),
+				//array('label'=>'Contact', 'url'=>array('/site/contact')),
 				array('label'=>'Login', 'url'=>array('/site/login'), 'visible'=>Yii::app()->user->isGuest),
 				array('label'=>'Logout ('.Yii::app()->user->name.')', 'url'=>array('/site/logout'), 'visible'=>!Yii::app()->user->isGuest),
-				),
-				Cms::getMenuPoints(1)
+				)
 			)
 		)); 
 			?>
@@ -101,7 +104,7 @@
 				<article class="ym-g66 ym-gl content">
 					<div class="ym-gbox-left ym-clearfix">
 <?php echo $content; ?>
-						<img src="http://dummyimage.com/240x160/cccccc/fff.png" alt="" class="float-left bordered"/>
+						<!--<img src="http://dummyimage.com/240x160/cccccc/fff.png" alt="" class="float-left bordered"/>
 						<p>Lorem ipsum dolor sit amet, <em>consectetuer adipiscing elit</em>. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.</p>
 						<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi et risus. Aliquam nisl. Nulla facilisi. Cras accumsan vestibulum ante. Vestibulum sed tortor. Praesent SMALL CAPS tempus fringilla elit. Ut elit diam, sagittis in, nonummy in, gravida non, nunc. Ut orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam egestas, orci eu imperdiet malesuada, nisl purus fringilla odio, quis commodo est orci vitae justo. Aliquam placerat odio tincidunt nulla. Cras in libero. Aenean rutrum, magna non tristique posuere, erat odio eleifend nisl, non convallis est tortor blandit ligula. Nulla id augue.</p>
 						<p>Nullam mattis, odio ut tempus facilisis, metus nisl facilisis metus, auctor consectetuer felis ligula nec mauris. Vestibulum odio erat, fermentum at, commodo vitae, ultrices et, urna. Mauris vulputate, mi pulvinar sagittis condimentum, sem nulla aliquam velit, sed imperdiet mi purus eu magna. Nulla varius metus ut eros. Aenean aliquet magna eget orci. Class aptent taciti sociosqu ad litora.</p>
@@ -114,7 +117,7 @@
 						<div class="ym-grid linearize-level-2">
 							<div class="ym-g50 ym-gl">
 								<div class="ym-gbox-left">
-									<!-- content -->
+									<!-- content --><!-- 
 
 									<h6>This is a nested column</h6>
 									<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
@@ -122,13 +125,13 @@
 							</div>
 							<div class="ym-g50 ym-gr">
 								<div class="ym-gbox-right">
-									<!-- content -->
+									<!-- content --> <!--
 									<h6>This is another nested column </h6>
 
 									<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip  ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
 								</div>
 							</div>
-						</div>
+						</div> -->
 					</div>
 				</article>
 				<aside class="ym-g33 ym-gr">
@@ -137,12 +140,31 @@
 						<?php /*<h3>A Simple Sidebar </h3>
 						<p class="box info">Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet  vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p>
 						*/?>
-						<h3>Das Wetter in Waiblingen</h3>
-						<p>
-			<?php $this->widget('application.extensions.wetter.Wetter', array());?>
-						</p>
+						<?php $this->widget('application.extensions.wetter.Wetter', array("ort" => "Waiblingen"));?>
+						
+						<div class="ym-wrapper">
+							<div class="ym-vlist">
+							
+							
+							<?php $this->widget('zii.widgets.CMenu',
+									array('items'=>array_merge(array(array('activeCssClass' => 'active'),
+				array('label'=>'Impressum', 'url'=>array('/cms/sitecontent/view', 'page'=>'impressum')),
+				),
+				Cms::getMenuPoints(3),
+				$this->menu,
+				array(
+				array('label'=>'Login', 'url'=>array('/site/login'), 'visible'=>Yii::app()->user->isGuest),
+				array('label'=>'Logout ('.Yii::app()->user->name.')', 'url'=>array('/site/logout'), 'visible'=>!Yii::app()->user->isGuest),
+				)
+			)
+		)); 
+			?>
+							</div>
+						</div>
+
+						<p><?php Cms::render("info_seitenleiste"); ?></p>
+						<p class="box info"><?php Cms::render("info_box_seitenleiste"); ?></p>
 						
-						<p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare  mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus  pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. ipsum  primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras  ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet  vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue</p>
 					</div>
 				</aside>
 			</section>