# HG changeset patch # User Michiel Broek # Date 1405955768 -7200 # Node ID 7c8f35a43cece73f7c0786aaa66f8367f8ae5875 # Parent 7119ea8a5225e715408589a7d9233b13fe09a50e Added maintenance window with only two buttons yet diff -r 7119ea8a5225 -r 7c8f35a43cec www-thermferm/css/style.css --- a/www-thermferm/css/style.css Sun Jul 20 23:09:50 2014 +0200 +++ b/www-thermferm/css/style.css Mon Jul 21 17:16:08 2014 +0200 @@ -36,53 +36,39 @@ #jqxWidget { width: 980px; height: 510px; -// background: #ddd; float: left; } #header { width: 980px; - height: 60px; -// background: #222; -// margin: 5px; + height: 80px; float: left; } #jqxTabs { width: 980px; - height: 460px; + height: 440px; float: left; } #fermentor { - border: 5px solid; - border-color: #FFCC01; - border-radius: 15px 15px 15px 15px; - height: 393px; - width: 958px; + height: 382px; + width: 968px; background: #fff; margin: 5px; float: left; } -#fermentor_head { - margin-bottom: 1px; - padding: 3px 10px 8px; - background-color: #FFCC01; - color: #666666; - font-weight: bold; -} - #fermentor_pict { width: 220px; - height: 350px; + height: 382px; float: left; } #fermentor_panel { width: 240px; - height: 350px; + height: 382px; float: left; background-color: #f0f0f0; } diff -r 7119ea8a5225 -r 7c8f35a43cec www-thermferm/index.php --- a/www-thermferm/index.php Sun Jul 20 23:09:50 2014 +0200 +++ b/www-thermferm/index.php Mon Jul 21 17:16:08 2014 +0200 @@ -24,7 +24,7 @@ /* * Look for the style names in the jqwidgets/styles directory. */ -$my_style = 'fresh'; +$my_style = 'ui-redmond'; require_once('liveview.php'); @@ -39,27 +39,65 @@ $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; +$outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= liveview(); + +/* The maintenance popup window */ +$outstr .= '
'.PHP_EOL; +$outstr .= '
'.PHP_EOL; +$outstr .= ' Maintenance panel'.PHP_EOL; +$outstr .= '
'.PHP_EOL; +$outstr .= '
'.PHP_EOL; +$outstr .= ' Maintenancecontent'.PHP_EOL; +$outstr .= ' '.PHP_EOL; +$outstr .= ' '.PHP_EOL; +$outstr .= '
'.PHP_EOL; +$outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; -$outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ''.PHP_EOL; diff -r 7119ea8a5225 -r 7c8f35a43cec www-thermferm/liveview.php --- a/www-thermferm/liveview.php Sun Jul 20 23:09:50 2014 +0200 +++ b/www-thermferm/liveview.php Mon Jul 21 17:16:08 2014 +0200 @@ -73,6 +73,9 @@ $outstr .= ' });'.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= '
'.PHP_EOL; $set_temperature = "N/A"; $air_temperature = "N/A"; @@ -80,18 +83,6 @@ foreach($arr as $l) { $vals = explode(",", $l); - if (strcmp($vals[0], "NAME") == 0) { - /* - * The name is allways first, so when we have it - * emit the formatting. - */ - $outstr .= '
'.PHP_EOL; - $outstr .= ' ' . $vals[1] .PHP_EOL; - $outstr .= '
'.PHP_EOL; - $outstr .= '
'.PHP_EOL; - $outstr .= ' '.PHP_EOL; - $outstr .= '
'.PHP_EOL; - } if (strcmp($vals[0], "MODE") == 0) { $mode = $vals[1]; }