diff -r 83502d2099eb -r 0d86f3c0a07b www-thermferm/liveview.php --- a/www-thermferm/liveview.php Wed Jul 30 19:39:50 2014 +0200 +++ b/www-thermferm/liveview.php Wed Jul 30 22:57:48 2014 +0200 @@ -160,18 +160,6 @@ $outstr .= ' }]'.PHP_EOL; $outstr .= ' };'.PHP_EOL; $outstr .= ' $("#fermentor_chart_'.$unit.'").jqxChart(settings'.$unr.');'.PHP_EOL; - strcmp($mode, "OFF") ? $se = "" : $se = ", checked: true"; - $outstr .= ' $("#selButton1_'.$unit.'").jqxRadioButton({ groupName: "'.$unit.'", theme: "'.$my_style.'", width: 150, height: 18'.$se.'});'.PHP_EOL; - strcmp($mode, "NONE") ? $se = "" : $se = ", checked: true"; - $outstr .= ' $("#selButton2_'.$unit.'").jqxRadioButton({ groupName: "'.$unit.'", theme: "'.$my_style.'", width: 150, height: 18'.$se.'});'.PHP_EOL; - strcmp($mode, "FRIDGE") ? $se = "" : $se = ", checked: true"; - (strcmp($heater, "no") || strcmp($cooler, "no")) ? $dis = "" : $dis = ", disabled: true"; - $outstr .= ' $("#selButton3_'.$unit.'").jqxRadioButton({ groupName: "'.$unit.'", theme: "'.$my_style.'", width: 150, height: 18'.$se.$dis.'});'.PHP_EOL; - strcmp($mode, "BEER") ? $se = "" : $se = ", checked: true"; - $outstr .= ' $("#selButton4_'.$unit.'").jqxRadioButton({ groupName: "'.$unit.'", theme: "'.$my_style.'", width: 150, height: 18'.$se.$dis.'});'.PHP_EOL; - strcmp($mode, "PROFILE") ? $se = "" : $se = ", checked: true"; - $outstr .= ' $("#selButton5_'.$unit.'").jqxRadioButton({ groupName: "'.$unit.'", theme: "'.$my_style.'", width: 150, height: 18'.$se.$dis.'});'.PHP_EOL; - $outstr .= ' });'.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; @@ -179,11 +167,20 @@ $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; - $outstr .= '
Off
'.PHP_EOL; - $outstr .= '
None
'.PHP_EOL; - $outstr .= '
Fridge
'.PHP_EOL; - $outstr .= '
Beer
'.PHP_EOL; - $outstr .= '
Profile
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + strcmp($mode, "OFF") ? $se = "" : $se = " checked"; + $outstr .= ' Off
'.PHP_EOL; + strcmp($mode, "NONE") ? $se = "" : $se = " checked"; + $outstr .= ' None
'.PHP_EOL; + (strcmp($heater, "no") || strcmp($cooler, "no")) ? $dis = "" : $dis = " disabled"; + strcmp($mode, "FRIDGE") ? $se = "" : $se = " checked"; + $outstr .= ' Fridge
'.PHP_EOL; + strcmp($mode, "BEER") ? $se = "" : $se = " checked"; + $outstr .= ' Beer
'.PHP_EOL; + strcmp($mode, "PROFILE") ? $se = "" : $se = " checked"; + $outstr .= ' Profile'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
Pwr'.PHP_EOL; @@ -213,25 +210,29 @@ $outstr .= '
Fan'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; - $outstr .= '
'.PHP_EOL; - strcmp($mode, "NONE") ? $se = " disabled" : $se = ""; + $outstr .= ' '.PHP_EOL; + strcmp($mode, "NONE") ? $dis = " disabled" : $dis = ""; $ch = " checked"; - $outstr .= ' Off
'.PHP_EOL; - $outstr .= ' On'.PHP_EOL; + + $outstr .= ' Off
'.PHP_EOL; + $outstr .= ' On'.PHP_EOL; + $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; - $outstr .= '
'.PHP_EOL; - strcmp($mode, "NONE") ? $se = " disabled" : $se = ""; - $outstr .= ' Off
'.PHP_EOL; - $outstr .= ' On'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + strcmp($mode, "NONE") ? $dis = " disabled" : $dis = ""; + $outstr .= ' Off
'.PHP_EOL; + $outstr .= ' On'.PHP_EOL; + $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; - $outstr .= '
'.PHP_EOL; - strcmp($mode, "NONE") ? $se = " disabled" : $se = ""; - $outstr .= ' Off
'.PHP_EOL; - $outstr .= ' On'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + strcmp($mode, "NONE") ? $dis = " disabled" : $dis = ""; + $outstr .= ' Off
'.PHP_EOL; + $outstr .= ' On'.PHP_EOL; + $outstr .= ' '.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL; $outstr .= '
'.PHP_EOL;