diff --git a/webroot/css/widget.css b/webroot/css/widget.css
index dba281a3a0825816f5649b1560804571857a8bbc..8e747feaf5a9ff251dceb77178a289d58f885ffd 100644
--- a/webroot/css/widget.css
+++ b/webroot/css/widget.css
@@ -2,15 +2,14 @@ body { background-color:#261C13; }
a { color:#0071BB; }
a:hover { color:#777878; }
-td, div
-{
+.widget, .widget td, .widget div {
font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
font-size:16pt;
color:#000000;
}
-.widget_4x2, .widget_2x4, .widget_2x2, .widget_2x1, .widget_1x2 {
- position:absolute;
+
+.widget_light {
border: 1px solid #F2EFE5;
background-color:#75695E;
font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
@@ -18,9 +17,24 @@ td, div
color:#000000;
}
-.widget_4x2 { width:800px; height:380px; }
-.widget_2x4 { width:380px; height:800px; }
-.widget_2x2 { width:380px; height:380px; }
-.widget_2x1 { width:380px; height:170px; }
-.widget_1x2 { width:170px; height:380px; }
+.widget_light td, .widget_light div {
+ font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
+ font-size:16pt;
+ color:#000000;
+}
+
+
+.widget_dark {
+ border: 1px dashed #75695E;
+ background-color:#362C23;
+ font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
+ font-size:16pt;
+ color:#ffffff;
+}
+
+.widget_dark td, .widget_dark div {
+ font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
+ font-size:16pt;
+ color:#ffffff;
+}
diff --git a/webroot/img/warpzone.png b/webroot/img/warpzone.png
deleted file mode 100644
index 5a1eff3ddd99e9c092cc6365316647ce2ee2c0ef..0000000000000000000000000000000000000000
Binary files a/webroot/img/warpzone.png and /dev/null differ
diff --git a/webroot/index.php b/webroot/index.php
index 6327f618c79c33a60b0450e2353d177d541c6ee9..de55226ece7f1641678e9f81f952db7d86468d26 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -5,32 +5,28 @@
<script src="js/marvin.js" type="text/javascript"></script>
</head>
<body>
- <img src="img/warpzone.png">
- <div style="position:absolute;left:40px;top:200px;">
+ <?php require_once "config.php"; ?>
+ <div style="position:absolute;left:<?php print($widget_spacing_x); ?>px;top:<?php print($widget_spacing_y); ?>px;">
<?php
- $widgets = array(
- //array("widget_name",x,y,"size_class");
- array("Dummy",0,0,"widget_4x2"),
- array("ZoneOffen",4,0,"widget_2x1"),
- array("Dummy",4,1,"widget_2x4"),
- array("Dummy",0,2,"widget_1x2"),
- array("Dummy",1,2,"widget_2x2"),
- array("Dummy",3,2,"widget_1x2"),
- array("Dummy",0,4,"widget_2x1"),
- array("Dummy",2,4,"widget_2x1")
- );
-
foreach ($widgets as $widgetconfig)
{
$widgetname = $widgetconfig[0];
- $widgetposx = $widgetconfig[1] * 210;
- $widgetposy = $widgetconfig[2] * 210;
- $widgetclass = $widgetconfig[3];
+ $widgetclass = $widgetconfig[1];
+ $widgetposx = $widgetconfig[2] * $widget_unit_width;
+ $widgetposy = $widgetconfig[3] * $widget_unit_height;
+ $widgetsizex = $widgetconfig[4] * $widget_unit_width - $widget_spacing_x;
+ $widgetsizey = $widgetconfig[5] * $widget_unit_height - $widget_spacing_y;
include_once "widgets/$widgetname/$widgetname.php";
$widget = new $widgetname($widgetwidth,$widgetheight);
$widgetoutput = $widget->giveOutput();
- print("<div class='$widgetclass' id='$widgetname' style='left:".$widgetposx."px;top:".$widgetposy."px;'>");
+ print("<div
+ id='$widgetname'
+ class='$widgetclass'
+ style='
+ position:absolute;
+ left:".$widgetposx."px;top:".$widgetposy."px;
+ width:".$widgetsizex."px;height:".$widgetsizey."px;'>");
print($widgetoutput);
print("</div>");
}
diff --git a/webroot/widgets/ZoneOffen/ZoneOffen.js b/webroot/widgets/ZoneOffen/ZoneOffen.js
index e4b67328b127d66623d083c773a21ad57b92ef15..422bec4b336707ceec32d87904394a9f368e8203 100644
--- a/webroot/widgets/ZoneOffen/ZoneOffen.js
+++ b/webroot/widgets/ZoneOffen/ZoneOffen.js
@@ -20,8 +20,8 @@ function updateZoneOffen () {
$(document).ready(function()
{
- //Zuerst nur einmal laden
addFunctionToMinuteTimer(updateZoneOffen);
+ updateZoneOffen();
}
);