From b938b240a36bb7098a952d1b0bf0307a24c9dc36 Mon Sep 17 00:00:00 2001
From: Patrick Seeger <pseeger@ccwn.org>
Date: Thu, 7 Jun 2012 21:44:28 +0200
Subject: Eigene Wettericons

---
 images/wetter/chance_of_rain.png             | Bin 0 -> 8268 bytes
 images/wetter/chance_of_snow.png             | Bin 0 -> 6053 bytes
 images/wetter/chance_of_storm.png            | Bin 0 -> 6190 bytes
 images/wetter/chance_of_tstorm.png           | Bin 0 -> 8897 bytes
 images/wetter/cloudy.png                     | Bin 0 -> 6101 bytes
 images/wetter/dust.png                       | Bin 0 -> 9070 bytes
 images/wetter/flurries.png                   | Bin 0 -> 6445 bytes
 images/wetter/fog.png                        | Bin 0 -> 9016 bytes
 images/wetter/haze.png                       | Bin 0 -> 8955 bytes
 images/wetter/icy.png                        | Bin 0 -> 6022 bytes
 images/wetter/mist.png                       | Bin 0 -> 6213 bytes
 images/wetter/mostly_cloudy.png              | Bin 0 -> 8246 bytes
 images/wetter/mostly_sunny.png               | Bin 0 -> 7355 bytes
 images/wetter/partly_cloudy.png              | Bin 0 -> 7348 bytes
 images/wetter/rain.png                       | Bin 0 -> 6417 bytes
 images/wetter/sleet.png                      | Bin 0 -> 7487 bytes
 images/wetter/smoke.png                      | Bin 0 -> 9145 bytes
 images/wetter/snow.png                       | Bin 0 -> 6786 bytes
 images/wetter/storm.png                      | Bin 0 -> 6468 bytes
 images/wetter/sunny.png                      | Bin 0 -> 6097 bytes
 images/wetter/thunderstorm.png               | Bin 0 -> 6878 bytes
 protected/extensions/wetter/Wetter.php       |   4 ++--
 protected/extensions/wetter/views/wetter.php |  13 ++++++++-----
 23 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 images/wetter/chance_of_rain.png
 create mode 100644 images/wetter/chance_of_snow.png
 create mode 100644 images/wetter/chance_of_storm.png
 create mode 100644 images/wetter/chance_of_tstorm.png
 create mode 100644 images/wetter/cloudy.png
 create mode 100644 images/wetter/dust.png
 create mode 100644 images/wetter/flurries.png
 create mode 100644 images/wetter/fog.png
 create mode 100644 images/wetter/haze.png
 create mode 100644 images/wetter/icy.png
 create mode 100644 images/wetter/mist.png
 create mode 100644 images/wetter/mostly_cloudy.png
 create mode 100644 images/wetter/mostly_sunny.png
 create mode 100644 images/wetter/partly_cloudy.png
 create mode 100644 images/wetter/rain.png
 create mode 100644 images/wetter/sleet.png
 create mode 100644 images/wetter/smoke.png
 create mode 100644 images/wetter/snow.png
 create mode 100644 images/wetter/storm.png
 create mode 100644 images/wetter/sunny.png
 create mode 100644 images/wetter/thunderstorm.png

diff --git a/images/wetter/chance_of_rain.png b/images/wetter/chance_of_rain.png
new file mode 100644
index 0000000..f9a979e
Binary files /dev/null and b/images/wetter/chance_of_rain.png differ
diff --git a/images/wetter/chance_of_snow.png b/images/wetter/chance_of_snow.png
new file mode 100644
index 0000000..de611ca
Binary files /dev/null and b/images/wetter/chance_of_snow.png differ
diff --git a/images/wetter/chance_of_storm.png b/images/wetter/chance_of_storm.png
new file mode 100644
index 0000000..00a83a2
Binary files /dev/null and b/images/wetter/chance_of_storm.png differ
diff --git a/images/wetter/chance_of_tstorm.png b/images/wetter/chance_of_tstorm.png
new file mode 100644
index 0000000..4d170a5
Binary files /dev/null and b/images/wetter/chance_of_tstorm.png differ
diff --git a/images/wetter/cloudy.png b/images/wetter/cloudy.png
new file mode 100644
index 0000000..22ef776
Binary files /dev/null and b/images/wetter/cloudy.png differ
diff --git a/images/wetter/dust.png b/images/wetter/dust.png
new file mode 100644
index 0000000..f4b7e64
Binary files /dev/null and b/images/wetter/dust.png differ
diff --git a/images/wetter/flurries.png b/images/wetter/flurries.png
new file mode 100644
index 0000000..371dbec
Binary files /dev/null and b/images/wetter/flurries.png differ
diff --git a/images/wetter/fog.png b/images/wetter/fog.png
new file mode 100644
index 0000000..a7f5773
Binary files /dev/null and b/images/wetter/fog.png differ
diff --git a/images/wetter/haze.png b/images/wetter/haze.png
new file mode 100644
index 0000000..80d31b0
Binary files /dev/null and b/images/wetter/haze.png differ
diff --git a/images/wetter/icy.png b/images/wetter/icy.png
new file mode 100644
index 0000000..60bd93b
Binary files /dev/null and b/images/wetter/icy.png differ
diff --git a/images/wetter/mist.png b/images/wetter/mist.png
new file mode 100644
index 0000000..0a00d9c
Binary files /dev/null and b/images/wetter/mist.png differ
diff --git a/images/wetter/mostly_cloudy.png b/images/wetter/mostly_cloudy.png
new file mode 100644
index 0000000..f4f8c78
Binary files /dev/null and b/images/wetter/mostly_cloudy.png differ
diff --git a/images/wetter/mostly_sunny.png b/images/wetter/mostly_sunny.png
new file mode 100644
index 0000000..e34944d
Binary files /dev/null and b/images/wetter/mostly_sunny.png differ
diff --git a/images/wetter/partly_cloudy.png b/images/wetter/partly_cloudy.png
new file mode 100644
index 0000000..0342273
Binary files /dev/null and b/images/wetter/partly_cloudy.png differ
diff --git a/images/wetter/rain.png b/images/wetter/rain.png
new file mode 100644
index 0000000..1d76c4f
Binary files /dev/null and b/images/wetter/rain.png differ
diff --git a/images/wetter/sleet.png b/images/wetter/sleet.png
new file mode 100644
index 0000000..e65ebef
Binary files /dev/null and b/images/wetter/sleet.png differ
diff --git a/images/wetter/smoke.png b/images/wetter/smoke.png
new file mode 100644
index 0000000..ed01f74
Binary files /dev/null and b/images/wetter/smoke.png differ
diff --git a/images/wetter/snow.png b/images/wetter/snow.png
new file mode 100644
index 0000000..76a0573
Binary files /dev/null and b/images/wetter/snow.png differ
diff --git a/images/wetter/storm.png b/images/wetter/storm.png
new file mode 100644
index 0000000..b52390b
Binary files /dev/null and b/images/wetter/storm.png differ
diff --git a/images/wetter/sunny.png b/images/wetter/sunny.png
new file mode 100644
index 0000000..54ae3ef
Binary files /dev/null and b/images/wetter/sunny.png differ
diff --git a/images/wetter/thunderstorm.png b/images/wetter/thunderstorm.png
new file mode 100644
index 0000000..e07ebbe
Binary files /dev/null and b/images/wetter/thunderstorm.png differ
diff --git a/protected/extensions/wetter/Wetter.php b/protected/extensions/wetter/Wetter.php
index 0e913a3..b9cde98 100644
--- a/protected/extensions/wetter/Wetter.php
+++ b/protected/extensions/wetter/Wetter.php
@@ -12,7 +12,7 @@ class Wetter extends CWidget {
 			$wetter['jetzt']['tag']='Aktuell';
 			$wetter['jetzt']['temperatur'] = (string) $mwetter[0]['temperatur'];
 			$wetter['jetzt']['zustand'] = (string) $mwetter[0]['zustand'];
-			$wetter['jetzt']['icon'] = (string) $mwetter[0]['icon'];
+			$wetter['jetzt']['icon'] = str_replace(".gif",".png",(string) $mwetter[0]['icon']);
 			$wetter['jetzt']['hoechsttemperatur']= (string) $mwetter[1]['hoechsttemperatur'];
 			$wetter['jetzt']['tiefsttemperatur']= (string) $mwetter[1]['tiefsttemperatur'];
 			
@@ -20,7 +20,7 @@ class Wetter extends CWidget {
 			$wetter['morgen']['hoechsttemperatur'] = (string) $mwetter[2]['hoechsttemperatur'];
 			$wetter['morgen']['tiefsttemperatur'] = (string) $mwetter[2]['tiefsttemperatur'];
 			$wetter['morgen']['zustand'] = (string) $mwetter[2]['zustand'];
-			$wetter['morgen']['icon'] = (string) $mwetter[2]['icon'];
+			$wetter['morgen']['icon'] = str_replace(".gif",".png",(string) $mwetter[2]['icon']);
 			Yii::app()->cache->set('extensions.Wetter.wetter',$wetter,3600);
 			//Yii::app()->user->setFlash('new', "Data retrieved from google");
 		}
diff --git a/protected/extensions/wetter/views/wetter.php b/protected/extensions/wetter/views/wetter.php
index 0ec96da..f03fff6 100644
--- a/protected/extensions/wetter/views/wetter.php
+++ b/protected/extensions/wetter/views/wetter.php
@@ -7,19 +7,22 @@
 <p>
 <div class="ym-grid linearize-level-3">
 	<div class="ym-g50 ym-gl">
-		<div class="ym-gbox-left">
+		<div class="ym-gbox-left" style="padding-right: 55px;background-repeat:no-repeat;background-position:top right; background-image:url(<?php echo Yii::app()->request->baseUrl."/images/wetter".$wetter['jetzt']['icon'];?>);">
 
 				<strong><?php echo $wetter['jetzt']['tag'];?></strong><br />
-				<?php echo "<img class=\"float-right bordered\" src=\"https://www.google.com/images/weather/".$wetter['jetzt']['icon']."\" alt=\"".$wetter['jetzt']['zustand']."\" />"
-					.$wetter['jetzt']['zustand']." bei ".$wetter['jetzt']['temperatur']."°C"; ?><br />Min. <?php echo $wetter['jetzt']['tiefsttemperatur']?>°C bis max. <?php echo $wetter['jetzt']['hoechsttemperatur']?>°C
+				<?php 
+				//echo "<img class=\"float-right bordered\" src=\"".Yii::app()->request->baseUrl."/images/wetter".$wetter['jetzt']['icon']."\" alt=\"".$wetter['jetzt']['zustand']."\" />";
+				
+					echo $wetter['jetzt']['zustand']." bei ".$wetter['jetzt']['temperatur']."°C"; ?><br />Min. <?php echo $wetter['jetzt']['tiefsttemperatur']?>°C bis max. <?php echo $wetter['jetzt']['hoechsttemperatur']?>°C
 
 		</div>
 	</div>
 	<div class="ym-g50 ym-gr">
-		<div class="ym-gbox-right">
+		<div class="ym-gbox-right" style="padding-right: 55px;background-repeat:no-repeat;background-position:top right; background-image:url(<?php echo Yii::app()->request->baseUrl."/images/wetter".$wetter['morgen']['icon'];?>);">
 
 				<strong><?php echo $wetter['morgen']['tag'];?></strong><br />
-				<?php echo "<img class=\"float-right bordered\" src=\"https://www.google.com/images/weather/".$wetter['morgen']['icon']."\" alt=\"".$wetter['morgen']['zustand']."\" />".$wetter['morgen']['zustand']." bei min. ".$wetter['morgen']['tiefsttemperatur']."°C bis max. ".$wetter['morgen']['hoechsttemperatur']."°C"; ?>
+				<?php //echo "<img class=\"float-right bordered\" src=\"https://www.google.com/images/weather/".$wetter['morgen']['icon']."\" alt=\"".$wetter['morgen']['zustand']."\" />";
+				echo $wetter['morgen']['zustand']." bei min. ".$wetter['morgen']['tiefsttemperatur']."°C bis max. ".$wetter['morgen']['hoechsttemperatur']."°C"; ?>
 
 		</div>
 	</div>
-- 
cgit v1.0-28-g1787