Stand Produktion

5 files changed, 9 insertions, 23 deletions

diff --git a/images/Altstadtfest_titel.jpg b/images/Altstadtfest_titel.jpg
deleted file mode 100644
index d95f819..0000000
--- a/images/Altstadtfest_titel.jpg
+++ /dev/null
diff --git a/index-test.php b/index-test.php
deleted file mode 100644
index e017aae..0000000
--- a/index-test.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * This is the bootstrap file for test application.
- * This file should be removed when the application is deployed for production.
- */
-
-// change the following paths if necessary
-$yii=dirname(__FILE__).'/../yii-framework/framework/yii.php';
-$config=dirname(__FILE__).'/protected/config/test.php';
-
-// remove the following line when in production mode
-defined('YII_DEBUG') or define('YII_DEBUG',true);
-
-require_once($yii);
-Yii::createWebApplication($config)->run();
diff --git a/protected/components/Format.php b/protected/components/Format.php
index 1be259f..8a80768 100644
--- a/protected/components/Format.php
+++ b/protected/components/Format.php
@@ -1,6 +1,7 @@
 <?php
 class Format {
 	public static function currency($value, $currency = 'EUR') {
+		if ($value <=0) { return "?,?? EUR"; }
 		return Yii::app()->locale->numberFormatter->formatCurrency($value, $currency);
 	}
 	
diff --git a/protected/config/main.php b/protected/config/main.php
index f880b8a..1ee938c 100644
--- a/protected/config/main.php
+++ b/protected/config/main.php
@@ -7,7 +7,7 @@
 // CWebApplication properties can be configured here.
 return array(
 	'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-	'name'=>'Waiblinger Altstadtfest 2012',
+	'name'=>'Waiblinger Altstadtfest 2013',
 	'theme' => 'astaf',
 	'sourceLanguage' => 'en',
 	'language' =>'de',
@@ -70,10 +70,10 @@ return array(
 		// uncomment the following to use a MySQL database
 		
 		'db'=>array(
-			'connectionString' => 'mysql:host=localhost;dbname=astaf',
+			'connectionString' => 'mysql:host=database;dbname=astaf_2012',
 			'emulatePrepare' => true,
-			'username' => 'root',
-			'password' => '',
+			'username' => 'astaf',
+			'password' => 'AsTaF4',
 			'charset' => 'utf8',
 			'tablePrefix' => 'tbl_'
 		),
@@ -108,8 +108,8 @@ return array(
 		'pos_long'=>9.31750059128,
 		'map_api_key'=>'ABQIAAAAzwMJRVnIOel5nqTjdUcPrRTSNOUR83EeIVShY4aBvXxHJx0DexSUFNGH3KQhtFhfSNHxkECqL5rQBA',
 		'map_api_domain'=>'www.astaf.de',
-		'start_date'=>'01.07.2012',
-		'end_date'=>'03.07.2012',
+		'start_date'=>'28.06.2013',
+		'end_date'=>'30.06.2013',
 		'start_time'=>'19:00',
 		'end_time'=>'23:00',
 	),
diff --git a/protected/views/veranstaltung/view.php b/protected/views/veranstaltung/view.php
index 2547f4f..72c826e 100644
--- a/protected/views/veranstaltung/view.php
+++ b/protected/views/veranstaltung/view.php
@@ -13,8 +13,8 @@ $this->menu=array(
 ?>
 
 <h3><?php echo $model->titel; ?></h3>
-<p>von <?php echo Yii::app()->dateFormatter->format('EEEE hh:mm',$model->startzeit)." Uhr"?> bis <?php 
-echo Yii::app()->dateFormatter->format('EEEE hh:mm',$model->endzeit)." Uhr"?> 
+<p>von <?php echo Yii::app()->dateFormatter->format('EEEE HH:mm',$model->startzeit)." Uhr"?> bis <?php 
+echo Yii::app()->dateFormatter->format('EEEE HH:mm',$model->endzeit)." Uhr"?> 
 auf der Bühne <?php echo CHtml::link($model->standort->name,array("standort/view","id"=>$model->standort_id))?></p>
 <p>
 <?php