From d8b54d420fffebe84df42ed736eecd2fa9825172 Mon Sep 17 00:00:00 2001
From: ands <ands@andspad.(none)>
Date: Mon, 6 Dec 2010 22:50:51 +0100
Subject: [PATCH] Wettervorhersagewidget erstellt
---
webroot/config.php | 20 ++++++++--------
webroot/css/widget_light.css | 23 +++++++++++++++----
webroot/widgets/TwitterWall/TwitterWall.php | 2 +-
.../Wettervorhersage/Wettervorhersage.php | 20 ++++++++++++++++
4 files changed, 49 insertions(+), 16 deletions(-)
create mode 100644 webroot/widgets/Wettervorhersage/Wettervorhersage.php
diff --git a/webroot/config.php b/webroot/config.php
index a567787..7cd2a1b 100644
--- a/webroot/config.php
+++ b/webroot/config.php
@@ -7,15 +7,15 @@
$widgets = array(
//array("widget_name", "style_name", position_x, position_y, size_x, size_y);
- array("Logo", "widget", 0,0, 2,1),
- array("ZoneOffen", "widget_dark", 4,0, 2,1),
- array("Dummy", "widget_light", 0,1, 4,2),
- array("Marvin", "widget_light", 4,1, 2,1),
- array("TwitterWall","widget_light", 4,2, 2,4),
- array("Dummy", "widget_light", 0,3, 1,2),
- array("Dummy", "widget_dark", 1,3, 2,2),
- array("Dummy", "widget_light", 3,3, 1,2),
- array("Dummy", "widget_light", 0,5, 2,1),
- array("Dummy", "widget_light", 2,5, 2,1)
+ array("Logo", "widget", 0,0, 2,1),
+ array("ZoneOffen", "widget_dark", 4,0, 2,1),
+ array("Dummy", "widget_light", 0,1, 4,2),
+ array("Marvin", "widget_light", 4,1, 2,1),
+ array("TwitterWall", "widget_light", 4,2, 2,4),
+ array("Dummy", "widget_light", 0,3, 1,2),
+ array("Dummy", "widget_dark", 1,3, 2,2),
+ array("Wettervorhersage", "widget_light", 3,3, 1,2),
+ array("Dummy", "widget_light", 0,5, 2,1),
+ array("Dummy", "widget_light", 2,5, 2,1)
);
?>
diff --git a/webroot/css/widget_light.css b/webroot/css/widget_light.css
index 330339c..6ff0091 100644
--- a/webroot/css/widget_light.css
+++ b/webroot/css/widget_light.css
@@ -3,15 +3,28 @@
background-color:#75695E;
font-family: inherit;
color:#000000;
+ overflow:hidden;
}
.widget_light td, .widget_light div {
+ font-family: inherit;
+ margin: 0;
+ position:relative;
+}
+
+.widget_light .box {
+ background-color:#95897E;
+ border: 1px dashed #F2EFE5;
font-family: inherit;
color:#000000;
+ margin: 10;
+ position:relative;
}
.widget_light h1 {
- margin: 10;
+ margin-top: 10;
+ margin-left: 10;
+ margin-bottom: 0;
padding: 0;
font-family: inherit;
font-size: 1.0em;
@@ -33,17 +46,17 @@
.widget_light ul {
background-color:#95897E;
- margin: 10;
+ margin: 0;
padding: 0;
list-style: none;
- border-top: 1px dashed #F2EFE5;
+ overflow:hidden;
+ position:relative;
+ height:auto;
}
.widget_light li {
background-color:#95897E;
float: left;
border-bottom: 1px dashed #F2EFE5;
- border-left: 1px dashed #F2EFE5;
- border-right: 1px dashed #F2EFE5;
width: 100%;
color: #333333;
}
diff --git a/webroot/widgets/TwitterWall/TwitterWall.php b/webroot/widgets/TwitterWall/TwitterWall.php
index 117c9a3..418a6b7 100644
--- a/webroot/widgets/TwitterWall/TwitterWall.php
+++ b/webroot/widgets/TwitterWall/TwitterWall.php
@@ -26,7 +26,7 @@ class TwitterWall implements iWidget
});
});
</script>'."\n";
- $widgetOutput .= '<div class="tweet"></div>'."\n";
+ $widgetOutput .= '<div class="box"><div class="tweet" style="height:auto;top:0;bottom:0;"></div></div>'."\n";
return $widgetOutput;
}
diff --git a/webroot/widgets/Wettervorhersage/Wettervorhersage.php b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
new file mode 100644
index 0000000..21bddfa
--- /dev/null
+++ b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once 'widgets/iWidget.php';
+
+class Wettervorhersage implements iWidget
+{
+ public function __construct($width, $height)
+ {
+
+ }
+
+
+ public function giveOutput()
+ {
+ $widgetOutput = '<div id="cont_5c241a8806783c9482d9f72bd16e1de2"><script type="text/javascript" src="http://www.daswetter.net/wid_loader/5c241a8806783c9482d9f72bd16e1de2"></script></div>';
+ return $widgetOutput;
+ }
+}
+
+?>
--
GitLab