summaryrefslogtreecommitdiff
path: root/protected/views
diff options
context:
space:
mode:
Diffstat (limited to 'protected/views')
-rw-r--r--protected/views/kategorie/_form.php2
-rw-r--r--protected/views/kategorie/index.php27
-rw-r--r--protected/views/kategorie/update.php7
-rw-r--r--protected/views/layouts/main.php2
-rw-r--r--protected/views/myAngebot/_form.php51
-rw-r--r--protected/views/myAngebot/_search.php29
-rw-r--r--protected/views/myAngebot/create.php14
-rw-r--r--protected/views/myAngebot/index.php30
-rw-r--r--protected/views/myAngebot/update.php17
-rw-r--r--protected/views/speisTrank/_angebot_vereine.php20
-rw-r--r--protected/views/speisTrank/_form.php2
-rw-r--r--protected/views/standort/_form.php6
-rw-r--r--protected/views/user/_form.php2
-rw-r--r--protected/views/verein/_form.php2
-rw-r--r--protected/views/verein/index.php28
-rw-r--r--protected/views/verein/update.php3
16 files changed, 177 insertions, 65 deletions
diff --git a/protected/views/kategorie/_form.php b/protected/views/kategorie/_form.php
index 156fdd1..a6b9971 100644
--- a/protected/views/kategorie/_form.php
+++ b/protected/views/kategorie/_form.php
@@ -6,7 +6,7 @@ $form=$this->beginWidget('CActiveForm', array(
'enableAjaxValidation'=>false,
)); ?>
- <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); ?>
diff --git a/protected/views/kategorie/index.php b/protected/views/kategorie/index.php
index 3629458..2afd66f 100644
--- a/protected/views/kategorie/index.php
+++ b/protected/views/kategorie/index.php
@@ -1,39 +1,20 @@
<?php
$this->breadcrumbs=array(
- 'Kategorien verwalten',
+ 'Kategorien',
);
$this->menu=array(
array('label'=>'Kategorie 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('kategorie-grid', {
- data: $(this).serialize()
- });
- return false;
-});
-");
?>
-<h1>Kategorien verwalten</h1>
+<h1>Kategorien</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'=>'kategorie-grid',
diff --git a/protected/views/kategorie/update.php b/protected/views/kategorie/update.php
index e8a09e6..b090579 100644
--- a/protected/views/kategorie/update.php
+++ b/protected/views/kategorie/update.php
@@ -1,12 +1,11 @@
<?php
$this->breadcrumbs=array(
- 'Kategories'=>array('index'),
- $model->name=>array('view','id'=>$model->id),
- 'Kategorie bearbeiten',
+ 'Kategorien'=>array('index'),
+ '"'.$model->name.'" bearbeiten',
);
$this->menu=array(
- array('label'=>'Kategorien verwalten', 'url'=>array('index')),
+ array('label'=>'Kategorien', 'url'=>array('index')),
array('label'=>'Kategorie erstellen', 'url'=>array('create')),
array('label'=>'Kategorie anzeigen', 'url'=>array('view', 'id'=>$model->id)),
);
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 6f00be2..85ee278 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -37,6 +37,8 @@
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "kategorie"),
array("label"=>"Speis & Trank", "url"=>array("/speisTrank/index"),
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "speisTrank"),
+ array("label"=>"Speis & Trank", "url"=>array("/myAngebot/index"),
+ "visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myAngebot"),
array("label"=>"Veranstaltungen", "url"=>array("/veranstaltung/index"),
"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "veranstaltung"),
array("label"=>"Benutzer", "url"=>array("/user/admin"),
diff --git a/protected/views/myAngebot/_form.php b/protected/views/myAngebot/_form.php
new file mode 100644
index 0000000..f48ecc9
--- /dev/null
+++ b/protected/views/myAngebot/_form.php
@@ -0,0 +1,51 @@
+<div class="form">
+
+<?php $form=$this->beginWidget('CActiveForm', array(
+ 'id'=>'angebot-form',
+ 'enableAjaxValidation'=>false,
+)); ?>
+
+ <?php $this->renderPartial('/common/_required_fields_text'); ?>
+
+ <?php echo $form->errorSummary($model); ?>
+
+ <div class="row">
+ <?php echo $form->labelEx($model, 'angebot_id'); ?>
+ <?php echo $this->widget('zii.widgets.jui.CJuiAutoComplete', array(
+ 'name'=>'city',
+ 'source'=>array('ac1', 'ac2', 'ac3'),
+ // additional javascript options for the autocomplete plugin
+ 'options'=>array(
+ 'minLength'=>'2',
+ ),
+ 'htmlOptions'=>array(
+ 'style'=>'height:20px;'
+ ),
+)); ?>
+ <?php echo $form->error($model, 'angebot_id'); ?>
+ </div>
+
+ <div class="row">
+ <?php echo $form->labelEx($model,'menge'); ?>
+ <?php echo $form->textField($model,'menge',array('size'=>60,'maxlength'=>80)); ?>
+ <?php echo $form->error($model,'menge'); ?>
+ </div>
+
+ <div class="row">
+ <?php echo $form->labelEx($model,'preis'); ?>
+ <?php echo $form->textField($model,'preis',array('size'=>60,'maxlength'=>80)); ?>
+ <?php echo $form->error($model,'preis'); ?>
+ </div>
+
+ <div class="row">
+ <?php echo $form->labelEx($model,'published'); ?>
+ <?php echo $form->checkbox($model,'published'); ?>
+ <?php echo $form->error($model,'published'); ?>
+ </div>
+
+ <div class="row buttons">
+ <?php echo CHtml::submitButton($model->isNewRecord ? 'Erstellen' : 'Speichern'); ?>
+ </div>
+
+<?php $this->endWidget(); ?>
+</div> \ No newline at end of file
diff --git a/protected/views/myAngebot/_search.php b/protected/views/myAngebot/_search.php
new file mode 100644
index 0000000..790eae1
--- /dev/null
+++ b/protected/views/myAngebot/_search.php
@@ -0,0 +1,29 @@
+<div class="wide form">
+
+<?php $form=$this->beginWidget('CActiveForm', array(
+ 'action'=>Yii::app()->createUrl($this->route),
+ 'method'=>'get',
+)); ?>
+
+ <div class="row">
+ <?php echo $form->label($model,'published'); ?>
+ <?php echo $form->checkbox($model,'published'); ?>
+ </div>
+
+ <div class="row">
+ <?php echo $form->label($model,'menge'); ?>
+ <?php echo $form->textField($model,'menge'); ?>
+ </div>
+
+ <div class="row">
+ <?php echo $form->label($model,'preis'); ?>
+ <?php echo $form->textField($model,'preis'); ?>
+ </div>
+
+ <div class="row buttons">
+ <?php echo CHtml::submitButton('Search'); ?>
+ </div>
+
+<?php $this->endWidget(); ?>
+
+</div><!-- search-form --> \ No newline at end of file
diff --git a/protected/views/myAngebot/create.php b/protected/views/myAngebot/create.php
new file mode 100644
index 0000000..1a6bf5a
--- /dev/null
+++ b/protected/views/myAngebot/create.php
@@ -0,0 +1,14 @@
+<?php
+$this->breadcrumbs=array(
+ 'Speis & Trank'=>array('index'),
+ 'Kulinarisches Angebot erstellen',
+);
+
+$this->menu=array(
+ array('label'=>'Speis & Trank', 'url'=>array('index')),
+);
+?>
+
+<h1>Kulinarisches Angebot erstellen</h1>
+
+<?php echo $this->renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file
diff --git a/protected/views/myAngebot/index.php b/protected/views/myAngebot/index.php
new file mode 100644
index 0000000..0c7fc43
--- /dev/null
+++ b/protected/views/myAngebot/index.php
@@ -0,0 +1,30 @@
+<?php
+$this->breadcrumbs=array(
+ 'Speis & Trank',
+);?>
+
+
+<h1>Meine Angebote</h1>
+
+<?php $this->renderPartial('/common/_comparison_text'); ?>
+
+<?php $this->renderPartial('/common/_advanced_search',array(
+ 'model'=>$model,
+)); ?>
+
+<?php $this->widget('zii.widgets.grid.CGridView', array(
+ 'id'=>'angebot-grid',
+ 'dataProvider'=>$model->search(),
+ 'filter'=>$model,
+ 'columns'=>array(
+ array('header'=>'Angebot', 'value'=>'$data->angebot->name', 'name'=>'angebot_id', 'filter'=>CHtml::listData(Angebot::model()->findAll(), 'id', 'name')),
+ array('header'=>'Verein', 'value'=>'$data->verein->name'),
+ array('header'=>'Menge', 'value'=>'Format::number($data->menge, $data->einheit)'),
+ array('header'=>'Preis', 'value'=>'Format::currency($data->preis)'),
+ array('header'=>'Öffentlich',
+ 'value'=>'CHtml::image($data->published ? "images/ok.png" : "images/nok.png", $data->published ? "ok.png" : "nok.png")', 'type'=>'raw'),
+ array(
+ 'class'=>'CButtonColumn'
+ ),
+ ),
+)); ?> \ No newline at end of file
diff --git a/protected/views/myAngebot/update.php b/protected/views/myAngebot/update.php
new file mode 100644
index 0000000..e3bc87a
--- /dev/null
+++ b/protected/views/myAngebot/update.php
@@ -0,0 +1,17 @@
+<?php
+$this->breadcrumbs=array(
+ 'Speis & Trank'=>array('index'),
+ $model->name.' bearbeiten',
+
+);
+
+$this->menu=array(
+ array('label'=>'Speis & Trank', 'url'=>array('index')),
+ array('label'=>'Kulinarisches Angebot erstellen', 'url'=>array('create')),
+ array('label'=>$model->name.' anzeigen', 'url'=>array('view', 'id'=>$model->id)),
+);
+?>
+
+<h1><?php echo $model->name; ?> bearbeiten</h1>
+
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'kategorien'=>$kategorien)); ?> \ No newline at end of file
diff --git a/protected/views/speisTrank/_angebot_vereine.php b/protected/views/speisTrank/_angebot_vereine.php
index 93c1ebd..2d65d35 100644
--- a/protected/views/speisTrank/_angebot_vereine.php
+++ b/protected/views/speisTrank/_angebot_vereine.php
@@ -1,8 +1,12 @@
-<ul>
-<?php foreach($angebot_vereine as $verein): ?>
- <li>
- <?php echo CHtml::link(Verein::model()->findByPk($verein->verein_id)->name, array("/verein/view", "id"=>$verein->verein_id)); ?>
- <?php echo $verein->menge." ".$verein->einheit?> für <?php echo $verein->preis?>€
- </li>
-<?php endforeach; ?>
-</ul> \ No newline at end of file
+<?php
+$dataProvider = new CArrayDataProvider($angebot_vereine);
+$dataProvider->keyField = false;
+$this->widget('zii.widgets.grid.CGridView', array(
+ 'id'=>'angebot-vereine-grid',
+ 'dataProvider'=>$dataProvider,
+ 'columns'=>array(
+ array('header'=>'Verein', 'value'=>'CHtml::link(Verein::model()->findByPk($data->verein_id)->name, array("/verein/view", "id"=>$data->verein_id))', 'type'=>'raw'),
+ array('header'=>'Menge', 'value'=>'Format::number($data->menge, $data->einheit)'),
+ array('header'=>'Preis', 'value'=>'Format::currency($data->preis)')
+ ),
+)); ?> \ No newline at end of file
diff --git a/protected/views/speisTrank/_form.php b/protected/views/speisTrank/_form.php
index 27349a4..ca1ba6f 100644
--- a/protected/views/speisTrank/_form.php
+++ b/protected/views/speisTrank/_form.php
@@ -44,7 +44,7 @@
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save'); ?>
+ <?php echo CHtml::submitButton($model->isNewRecord ? 'Erstellen' : 'Speichern'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/standort/_form.php b/protected/views/standort/_form.php
index fb17125..f37dc3d 100644
--- a/protected/views/standort/_form.php
+++ b/protected/views/standort/_form.php
@@ -16,6 +16,12 @@
</div>
<div class="row">
+ <?php echo $form->labelEx($model,'type'); ?>
+ <?php echo Html::enumDropDownList($model, 'type'); ?>
+ <?php echo $form->error($model,'type'); ?>
+ </div>
+
+ <div class="row">
<?php echo $form->labelEx($model,'pos_lat'); ?>
<?php echo $form->textField($model,'pos_lat'); ?>
<?php echo $form->error($model,'pos_lat'); ?>
diff --git a/protected/views/user/_form.php b/protected/views/user/_form.php
index dda3df4..163e11c 100644
--- a/protected/views/user/_form.php
+++ b/protected/views/user/_form.php
@@ -5,7 +5,7 @@
'enableAjaxValidation'=>false,
)); ?>
- <p class="note">Fields with <span class="required">*</span> are required.</p>
+ <?php $this->renderPartial('/common/_required_fields_text'); ?>
<?php echo $form->errorSummary($model); ?>
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php
index 9950421..9aab04d 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); ?>
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..0d37b80 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(
generated by cgit v1.0-28-g1787 at 2026-01-10 10:02:39 +0000