diff --git a/webroot/config.php b/webroot/config.php index a567787b8dbda0f46b0c5521cfd19681084e8c61..7cd2a1b44c7f87e069cf6b3549fd9651f87ee863 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 330339c2d4103312c785ee6fb318e4ac318f45df..6ff0091e5609ebf4ccf876c2a8c10ed23af815f3 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 117c9a3c2127839b955848a267c5000b891f5f46..418a6b74a449abb0a7e712ab943c267b8741b951 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 0000000000000000000000000000000000000000..21bddfaa3cc6dec5369a5de08705edec561c8d02 --- /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; + } +} + +?>