Mercurial > mbsePi-apps / changeset
changeset
All web screens now show the program name and version
Tue, 26 Aug 2014 14:45:03 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Tue, 26 Aug 2014 14:45:03 +0200
- changeset 269
- dc88583a068d
- parent 268
- dda91dfa4aa8
- child 270
- df81d583c2c3
All web screens now show the program name and version
--- a/thermferm/server.c Tue Aug 26 13:50:35 2014 +0200 +++ b/thermferm/server.c Tue Aug 26 14:45:03 2014 +0200 @@ -469,6 +469,7 @@ if (strcmp(opt, (char *)"GET") == 0) { srv_send((char *)"213 Global Settings record follows:"); + srv_send((char *)"RELEASE,%s", VERSION); srv_send((char *)"NAME,%s", Config.name); srv_send((char *)"PORT,%d", Config.my_port); srv_send((char *)"TEMPFORMAT,%c", Config.tempFormat);
--- a/www-thermferm/css/style.css Tue Aug 26 13:50:35 2014 +0200 +++ b/www-thermferm/css/style.css Tue Aug 26 14:45:03 2014 +0200 @@ -50,6 +50,11 @@ width: 500px; height: 50px; float: left; + margin-top: 23px; + font-size: 1.8em; + color: #FFD700; + text-align: center; + font-family: comic sans ms; } #room {
--- a/www-thermferm/index.php Tue Aug 26 13:50:35 2014 +0200 +++ b/www-thermferm/index.php Tue Aug 26 14:45:03 2014 +0200 @@ -111,6 +111,7 @@ $answer = send_cmd('GLOBAL GET'); $arr = explode("\r\n", $answer); +$version = "?"; $temp_value = "NA"; $temp_state = "NA"; $hum_value = "NA"; @@ -123,6 +124,8 @@ break; $f = explode(",", $arr[$j]); + if ($f[0] == "RELEASE") + $version = $f[1]; if ($f[0] == "TEMP_STATE") $temp_state = $f[1]; if (($f[0] == "TEMP_VALUE") && ($temp_state == "OK")) @@ -159,7 +162,7 @@ $outstr .= ' <div id="jqxWidget">'.PHP_EOL; $outstr .= ' <div id="header">'.PHP_EOL; $outstr .= ' <div id="title">'.PHP_EOL; -$outstr .= ' ThermFerm'.PHP_EOL; +$outstr .= ' ThermFerm '.$version.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <div id="room">'.PHP_EOL; $outstr .= ' <div id="room_temp" class="rtemp">'.$temp_value.'</div>'.PHP_EOL;
--- a/www-thermferm/maintenance.php Tue Aug 26 13:50:35 2014 +0200 +++ b/www-thermferm/maintenance.php Tue Aug 26 14:45:03 2014 +0200 @@ -27,6 +27,23 @@ */ $my_style = 'ui-redmond'; +$answer = send_cmd('GLOBAL GET'); +$arr = explode("\r\n", $answer); +$version = "?"; + +if (startsWith($arr[0], "213")) { + $j = 1; + while (1) { + if (strcmp($arr[$j], ".") == 0) + break; + $f = explode(",", $arr[$j]); + + if ($f[0] == "RELEASE") + $version = $f[1]; + $j++; + } +} + $outstr = '<!DOCTYPE html>'.PHP_EOL; $outstr .= '<html>'.PHP_EOL; $outstr .= ' <head>'.PHP_EOL; @@ -37,6 +54,9 @@ $outstr .= ' <body class="default">'.PHP_EOL; $outstr .= ' <div id="jqxWidget">'.PHP_EOL; $outstr .= ' <div id="header">'.PHP_EOL; +$outstr .= ' <div id="title">'.PHP_EOL; +$outstr .= ' ThermFerm '.$version.PHP_EOL; +$outstr .= ' </div>'.PHP_EOL; $outstr .= ' <form action="index.php" style="margin:30px; float:right">'.PHP_EOL; $outstr .= ' <input type="submit" style="width: 150px; height: 25px;" value="Dashboard" />'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL;
--- a/www-thermferm/utilities.php Tue Aug 26 13:50:35 2014 +0200 +++ b/www-thermferm/utilities.php Tue Aug 26 14:45:03 2014 +0200 @@ -136,9 +136,25 @@ } - function build_header($heading) { + $answer = send_cmd('GLOBAL GET'); + $arr = explode("\r\n", $answer); + $version = "?"; + + if (startsWith($arr[0], "213")) { + $j = 1; + while (1) { + if (strcmp($arr[$j], ".") == 0) + break; + $f = explode(",", $arr[$j]); + + if ($f[0] == "RELEASE") + $version = $f[1]; + $j++; + } + } + $outstr = '<!DOCTYPE html>'.PHP_EOL; $outstr .= '<html>'.PHP_EOL; $outstr .= ' <head>'.PHP_EOL; @@ -149,6 +165,9 @@ $outstr .= ' <body class="default">'.PHP_EOL; $outstr .= ' <div id="jqxWidget">'.PHP_EOL; $outstr .= ' <div id="header">'.PHP_EOL; + $outstr .= ' <div id="title">'.PHP_EOL; + $outstr .= ' ThermFerm '.$version.PHP_EOL; + $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <form action="maintenance.php" style="margin:30px; float:right">'.PHP_EOL; $outstr .= ' <input type="submit" style="width: 150px; height: 25px;" value="Maintenance Panel" />'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL;
