From 92e34780379351e8fb71806ab4b40090524bfb66 Mon Sep 17 00:00:00 2001
From: ands <ands@andspad.(none)>
Date: Mon, 6 Dec 2010 23:26:57 +0100
Subject: [PATCH] =?UTF-8?q?Widgetanordnung=20ge=C3=A4ndert.=20Wettervorher?=
=?UTF-8?q?sageplugin=20mit=20=C3=BCberschrift=20versehen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
webroot/config.php | 15 +++++++--------
webroot/widgets/TwitterWall/TwitterWall.php | 2 +-
.../widgets/Wettervorhersage/Wettervorhersage.php | 5 +++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/webroot/config.php b/webroot/config.php
index 7cd2a1b..dbe856d 100644
--- a/webroot/config.php
+++ b/webroot/config.php
@@ -9,13 +9,12 @@
//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("Wettervorhersage", "widget_light", 3,3, 1,2),
- array("Dummy", "widget_light", 0,5, 2,1),
- array("Dummy", "widget_light", 2,5, 2,1)
+ array("Dummy", "widget_light", 0,1, 3,2),
+ array("Wettervorhersage", "widget_light", 3,1, 1,2),
+ array("TwitterWall", "widget_light", 4,1, 2,4),
+ array("Dummy", "widget_light", 0,3, 2,2),
+ array("Dummy", "widget_dark", 2,3, 2,2),
+ array("Dummy", "widget_light", 0,5, 4,1),
+ array("Marvin", "widget_light", 4,5, 2,1)
);
?>
diff --git a/webroot/widgets/TwitterWall/TwitterWall.php b/webroot/widgets/TwitterWall/TwitterWall.php
index 418a6b7..775041f 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="box"><div class="tweet" style="height:auto;top:0;bottom:0;"></div></div>'."\n";
+ $widgetOutput .= '<div class="box"><div class="tweet"></div></div>'."\n";
return $widgetOutput;
}
diff --git a/webroot/widgets/Wettervorhersage/Wettervorhersage.php b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
index 21bddfa..d714c0b 100644
--- a/webroot/widgets/Wettervorhersage/Wettervorhersage.php
+++ b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
@@ -9,10 +9,11 @@ class Wettervorhersage implements iWidget
}
-
public function giveOutput()
{
- $widgetOutput = '<div id="cont_5c241a8806783c9482d9f72bd16e1de2"><script type="text/javascript" src="http://www.daswetter.net/wid_loader/5c241a8806783c9482d9f72bd16e1de2"></script></div>';
+ $widgetOutput = '<h1>Das Wetter in Münster:</h1><br>'."\n";
+ $widgetOutput .= '<div id="cont_5c241a8806783c9482d9f72bd16e1de2"><script type="text/javascript" src="http://www.daswetter.net/wid_loader/5c241a8806783c9482d9f72bd16e1de2"></script></div>'."\n";
+ //TODO: automatisch Aktualisieren
return $widgetOutput;
}
}
--
GitLab