Fri, 01 Aug 2014 22:53:58 +0200
More style updates
--- a/www-thermferm/css/style.css Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/css/style.css Fri Aug 01 22:53:58 2014 +0200 @@ -266,6 +266,12 @@ margin-top: 10px; } +.dtemp { + font-weight: bold; + font-size: 1.2em; + color: blue; +} + #fermentor_toggle1 { width: 79px; height: 90px;
--- a/www-thermferm/devices.php Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/devices.php Fri Aug 01 22:53:58 2014 +0200 @@ -42,22 +42,7 @@ $arr = explode("\r\n", $answer); -$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="default">'.PHP_EOL; -$outstr .= ' <div id="jqxWidget">'.PHP_EOL; -$outstr .= ' <div id="header">'.PHP_EOL; -$outstr .= ' <form action="maintenance.php" style="margin:30px; float:right">'.PHP_EOL; -$outstr .= ' <input type="submit" class="jqx-button" value="Maintenance Panel" />'.PHP_EOL; -$outstr .= ' </form>'.PHP_EOL; -$outstr .= ' </div> <!-- header -->'.PHP_EOL; -$outstr .= ' <div id="content">'.PHP_EOL; +$outstr = build_header("ThermFerm - Devices Setup"); $outstr .= ' <div id="errors">'.PHP_EOL; $outstr .= ' </div> <!-- errors -->'.PHP_EOL; @@ -91,10 +76,7 @@ $outstr .= ' </table>'.PHP_EOL; $outstr .= ' </div> <!-- etable -->'.PHP_EOL; -$outstr .= ' </div> <!-- content -->'.PHP_EOL; -$outstr .= ' </div> <!-- jqxWidget -->'.PHP_EOL; -$outstr .= ' </body>'.PHP_EOL; -$outstr .= '</html>'.PHP_EOL; +$outstr .= build_footer(); echo $outstr;
--- a/www-thermferm/global.php Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/global.php Fri Aug 01 22:53:58 2014 +0200 @@ -21,33 +21,15 @@ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ - -$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; +require_once('utilities.php'); -$outstr .= ' <body class="default">'.PHP_EOL; -$outstr .= ' <div id="jqxWidget">'.PHP_EOL; -$outstr .= ' <div id="header">'.PHP_EOL; -$outstr .= ' <form action="maintenance.php" style="margin:30px; float:right">'.PHP_EOL; -$outstr .= ' <input type="submit" class="jqx-button" value="Maintenance Panel" />'.PHP_EOL; -$outstr .= ' </form>'.PHP_EOL; -$outstr .= ' </div> <!-- header -->'.PHP_EOL; -$outstr .= ' <div id="content">'.PHP_EOL; +$outstr = build_header("ThermFerm - Global Setup"); $outstr .= ' <div id="errors">'.PHP_EOL; $outstr .= ' </div> <!-- errors -->'.PHP_EOL; $outstr .= ' <div id="etable">'.PHP_EOL; $outstr .= ' </div> <!-- etable -->'.PHP_EOL; -$outstr .= ' </div> <!-- content -->'.PHP_EOL; -$outstr .= ' </div> <!-- content -->'.PHP_EOL; -$outstr .= ' </div> <!-- jqxWidget -->'.PHP_EOL; -$outstr .= ' </body>'.PHP_EOL; -$outstr .= '</html>'.PHP_EOL; +$outstr .= build_footer(); echo $outstr;
--- a/www-thermferm/liveview.php Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/liveview.php Fri Aug 01 22:53:58 2014 +0200 @@ -196,13 +196,13 @@ $outstr .= ' <div id="fermentor_panel_display">'.PHP_EOL; $outstr .= ' <div id="fermentor_display1">'.PHP_EOL; - $outstr .= ' <div id="load_target_'.$unr.'">'.$set_temperature.'</div>Set'.PHP_EOL; + $outstr .= ' <div id="load_target_'.$unr.'" class="dtemp">'.$set_temperature.'</div>Set'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <div id="fermentor_display2">'.PHP_EOL; - $outstr .= ' <div id="load_air_'.$unr.'">'.$air_temperature.'</div>Air'.PHP_EOL; + $outstr .= ' <div id="load_air_'.$unr.'" class="dtemp">'.$air_temperature.'</div>Air'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <div id="fermentor_display3">'.PHP_EOL; - $outstr .= ' <div id="load_beer_'.$unr.'">'.$beer_temperature.'</div>Beer'.PHP_EOL; + $outstr .= ' <div id="load_beer_'.$unr.'" class="dtemp">'.$beer_temperature.'</div>Beer'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; $outstr .= ' </div> <!-- fermentor_panel_display -->'.PHP_EOL;
--- a/www-thermferm/maintenance.php Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/maintenance.php Fri Aug 01 22:53:58 2014 +0200 @@ -21,6 +21,7 @@ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ +require_once('utilities.php'); /* * Look for the style names in the jqwidgets/styles directory. */ @@ -30,20 +31,14 @@ $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 .= ' <title>ThermFerm - Maintenance Menu</title>'.PHP_EOL; $outstr .= ' <link type="text/css" href="css/style.css" rel="stylesheet" media="all" />'.PHP_EOL; -$outstr .= ' <link type="text/css" href="jqwidgets/styles/jqx.base.css" rel="stylesheet" />'.PHP_EOL; -$outstr .= ' <link type="text/css" href="jqwidgets/styles/jqx.'.$my_style.'.css" rel="stylesheet" />'.PHP_EOL; -$outstr .= ' <script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>'.PHP_EOL; -$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxcore.js"></script>'.PHP_EOL; -$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxbuttons.js"></script>'.PHP_EOL; $outstr .= ' </head>'.PHP_EOL; - $outstr .= ' <body class="default">'.PHP_EOL; $outstr .= ' <div id="jqxWidget">'.PHP_EOL; $outstr .= ' <div id="header">'.PHP_EOL; $outstr .= ' <form action="index.php" style="margin:30px; float:right">'.PHP_EOL; -$outstr .= ' <input type="submit" class="jqx-button" style="width: 150px; height: 25px;" value="Main Screen" />'.PHP_EOL; +$outstr .= ' <input type="submit" style="width: 150px; height: 25px;" value="Dashboard" />'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div> <!-- header -->'.PHP_EOL; $outstr .= ' <div id="content">'.PHP_EOL; @@ -68,10 +63,7 @@ $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; -$outstr .= ' </div> <!-- content -->'.PHP_EOL; -$outstr .= ' </div> <!-- jqxWidget -->'.PHP_EOL; -$outstr .= ' </body>'.PHP_EOL; -$outstr .= '</html>'.PHP_EOL; +$outstr .= build_footer(); echo $outstr;
--- a/www-thermferm/utilities.php Fri Aug 01 22:21:57 2014 +0200 +++ b/www-thermferm/utilities.php Fri Aug 01 22:53:58 2014 +0200 @@ -59,7 +59,7 @@ $outstr .= ' <div id="jqxWidget">'.PHP_EOL; $outstr .= ' <div id="header">'.PHP_EOL; $outstr .= ' <form action="maintenance.php" style="margin:30px; float:right">'.PHP_EOL; - $outstr .= ' <input type="submit" class="jqx-button" value="Maintenance Panel" />'.PHP_EOL; + $outstr .= ' <input type="submit" style="width: 150px; height: 25px;" value="Maintenance Panel" />'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div> <!-- header -->'.PHP_EOL; $outstr .= ' <div id="content">'.PHP_EOL;