Mercurial > bms / changeset

--- a/www/includes/global.inc.php	Thu May 21 14:32:23 2020 +0200
+++ b/www/includes/global.inc.php	Thu May 21 17:14:08 2020 +0200
@@ -282,11 +282,9 @@
        <li><img style='float: left; margin-right: 5px;' src='images/help-about.png' /><a href="gen_about.php">Informatie</a></li>
       </ul>
      </li>
+     <li style='width: 400px;'><div id="wsstatus"></div></li>
     </ul>
    </div> <!-- End menu -->
-   <div id="jqxStatus">
-    <div id="wsstatus" style="padding: 5px;"></div>
-   </div>
 
 <?php
  $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);

--- a/www/js/global.js	Thu May 21 14:32:23 2020 +0200
+++ b/www/js/global.js	Thu May 21 17:14:08 2020 +0200
@@ -751,7 +751,6 @@
 mashlist = new $.jqx.dataAdapter(mashProfileSource);
 
 /* Websocket interface. Place "websocket.onmessage = function(evt) {}" in the user script. */
-//var websocket = new WebSocket('ws://'+location.hostname+'/ws');
 var websocket = new ReconnectingWebSocket('ws://'+location.hostname+'/ws');
 
 websocket.onopen = function(evt) {
@@ -772,14 +771,13 @@
 $(document).ready(function() {
 
  $('#jqxMenu').jqxMenu({
-  width: 800,
+  width: 1280,
   height: '30px',
   autoOpen: false,
   clickToOpen: true,
   theme: theme
  });
  $('#jqxWidget').css('visibility', 'visible');
- $('#jqxStatus').jqxPanel({ width: 478, height: 30, theme: theme });
 });