--- a/www-thermferm/index.php Wed Jul 23 17:12:18 2014 +0200
+++ b/www-thermferm/index.php Wed Jul 23 21:14:20 2014 +0200
@@ -27,6 +27,7 @@
$my_style = 'ui-redmond';
require_once('liveview.php');
+require_once('maintenance_panel.php');
$outstr = '<!DOCTYPE html>'.PHP_EOL;
@@ -47,28 +48,12 @@
$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxchart.core.js"></script>'.PHP_EOL;
$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxdraw.js"></script>'.PHP_EOL;
$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxdata.js"></script>'.PHP_EOL;
-$outstr .= ' <script type="text/javascript">'.PHP_EOL;
-
-$outstr .= ' function addEventListeners() {'.PHP_EOL;
-$outstr .= ' $("#maintenance").mousedown(function () {'.PHP_EOL;
-$outstr .= ' $("#maintenance_window").jqxWindow(\'open\');'.PHP_EOL;
-$outstr .= ' });'.PHP_EOL;
-$outstr .= ' }'.PHP_EOL;
+$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxscrollbar.js"></script>'.PHP_EOL;
+$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxgrid.js"></script>'.PHP_EOL;
+$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxgrid.selection.js"></script>'.PHP_EOL;
+$outstr .= ' <script type="text/javascript" src="jqwidgets/jqxgrid.columnsresize.js"></script>'.PHP_EOL;
+$outstr .= ' </head>'.PHP_EOL;
-$outstr .= ' function createMaintenance() {'.PHP_EOL;
-$outstr .= ' $("#maintenance_window").jqxWindow({'.PHP_EOL;
-$outstr .= ' height: 400, width: 800, autoOpen: false, theme: \''.$my_style.'\', '.PHP_EOL;
-$outstr .= ' position: { x:100, y:50 }, '.PHP_EOL;
-$outstr .= ' resizable: false, isModal: true, modalOpacity: 0.5, '.PHP_EOL;
-$outstr .= ' okButton: $("#maintenance_ok"), '.PHP_EOL;
-$outstr .= ' initContent: function () {'.PHP_EOL;
-$outstr .= ' $("#maintenance_ok").jqxButton({ width: 70, height: 25, theme: \''.$my_style.'\' });'.PHP_EOL;
-$outstr .= ' }'.PHP_EOL;
-$outstr .= ' });'.PHP_EOL;
-$outstr .= ' $("#maintenance").jqxButton({ width: 150, height: 25, theme: \''.$my_style.'\'});'.PHP_EOL;
-$outstr .= ' }'.PHP_EOL;
-$outstr .= ' </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;
@@ -76,52 +61,10 @@
$outstr .= ' <input type="button" id="maintenance" value="Maintenance panel" />'.PHP_EOL;
$outstr .= ' </div> <!-- header -->'.PHP_EOL;
$outstr .= liveview();
-
-/* The maintenance popup window */
-$outstr .= ' <div id="maintenance_window">'.PHP_EOL;
-$outstr .= ' <div id="maintenance_header">'.PHP_EOL;
-$outstr .= ' Maintenance panel'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <div id="maintenance_content">'.PHP_EOL;
-$outstr .= ' <div id="jqxTabs_maint">'.PHP_EOL;
-$outstr .= ' <ul>'.PHP_EOL;
-$outstr .= ' <li style="margin-left: 20px;">General</li>'.PHP_EOL;
-$outstr .= ' <li style="margin-left: 20px;">1-Wire Bus</li>'.PHP_EOL;
-$outstr .= ' <li style="margin-left: 20px;">Profiles</li>'.PHP_EOL;
-$outstr .= ' <li style="margin-left: 20px;">Units</li>'.PHP_EOL;
-$outstr .= ' </ul>'.PHP_EOL;
-$outstr .= ' <div>'.PHP_EOL;
-$outstr .= ' General'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <div>'.PHP_EOL;
-$outstr .= ' 1-Wire Bus'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <div>'.PHP_EOL;
-$outstr .= ' Profiles'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <div>'.PHP_EOL;
-$outstr .= ' Units'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <input type="button" id="maintenance_ok" value="Dismiss" style="margin-top: 5px; margin-left: 365px" />'.PHP_EOL;
-$outstr .= ' </div>'.PHP_EOL;
-$outstr .= ' <script type="text/javascript">'.PHP_EOL;
-$outstr .= ' $(document).ready(function () {'.PHP_EOL;
-$outstr .= ' $("#jqxTabs_maint").jqxTabs({ width: 790, height: 330, position: \'top\', theme: \''.$my_style.'\'});'.PHP_EOL;
-$outstr .= ' });'.PHP_EOL;
-$outstr .= ' </script>'.PHP_EOL;
-$outstr .= ' </div> <!-- maintenance_window -->'.PHP_EOL;
+$outstr .= maintenance_panel();
/* Create the tabs */
-$outstr .= ' <script type="text/javascript">'.PHP_EOL;
-$outstr .= ' $(document).ready(function () {'.PHP_EOL;
-$outstr .= ' // Create jqxTabs.'.PHP_EOL;
-$outstr .= ' $("#jqxTabs").jqxTabs({ width: 978, height: 428, position: \'top\', theme: \''.$my_style.'\'});'.PHP_EOL;
-$outstr .= ' addEventListeners();'.PHP_EOL;
-$outstr .= ' createMaintenance();'.PHP_EOL;
-$outstr .= ' });'.PHP_EOL;
-$outstr .= ' </script>'.PHP_EOL;
-
+$outstr .= ' <script type="text/javascript" src="js/main.js"></script>'.PHP_EOL;
$outstr .= ' </div> <!-- jqxWidget -->'.PHP_EOL;
$outstr .= ' </body>'.PHP_EOL;
$outstr .= '</html>'.PHP_EOL;