Fri, 11 Jul 2014 13:29:26 +0200
Cleanup
www-thermferm/beer-panel.php | file | annotate | diff | comparison | revisions | |
www-thermferm/css/style.css | file | annotate | diff | comparison | revisions | |
www-thermferm/index.php | file | annotate | diff | comparison | revisions |
--- a/www-thermferm/beer-panel.php Thu Jul 10 11:46:27 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -<?php -/***************************************************************************** - * Copyright (C) 2014 - * - * Michiel Broek <mbroek at mbse dot eu> - * - * This file is part of ThermFerm - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * ThermFerm is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ThermFerm; see the file COPYING. If not, write to the Free - * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -*****************************************************************************/ -?> - - <div id="top-bar" class="ui-widget ui-widget-header ui-corner-all"> - <div id="logo-container"> - <img src="thermferm_logo.png" width="94" height="80"> - </div> - <button class="script-status ui-state-error"></button> - <button id="maintenance" class="ui-state-default">Maintenance panel</button> - </div> - <div class="main-container"> - <div id="curr-beer-main-label" class="beer-main-label"></div> - <div id="curr-beer-main" class="beer-main" style="width:815px; height:390px"></div> - <div id="curr-beer-main-controls" class="beer-main-controls" style="display: none"> - <div id="curr-beer-main-buttons" class="beer-main-buttons"> - <div class="beer-main-legend-row"> - <button class="refresh-curr-beer-main" title="Refresh"></button> - <div class="beer-main-legend-label">Refresh Chart</div> - <br class="crystal" /> - </div> - <div class="beer-main-legend-row last"> - <button class="main-help" title="Help"></button> - <div class="beer-main-legend-label">Help</div> - <br class="crystal" /> - </div> - </div> - </div>
--- a/www-thermferm/css/style.css Thu Jul 10 11:46:27 2014 +0200 +++ b/www-thermferm/css/style.css Fri Jul 11 13:29:26 2014 +0200 @@ -1,3 +1,22 @@ +/* + */ + +/* Reset default browser CSS. */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + background: transparent; + border: 0; + margin: 0; + padding: 0; + vertical-align: baseline; +} body { @@ -6,31 +25,31 @@ font-family: Verdana, Arial, sans-serif; width: 980px; font-size: 12px; + margin: 0px; } -#top-bar button.script-status { + +#header button.script-status { margin:10px; } -#beer-panel{ +#container { width: 980px; - height: 525px; + height: 510px; + background: #7ff; margin-bottom: 10px; float: left; } -#top-bar { +#header { width: 968px; + height: 90px; + background: #ff7; margin: 5px; float: left; } -div.beer-main, -div.main-container { - float: left; -} - -#logo-container { +#logo { float: left; clear: none; display: block; @@ -40,3 +59,11 @@ text-align: center; } +#content { + width: 968px; + height: 400px; + background: #f7f; + margin: 5px; + float: left; +} +
--- a/www-thermferm/index.php Thu Jul 10 11:46:27 2014 +0200 +++ b/www-thermferm/index.php Fri Jul 11 13:29:26 2014 +0200 @@ -20,47 +20,30 @@ * along with ThermFerm; see the file COPYING. If not, write to the Free * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ -?> -<!DOCTYPE html> -<html> - <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>ThermFerm monitor</title> - <link type="text/css" href="css/redmond/jquery-ui-1.10.3.custom.css" rel="stylesheet" /> - <link type="text/css" href="css/style.css" rel="stylesheet"/> - </head> - <body> - <div id="beer-panel" class="ui-widget ui-widget-content ui-corner-all"> <?php include 'beer-panel.php'; ?> </div> -<?php /* <div id="control-panel" style="display:none"> <!--// hide while loading --> - <?php - include 'control-panel.php'; - ?> - </div> - <div id="maintenance-panel" style="display:none"> <!--// hide while loading --> - <?php - include 'maintenance-panel.php'; - ?> - </div> */ ?> - <!-- Load scripts after the body, so they don't block rendering of the page --> - <script type="text/javascript" src="js/jquery-1.9.1.js"></script> - <script type="text/javascript" src="js/jquery-ui-1.10.3.custom.min.js"></script> - <script type="text/javascript" src="js/jquery-ui-timepicker-addon.js"></script> - <!-- <script type="text/javascript" src="http://www.google.com/jsapi"></script> --> - <script type="text/javascript" src="js/spin.js"></script> - <!-- <script type="text/javascript" src="js/dygraph-combined.js"></script> --> - <!-- <script type="text/javascript"> - // pass parameters to JavaScript - window.tempFormat = <?php echo "'$tempFormat'" ?>; - window.beerName = <?php echo "\"$beerName\""?>; - window.profileName = <?php echo "\"$profileName\""?>; - window.dateTimeFormat = <?php echo "\"$dateTimeFormat\""?>; - window.dateTimeFormatDisplay = <?php echo "\"$dateTimeFormatDisplay\""?>; - </script> --> - <script type="text/javascript" src="js/main.js"></script> -<!-- <script type="text/javascript" src="js/device-config.js"></script> - <script type="text/javascript" src="js/control-panel.js"></script> - <script type="text/javascript" src="js/maintenance-panel.js"></script> - <script type="text/javascript" src="js/beer-chart.js"></script> - <script type="text/javascript" src="js/profile-table.js"></script> --> - </body> -</html> + + +$outstr = '<!DOCTYPE html>'.PHP_EOL; +$outstr .= '<html>'.PHP_EOL; +$outstr .= ' <head>'.PHP_EOL; +$outstr .= ' <meta http-equiv="content-type" content="text/html; charset=utf-8" />'.PHP_EOL; +$outstr .= ' <title>ThermFerm monitor</title>'.PHP_EOL; +$outstr .= ' <link type="text/css" href="css/style.css" rel="stylesheet" media="all" />'.PHP_EOL; +$outstr .= ' </head>'.PHP_EOL; +$outstr .= ' <body class="page">'.PHP_EOL; +$outstr .= ' <div id="container" class="container_16">'.PHP_EOL; +$outstr .= ' <div id="header">'.PHP_EOL; +$outstr .= ' <div id="logo">'.PHP_EOL; +$outstr .= ' <img src="thermferm_logo.png" width="94" height="80">'.PHP_EOL; +$outstr .= ' </div>'.PHP_EOL; +$outstr .= ' <button class="script-status ui-state-error"></button>'.PHP_EOL; +$outstr .= ' <button id="maintenance" class="ui-state-default">Maintenance panel</button>'.PHP_EOL; +$outstr .= ' </div> <!-- header -->'.PHP_EOL; +$outstr .= ' <div id="content">'.PHP_EOL; +$outstr .= ' Content deel'.PHP_EOL; +$outstr .= ' </div> <!-- content -->'.PHP_EOL; +$outstr .= ' </div> <!-- container -->'.PHP_EOL; +$outstr .= ' </body>'.PHP_EOL; +$outstr .= '</html>'.PHP_EOL; + +echo $outstr; +