From aa6ea85824db251b239d72101a4eae575da49cf9 Mon Sep 17 00:00:00 2001
From: Colin Fleming <cj_fleming@sky.com>
Date: Tue, 16 Apr 2013 19:46:18 +0100
Subject: Tidy up "thermal_sonsors.widget.php" XHTML

Add CDATA section to SCRIPT tag
Move the STYLE block into the "all.css" theme files
Close INPUT tag
Remove name statement from DIV tag
Add summary statement to TABLE tag
---
 .../www/widgets/widgets/thermal_sensors.widget.php | 47 +++-------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

(limited to 'usr/local/www/widgets/widgets/thermal_sensors.widget.php')

diff --git a/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/usr/local/www/widgets/widgets/thermal_sensors.widget.php
index 12c5a2f..4413ba6 100644
--- a/usr/local/www/widgets/widgets/thermal_sensors.widget.php
+++ b/usr/local/www/widgets/widgets/thermal_sensors.widget.php
@@ -143,7 +143,8 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
 //=========================================================================
 ?>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
+//<![CDATA[
 	//set Thresholds, to be used in thermal_sensors.js
 	var thermal_sensors_widget_zoneWarningTempThreshold = <?= $thermal_sensors_widget_zoneWarningTempThreshold; ?>;
 	var thermal_sensors_widget_zoneCriticalTempThreshold = <?= $thermal_sensors_widget_zoneCriticalTempThreshold; ?>;
@@ -161,49 +162,13 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
 	jQuery(document).ready(function() {
 		showThermalSensorsData();
 	});
-
+//]]>
 </script>
 
-<style type="text/css">
-	/*thermal_sensors widget styles*/
-
-	.thermalSensorRow		{ width: 100%; border: 0px solid #ddd; padding: 1px; border-radius: 3px; }
-	.thermalSensorBarShell	{ position: relative; width: 100%; height: 5px; border: 1px solid lightgray; border-radius: 3px; }
-	.thermalSensorBar		{ position: absolute; width:   0%; height: 1px; z-index: 1; border-style: solid; border-radius: 3px; 
-							  background-color: LimeGreen; 
-							  border-top-width: 2px; border-top-color: Lime; 
-							  border-left-width: 0px;   
-							  border-right-width: 0px; 
-							  border-bottom-width: 2px; border-bottom-color: Green; 
-	}
-	.thermalSensorTextShell	{ height: 20px; width: 100%; top: 3px; }
-	.thermalSensorText		{ float: left; height: 20px; top: 3px; }
-	.thermalSensorValue		{ float: left; height: 20px; top: 3px; font-weight: bold; margin-left: 10px;}
-
-	.thermalSensorWarnThresh	{ position: absolute; background-color: orange; height: 16px; width: 2px; z-index: 2; margin-top: -8px; }
-	.thermalSensorCritThresh	{ position: absolute; background-color:    red; height: 16px; width: 2px; z-index: 2; margin-top: -8px; }
-
-	.thermal_sensors_widget_scale000 { position: absolute; height: 5px; width: 1px; left: -1px; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale020 { position: absolute; height: 3px; width: 1px; left:  10%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale010 { position: absolute; height: 3px; width: 1px; left:  20%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale030 { position: absolute; height: 3px; width: 1px; left:  30%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale040 { position: absolute; height: 3px; width: 1px; left:  40%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale050 { position: absolute; height: 3px; width: 1px; left:  50%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale060 { position: absolute; height: 3px; width: 1px; left:  60%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale070 { position: absolute; height: 3px; width: 1px; left:  70%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale080 { position: absolute; height: 3px; width: 1px; left:  80%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale090 { position: absolute; height: 3px; width: 1px; left:  90%; margin-top: -4px; background-color: lightgray; z-index: 0; font-size: 0; }
-	.thermal_sensors_widget_scale100 { position: absolute; height: 9px; width: 1px; left: 100%; margin-top: -6px; background-color: lightgray; z-index: 0; font-size: 0; }
-
-	.thermal_sensors_widget_mark100 { position: absolute; width: 15px; left: 96%; margin-top: -12px; font: 6pt Arial, sans-serif; text-align: left; color: #575757; }
-
-</style>
-
-
-<input type="hidden" id="thermal_sensors-config" name="thermal_sensors-config" value="">
-<div id="thermal_sensors-settings" name="thermal_sensors-settings" class="widgetconfigdiv" style="display:none;">
+<input type="hidden" id="thermal_sensors-config" name="thermal_sensors-config" value="" />
+<div id="thermal_sensors-settings" class="widgetconfigdiv" style="display:none;">
 	<form action="/widgets/widgets/thermal_sensors.widget.php" method="post" id="iform_thermal_sensors_settings" name="iform_thermal_sensors_settings">
-	<table width="100%" border="0">
+	<table width="100%" border="0" summary="thermal sensors widget">
 		<tr>
 		<td align="left" colspan="2">
 			<span style="font-weight: bold" >Thresholds in &deg;C (1 to 100):</span>
-- 
cgit v1.1