4 files changed, 9 insertions, 30 deletions
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php
index 9950421..dbda2db 100644
--- a/protected/views/verein/_form.php
+++ b/protected/views/verein/_form.php
@@ -6,7 +6,7 @@
 	"htmlOptions"=>array('enctype'=>'multipart/form-data'),
 )); ?>
 
-	<p class="note">Mit <span class="required">*</span> gekennzeichnete Felder sind Pflichtfelder.</p>
+	<?php $this->renderPartial('/common/_required_fields_text'); ?>
 
 	<?php echo $form->errorSummary($model); ?>
 
@@ -14,7 +14,7 @@
 		<?php echo $form->labelEx($model,'slug'); ?>
 		<?php
 		if (Yii::app()->user->isAdmin) {
-			echo $form->textField($model,'slug',array('size'=>60,'maxlength'=>255));
+			echo $form->dropDownList($model, "slug", CHtml::listData($slugs, "username", "username"), array('empty' => '-- Bitte Benutzer wählen --'));
 		} else {
 			echo CHtml::encode($model->slug);
 		}
diff --git a/protected/views/verein/create.php b/protected/views/verein/create.php
index 02a63f8..46f088e 100644
--- a/protected/views/verein/create.php
+++ b/protected/views/verein/create.php
@@ -11,4 +11,4 @@ $this->menu=array(
 
 <h1>Verein erstellen</h1>
 
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte)); ?>
-\ No newline at end of file
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
+\ No newline at end of file
diff --git a/protected/views/verein/index.php b/protected/views/verein/index.php
index a396dbb..ca98727 100644
--- a/protected/views/verein/index.php
+++ b/protected/views/verein/index.php
@@ -1,40 +1,20 @@
 <?php
 $this->breadcrumbs=array(
-	'Vereine'=>array('index'),
-	'Verwalten',
+	'Vereine',
 );
 
 $this->menu=array(
 	array('label'=>'Verein erstellen', 'url'=>array('create')),
 );
-
-Yii::app()->clientScript->registerScript('search', "
-$('.search-button').click(function(){
-	$('.search-form').toggle();
-	return false;
-});
-$('.search-form form').submit(function(){
-	$.fn.yiiGridView.update('verein-grid', {
-		data: $(this).serialize()
-	});
-	return false;
-});
-");
 ?>
 
-<h1>Vereine verwalten</h1>
+<h1>Vereine</h1>
 
-<p>
-Die optionale Eingabe von Vergleichsoperatoren (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b>
-or <b>=</b>) zu Beginn eines Suchwertes dient der Spezifikation, wie der Vergleich erfolgen soll.
-</p>
+<?php $this->renderPartial('/common/_comparison_text'); ?>
 
-<?php echo CHtml::link('Erweiterte Suche','#',array('class'=>'search-button')); ?>
-<div class="search-form" style="display:none">
-<?php $this->renderPartial('_search',array(
+<?php $this->renderPartial('/common/_advanced_search',array(
 	'model'=>$model,
 )); ?>
-</div><!-- search-form -->
 
 <?php $this->widget('zii.widgets.grid.CGridView', array(
 	'id'=>'verein-grid',
diff --git a/protected/views/verein/update.php b/protected/views/verein/update.php
index 2ce51a8..5230605 100644
--- a/protected/views/verein/update.php
+++ b/protected/views/verein/update.php
@@ -1,8 +1,7 @@
 <?php
 $this->breadcrumbs=array(
 	'Vereine'=>array('index'),
-	$model->name=>array('view','id'=>$model->id),
-	'Bearbeiten',
+	'"'.$model->name.'" bearbeiten',
 );
 
 $this->menu=array(
@@ -14,4 +13,4 @@ $this->menu=array(
 
 <h1>Verein '<?php echo $model->name; ?>' bearbeiten</h1>
 
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte)); ?>
-\ No newline at end of file
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
+\ No newline at end of file