summaryrefslogtreecommitdiff
path: root/protected
diff options
context:
space:
mode:
authorTristan Zur <tzur@ccwn.org>2012-04-29 14:24:31 +0200
committerTristan Zur <tzur@ccwn.org>2012-04-29 14:24:31 +0200
commit94bb97f7b574ad8557d568a2ef1288dae3b4e9c8 (patch)
treea49f462e854e3f72eaf370d46be8d99d0ae06c13 /protected
parent148a216bba21cec1cbe07b60b5191791e0016d6f (diff)
- Einige Texte ins Deutsche übersetzt
- Linkbeschriftungen vereinheitlicht
Diffstat (limited to 'protected')
-rw-r--r--protected/controllers/VereinController.php4
-rw-r--r--protected/messages/de/astaf.php6
-rw-r--r--protected/messages/en/astaf.php5
-rw-r--r--protected/runtime/application.log33
-rw-r--r--protected/views/kategorie/_search.php2
-rw-r--r--protected/views/kategorie/create.php4
-rw-r--r--protected/views/kategorie/view.php8
-rw-r--r--protected/views/speisTrank/_search.php2
-rw-r--r--protected/views/speisTrank/update.php2
-rw-r--r--protected/views/speisTrank/view.php4
-rw-r--r--protected/views/standort/_search.php2
-rw-r--r--protected/views/veranstaltung/_search.php2
-rw-r--r--protected/views/verein/_search.php11
-rw-r--r--protected/views/verein/create.php2
-rw-r--r--protected/views/verein/index.php2
-rw-r--r--protected/views/verein/update.php4
-rw-r--r--protected/views/verein/view.php6
17 files changed, 70 insertions, 29 deletions
diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index aa18245..bf30a04 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -66,9 +66,11 @@ class VereinController extends Controller
}
$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
+ $slugs = User::model()->findAll();
$this->render('create',array(
'model'=>$model,
- 'standorte'=>$standorte
+ 'standorte'=>$standorte,
+ 'slugs'=>$slugs
));
}
diff --git a/protected/messages/de/astaf.php b/protected/messages/de/astaf.php
new file mode 100644
index 0000000..ac851a0
--- /dev/null
+++ b/protected/messages/de/astaf.php
@@ -0,0 +1,6 @@
+<?php
+return array(
+ 'The value of {attribute} ({value}) is not {operator} {compareAttribute} ({compareValue}).' => 'Der Wert von \'{attribute}\' ({value}) muss \'{operator}\' als der Wert von \'{compareAttribute}\' ({compareValue}) sein.',
+ 'The value of {attribute} ({value}) is not between {minDate} and {maxDate}.' => 'Der Wert von \'{attribute}\' ({value}) muss zwischen \'{minDate}\' und \'{maxDate}\' liegen.',
+);
+?> \ No newline at end of file
diff --git a/protected/messages/en/astaf.php b/protected/messages/en/astaf.php
new file mode 100644
index 0000000..458c61b
--- /dev/null
+++ b/protected/messages/en/astaf.php
@@ -0,0 +1,5 @@
+<?php
+return array(
+ 'validation.date.compare.error' => 'The value of {attribute} ({value}) is not {operator} {compareAttribute} ({compareValue}).'
+);
+?> \ No newline at end of file
diff --git a/protected/runtime/application.log b/protected/runtime/application.log
index 7187392..e0eff44 100644
--- a/protected/runtime/application.log
+++ b/protected/runtime/application.log
@@ -5166,3 +5166,36 @@ Stack trace:
REQUEST_URI=/admin.astaf.de/index.php?r=veranstaltung/index
HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=verein/index
---
+2012/04/29 10:15:30 [error] [php] Undefined variable: slugs (D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\verein\create.php:14)
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(870): VereinController->renderFile()
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(783): VereinController->renderPartial()
+#2 D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\VereinController.php(72): VereinController->render()
+#3 D:\Projects\Astaf\workspace\yii\framework\web\actions\CInlineAction.php(50): VereinController->actionCreate()
+#4 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(309): CInlineAction->runWithParams()
+#5 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(134): VereinController->runAction()
+#6 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilter.php(41): CFilterChain->run()
+#7 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(1146): CAccessControlFilter->filter()
+#8 D:\Projects\Astaf\workspace\yii\framework\web\filters\CInlineFilter.php(59): VereinController->filterAccessControl()
+#9 D:\Projects\Astaf\workspace\yii\framework\web\filters\CFilterChain.php(131): CInlineFilter->filter()
+#10 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(292): CFilterChain->run()
+#11 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(266): VereinController->runActionWithFilters()
+#12 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): VereinController->run()
+#13 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController()
+#14 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#15 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CWebApplication->run()
+REQUEST_URI=/admin.astaf.de/index.php?r=verein/create
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\views\verein\create.php (14)
+in D:\Projects\Astaf\workspace\admin.astaf.de\protected\controllers\VereinController.php (72)
+in D:\Projects\Astaf\workspace\admin.astaf.de\index.php (13)
+2012/04/29 10:22:16 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "admin".' in D:\Projects\Astaf\workspace\yii\framework\web\CController.php:484
+Stack trace:
+#0 D:\Projects\Astaf\workspace\yii\framework\web\CController.php(271): CController->missingAction('admin')
+#1 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(276): CController->run('admin')
+#2 D:\Projects\Astaf\workspace\yii\framework\web\CWebApplication.php(135): CWebApplication->runController('verein/admin')
+#3 D:\Projects\Astaf\workspace\yii\framework\base\CApplication.php(162): CWebApplication->processRequest()
+#4 D:\Projects\Astaf\workspace\admin.astaf.de\index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/admin.astaf.de/index.php?r=verein/admin
+HTTP_REFERER=http://dev.astaf.de:90/admin.astaf.de/index.php?r=verein/update&id=1
+---
diff --git a/protected/views/kategorie/_search.php b/protected/views/kategorie/_search.php
index 7352abd..2c646ee 100644
--- a/protected/views/kategorie/_search.php
+++ b/protected/views/kategorie/_search.php
@@ -36,7 +36,7 @@
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Search'); ?>
+ <?php echo CHtml::submitButton('Suchen'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/kategorie/create.php b/protected/views/kategorie/create.php
index 19eaba3..6912d15 100644
--- a/protected/views/kategorie/create.php
+++ b/protected/views/kategorie/create.php
@@ -5,10 +5,10 @@ $this->breadcrumbs=array(
);
$this->menu=array(
- array('label'=>'Kategorien verwalten', 'url'=>array('index')),
+ array('label'=>'Kategorien', 'url'=>array('index')),
);
?>
-<h1>Create Kategorie</h1>
+<h1>Kategorie erstellen</h1>
<?php echo $this->renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file
diff --git a/protected/views/kategorie/view.php b/protected/views/kategorie/view.php
index 2a1bc4a..d3348f9 100644
--- a/protected/views/kategorie/view.php
+++ b/protected/views/kategorie/view.php
@@ -1,14 +1,14 @@
<?php
$this->breadcrumbs=array(
- 'Kategories'=>array('index'),
+ 'Kategorien'=>array('index'),
$model->name,
);
$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 bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
- array('label'=>'Kategorie löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Wollen Sie diese Kategorie wirklich löschen?')),
+ array('label'=>'\''.$model->name.'\' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
+ array('label'=>'\''.$model->name.'\' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Willst du die Kategorie \''.$model->name.'\' wirklich löschen?')),
);
?>
diff --git a/protected/views/speisTrank/_search.php b/protected/views/speisTrank/_search.php
index a88293a..478a866 100644
--- a/protected/views/speisTrank/_search.php
+++ b/protected/views/speisTrank/_search.php
@@ -31,7 +31,7 @@
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Search'); ?>
+ <?php echo CHtml::submitButton('Suchen'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/speisTrank/update.php b/protected/views/speisTrank/update.php
index e3bc87a..e866f14 100644
--- a/protected/views/speisTrank/update.php
+++ b/protected/views/speisTrank/update.php
@@ -8,7 +8,7 @@ $this->breadcrumbs=array(
$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)),
+ array('label'=>'\''.$model->name.'\' anzeigen', 'url'=>array('view', 'id'=>$model->id)),
);
?>
diff --git a/protected/views/speisTrank/view.php b/protected/views/speisTrank/view.php
index 34f2b8a..f46fd87 100644
--- a/protected/views/speisTrank/view.php
+++ b/protected/views/speisTrank/view.php
@@ -7,8 +7,8 @@ $this->breadcrumbs=array(
$this->menu=array(
array('label'=>'Speis & Trank', 'url'=>array('index')),
array('label'=>'Kulinarisches Angebot erstellen', 'url'=>array('create')),
- array('label'=>$model->name.' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
- array('label'=>$model->name.' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')),
+ array('label'=>'\''.$model->name.'\' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
+ array('label'=>'\''.$model->name.'\' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Willst du das kulinarische Angebot \''.$model->name.'\' wirklich löschen?')),
);
?>
diff --git a/protected/views/standort/_search.php b/protected/views/standort/_search.php
index eeab539..a527d29 100644
--- a/protected/views/standort/_search.php
+++ b/protected/views/standort/_search.php
@@ -31,7 +31,7 @@
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Search'); ?>
+ <?php echo CHtml::submitButton('Suchen'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/veranstaltung/_search.php b/protected/views/veranstaltung/_search.php
index 099603c..d9a0c0e 100644
--- a/protected/views/veranstaltung/_search.php
+++ b/protected/views/veranstaltung/_search.php
@@ -46,7 +46,7 @@
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Search'); ?>
+ <?php echo CHtml::submitButton('Suchen'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/verein/_search.php b/protected/views/verein/_search.php
index d06dd24..ec45c28 100644
--- a/protected/views/verein/_search.php
+++ b/protected/views/verein/_search.php
@@ -21,11 +21,6 @@
</div>
<div class="row">
- <?php echo $form->label($model,'bild'); ?>
- <?php echo $form->textField($model,'bild',array('size'=>60,'maxlength'=>100)); ?>
- </div>
-
- <div class="row">
<?php echo $form->label($model,'email'); ?>
<?php echo $form->textField($model,'email',array('size'=>60,'maxlength'=>100)); ?>
</div>
@@ -47,16 +42,16 @@
<div class="row">
<?php echo $form->label($model,'standort_id'); ?>
- <?php echo $form->textField($model,'standort_id'); ?>
+ <?php echo $form->dropDownList($model, 'standort_id', CHtml::listData(Standort::model()->findAll(array('condition'=>'type="Stand"')), 'id', 'name'), array("empty"=>"")); ?>
</div>
<div class="row">
<?php echo $form->label($model,'published'); ?>
- <?php echo $form->textField($model,'published'); ?>
+ <?php echo $form->checkbox($model,'published'); ?>
</div>
<div class="row buttons">
- <?php echo CHtml::submitButton('Search'); ?>
+ <?php echo CHtml::submitButton('Suchen'); ?>
</div>
<?php $this->endWidget(); ?>
diff --git a/protected/views/verein/create.php b/protected/views/verein/create.php
index 46f088e..4526ac1 100644
--- a/protected/views/verein/create.php
+++ b/protected/views/verein/create.php
@@ -5,7 +5,7 @@ $this->breadcrumbs=array(
);
$this->menu=array(
- array('label'=>'Vereine verwalten', 'url'=>array('index'))
+ array('label'=>'Vereine', 'url'=>array('index'))
);
?>
diff --git a/protected/views/verein/index.php b/protected/views/verein/index.php
index ca98727..45b5e67 100644
--- a/protected/views/verein/index.php
+++ b/protected/views/verein/index.php
@@ -22,7 +22,7 @@ $this->menu=array(
'filter'=>$model,
'columns'=>array(
'name',
- array('header'=>'Homepage', 'value'=>'CHtml::link($data->url, $data->url, array("target"=>"_blank"))', 'type'=>'raw'),
+ array('header'=>'Homepage', 'name'=>'url', 'value'=>'CHtml::link($data->url, $data->url, array("target"=>"_blank"))', 'type'=>'raw'),
array('header'=>'Bild', 'value'=>'CHtml::image($data->bild)', 'type'=>'raw'),
'email',
'slug',
diff --git a/protected/views/verein/update.php b/protected/views/verein/update.php
index 5230605..19cdcfe 100644
--- a/protected/views/verein/update.php
+++ b/protected/views/verein/update.php
@@ -5,9 +5,9 @@ $this->breadcrumbs=array(
);
$this->menu=array(
- array('label'=>'Vereine verwalten', 'url'=>array('admin')),
+ array('label'=>'Vereine', 'url'=>array('index')),
array('label'=>'Verein erstellen', 'url'=>array('create')),
- array('label'=>'Verein anzeigen', 'url'=>array('view', 'id'=>$model->id))
+ array('label'=>'\''.$model->slug.'\' anzeigen', 'url'=>array('view', 'id'=>$model->id))
);
?>
diff --git a/protected/views/verein/view.php b/protected/views/verein/view.php
index 6efb9e7..0f8e8f0 100644
--- a/protected/views/verein/view.php
+++ b/protected/views/verein/view.php
@@ -5,10 +5,10 @@ $this->breadcrumbs=array(
);
$this->menu=array(
- array('label'=>'Vereine verwalten', 'url'=>array('index')),
+ array('label'=>'Vereine', 'url'=>array('index')),
array('label'=>'Verein erstellen', 'url'=>array('create')),
- array('label'=>'Verein bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
- array('label'=>'Verein löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')),
+ array('label'=>'\''.$model->slug.'\' bearbeiten', 'url'=>array('update', 'id'=>$model->id)),
+ array('label'=>'\''.$model->slug.'\' löschen', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Willst du \''.$model->slug.'\' wirklich löschen?')),
);
?>