3 files changed, 23 insertions, 20 deletions
diff --git a/protected/views/verein/_short.php b/protected/views/verein/_short.php
index 0ff6284..c6e42de 100644
--- a/protected/views/verein/_short.php
+++ b/protected/views/verein/_short.php
@@ -11,4 +11,4 @@ if(strlen(strip_tags($data->beschreibung))>300) {
 <?php /* 
 <p><?php echo CHTML::link(CHTML::decode($myBeschreibung),array("verein/view","id"=>$data->id)); ?></p>
  */?>
-<?php echo CHTML::link("<h6>".$data->name."</h6><p>".$myBeschreibung."</p>" ,array("verein/view","id"=>$data->id)); ?>
-\ No newline at end of file
+<?php echo CHTML::link("<h6>".$data->name." (".$data->standort->name.")</h6><p>".$myBeschreibung."</p>" ,array("verein/view","id"=>$data->id)); ?>
+\ No newline at end of file
diff --git a/protected/views/verein/_shortangebotverein.php b/protected/views/verein/_shortangebotverein.php
index e49580e..bc845ca 100644
--- a/protected/views/verein/_shortangebotverein.php
+++ b/protected/views/verein/_shortangebotverein.php
@@ -1,8 +1,3 @@
 <?php 
-if(strlen(strip_tags($data->angebot->beschreibung))>80) {
-	$tmp = str_split(strip_tags($data->angebot->beschreibung),77);
-	$myBeschreibung = $tmp[0]."...";
-} else {
-	$myBeschreibung = strip_tags($data->angebot->beschreibung);
-}
-echo CHTML::link("<strong>".$data->angebot->name."</strong> (".$data->menge." ".$data->einheit.") für ".$data->preis."€ ".$myBeschreibung ,array("speisTrank/view","id"=>$data->angebot_id)); ?><br />
-\ No newline at end of file
+
+echo CHTML::link("<strong>".$data->angebot->name."</strong> (".$data->menge." ".$data->einheit.") für ".Format::currency($data->preis) ,array("speisTrank/view","id"=>$data->angebot_id)); ?><br />
+\ No newline at end of file
diff --git a/protected/views/verein/view.php b/protected/views/verein/view.php
index 95e1cf2..188238a 100644
--- a/protected/views/verein/view.php
+++ b/protected/views/verein/view.php
@@ -20,12 +20,11 @@ $this->menu=array(
 <div class="box info float-right"><?php echo $model->kontaktdaten ?></div>
 <p><?php echo $model->beschreibung?></p>
 
-<div class="float-left" >
 <?php /*$this->widget('zii.widgets.CListView', array(
       'dataProvider'=>new CArrayDataProvider($model->angebote, array()),
       'itemView'=>'_shortangebot',   // refers to the partial view named '_post'
   ));*/?>
-
+<h4>Kulinarische Angebote</h4>
 <?php 
 $dataProvider=new CActiveDataProvider('AngebotVerein', array(
 		'criteria'=>array(
@@ -41,16 +40,25 @@ $this->widget('zii.widgets.CListView', array(
       'itemView'=>'_shortangebotverein',
 	  'sortableAttributes'=>array(
         'preis','menge', 
-    ),   // refers to the partial view named '_post'
+    ),   
+  ));?>
+<h4>Veranstaltungen</h4>
+<?php 
+$dataProvider=new CActiveDataProvider('Veranstaltung', array(
+		'criteria'=>array(
+				'condition'=>'verein_id='.$model->id." and published=1",
+		),
+		'pagination'=>array(
+				'pageSize'=>20,
+		),
+));
+$this->widget('zii.widgets.CListView', array(
+      'dataProvider'=>$dataProvider,
+      'itemView'=>'/veranstaltung/_short',
+	  'sortableAttributes'=>array(
+        'titel','startzeit','endzeit', 
+    ),  
+	  'htmlOptions' => array('style' => 'width:100%'),
   ));?>
-  
-<ul><?php
-foreach ($model->veranstaltungen as $value) {
-	echo "<li>".CHTML::link($value->titel,array("veranstaltung/view","id"=>$value->id))."</li>";
-}
-
-?>
-</ul>
-</div>