From bd42727d067c30228ee648f782a8eb71d8fa1202 Mon Sep 17 00:00:00 2001
From: Colin Fleming <cj_fleming@sky.com>
Date: Tue, 1 Apr 2014 16:55:55 +0100
Subject: Tidy up "system_information.widget.php" XHTML

Add CDATA secttions to script
Remove link to CSS file and place it in HEAD.INC and add "type"
---
 usr/local/www/head.inc                                      |  1 +
 usr/local/www/widgets/widgets/system_information.widget.php | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 55ed98a..8b2ba82 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -33,6 +33,7 @@ $pagetitle = gentitle( $pgtitle );
 		<link rel="stylesheet" type="text/css" href="/niftycssCode.css" />
 		<link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print" />
 		<link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme']?>/new_tab_menu.css" media="all" />
+		<link rel="stylesheet" type="text/css" href="javascript/jquery/jquery-ui.custom.css" />
 		<script type="text/javascript" src="/javascript/niftyjsCode.js"></script>
 		<script type="text/javascript" src="/javascript/jquery.js"></script>
 		<script type="text/javascript" src="/javascript/jquery/jquery-ui.custom.min.js"></script>
diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php
index cf1ebe8..2cb00f2 100644
--- a/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/usr/local/www/widgets/widgets/system_information.widget.php
@@ -71,10 +71,11 @@ if($_REQUEST['getupdatestatus']) {
 			$needs_system_upgrade = false;
 			if (pfs_version_compare($current_installed_buildtime, $current_installed_version, $remote_version) == -1) {
 				echo "<br /><span class=\"red\" id=\"updatealert\"><b>Update available. </b></span><a href=\"/system_firmware_check.php\">Click Here</a> to view update.";
-				echo "<script type=\"text/javascript\">";
-				echo "jQuery('#updatealert').effect('pulsate',{times: 30},10000);";
-
-				echo "</script>";
+				echo "\n<script type=\"text/javascript\">\n";
+				echo "//<![CDATA[\n";
+				echo "jQuery('#updatealert').effect('pulsate',{times: 30},10000);\n";
+				echo "//]]>\n";
+				echo "</script>\n";
 			} else
 				echo "<br />You are on the latest version.";
 		}
@@ -86,6 +87,7 @@ $curcfg = $config['system']['firmware'];
 
 ?>
 <script type="text/javascript">
+//<![CDATA[
 	jQuery(function() { 
 		jQuery("#statePB").progressbar( { value: <?php echo get_pfstate(true); ?> } );
 		jQuery("#mbufPB").progressbar( { value: <?php echo get_mbuf(true); ?> } );
@@ -100,8 +102,8 @@ $curcfg = $config['system']['firmware'];
                 	jQuery("#tempPB").progressbar( { value: <?php echo get_temp(); ?> } );
 		<?php endif; ?>
 	});
+//]]>
 </script>
-<link rel="stylesheet" href="javascript/jquery/jquery-ui.custom.css" />
 
 <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="system information">
 	<tbody>
-- 
cgit v1.1