From f3372b9e51f53831d9b35d5320955e87dedb6d16 Mon Sep 17 00:00:00 2001
From: That-Guy <raptors@that-guy.net>
Date: Thu, 22 Mar 2012 16:06:39 +0100
Subject: [PATCH] several fixes for non-complete JSON settings file (#17, 1h)

---
 server.html | 78 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/server.html b/server.html
index 315c2ea2..fb91ae12 100644
--- a/server.html
+++ b/server.html
@@ -164,6 +164,16 @@
             margin: 10px 0 5px 15px;
          }
 
+         .errorlogin
+         {
+            color: #c33;
+         }
+
+         .correctlogin
+         {
+            color: #393;
+         }
+
 
 
       </style>
@@ -183,12 +193,12 @@
 
          <label for='username'>
             Username:
-            <input type='text' id='username' value='test' />
+            <input type='text' id='username' value='testaccount' />
          </label>
 
          <label for='password'>
             Password:
-            <input type='password' id='password' value='test' />
+            <input type='password' id='password' value='pisvlek' />
          </label>
 
          <label for='server'>
@@ -206,11 +216,11 @@
          <h2>Config</h2>
 
          <label for='config-host'>
-            Host: <input type='text' id='config-host' value='' /> <span id='save-config-host'>(save)</span>
+            Host: <input type='text' id='config-host' value='' /> <button id='save-config-host'>save</button>
          </label>
 
          <label for='config-name'>
-            Name: <input type='text' id='config-name' value='' /> <span id='save-config-name'>(save)</span>
+            Name: <input type='text' id='config-name' value='' /> <button id='save-config-name'>save</button>
          </label>
 
          <span id='config-status'>Status: </span> <button id='config-status-disable'>DISABLE</button>
@@ -404,7 +414,22 @@
                      }
                   }else{
                      //console.log('no challenge - we\'re logged in! = OK');
-                     settings.settings = d;
+                     settings.settings = $.extend(true, {
+                        "config":
+                        {
+                           "host": "",
+                           "limits": [],
+                           "name": "",
+                           "protocols": {},
+                           "status": "",
+                           "version": ""
+                        },
+                        "streams": {},
+                        "log": {},
+                        "statistics": {}
+                     }, d);
+
+                     console.log('new shinyness object:', settings.settings);
                   }
 
                   if(callback)
@@ -433,20 +458,30 @@
                settings.server = $('#server').val();
 
                $('#status').text('logging in...');
+               $('#status').attr('class', '');
 
                loadSettings(function(errorstr)
                {
                   if(errorstr == '')
                   {
                      $('#status').text('logged in');
+                     $('#status').attr('class', 'correctlogin');
 
                      $('div').show();
 
                      fillHTML();
-                     //console.log('logged in!');
+/*
+                     setInterval(function()
+                     {
+                        loadSettings(fillLogs);
+                     }, 5000);
+*/
+                     console.log('logged in!');
                   }else{
                      $('#status').text('disconnected - ' + errorstr);
-                     $('div').hide();
+                     $('#status').attr('class', 'errorlogin');
+                     $('div:not(#current-status):not(#connect)').hide();
+                     //$('div').hide();
                      //console.log('error logging in: ' + errorstr);
                   }
                });
@@ -549,7 +584,7 @@
                   $(this).parent().remove();
 
                   loadSettings(fillLimits);
-               }).text('(delete)');
+               }).html('<button>delete</button>');
 
                cur.append($('<td>').text(limitShortToLong(lim.name)));
                cur.append($('<td>').text(lim.type));
@@ -574,7 +609,7 @@
 
                li.text(protocol + ' on port ' + settings.settings.config.protocols[protocol].port);
 
-               li.append($('<span>').click(function()
+               li.append($('<button>').click(function()
                {
                   var prot = $(this).parent().attr('id').replace('protocol-', '');
                   console.log(prot);
@@ -584,7 +619,7 @@
                   $(this).parent().remove();
 
                   loadSettings(fillProtocols);
-               }).text('<remove>'));
+               }).text('remove'));
 
                $('#protocol-list').append(li);
             }
@@ -599,7 +634,7 @@
 
             for(stream in settings.settings.streams)
             {
-               var d = $('<span>').text(' <delete>').attr('id', 'stream-delete-' + stream).click(function()
+               var d = $('<button>').text('delete').attr('id', 'stream-delete-' + stream).click(function()
                {
                   var id = $(this).attr('id').replace('stream-delete-', '');
                   console.log('delete this stream', id);
@@ -616,7 +651,7 @@
                li.append( $('<div>').text('Name: ').append(
                   $('<input>').attr('type', 'text').attr('id', 'stream-name-' + stream).attr('value', cur.name)
                ).append(
-                  $('<span>').text('<save>').click(function(x)
+                  $('<button>').text('save').click(function(x)
                   {
                      return function()
                      {
@@ -635,7 +670,7 @@
                li.append( $('<div>').text('Group: ').append(
                   $('<input>').attr('type', 'text').attr('id', 'stream-group-' + stream).attr('value', cur.group)
                ).append(
-                  $('<span>').text('<save>').click(function(x)
+                  $('<button>').text('save').click(function(x)
                   {
                      return function()
                      {
@@ -663,7 +698,7 @@
                      $('<input>').attr('type', 'text').attr('id', 'stream-channel-account-' + stream).attr('value', cur.channel.account)
                   )
                );
-               channel.append($('<span>').attr('class', 'mleft25').text('(save)').click(function()
+               channel.append($('<button>').attr('class', 'mleft25').text('save').click(function()
                {
                   var cname = $(this).parent().attr('id').replace('stream-channel-', ''),
                       url   = $('#stream-channel-url-' + cname).val(),
@@ -696,7 +731,9 @@
                   )
                ).append(tbody);
 
-               for(var i = 0; i < cur.limits.length; i++)
+               var cll = cur.limits ? cur.limits.length : 0;
+
+               for(var i = 0; i < cll; i++)
                {
                   var climit = $('<tr>').attr('id', 'stream-limit-' + stream + '-' + i);
 
@@ -711,7 +748,7 @@
 
                      loadSettings(fillStreams);
 
-                  }).text('(delete)');
+                  }).html('<button>delete</button>');
 
                   climit.append($('<td>').text(limitShortToLong(cur.limits[i].name)));
                   climit.append($('<td>').text(cur.limits[i].type));
@@ -786,7 +823,7 @@
                spreset.append( $('<div>').text('Command: ').append(
                   $('<input>').attr('id', 'stream-preset-cmd-' + stream).attr('type', 'text').val(settings.settings.streams[stream].preset.cmd)
                ).append(
-                  $('<span>').text('<save>').click(function()
+                  $('<button>').text('save').click(function()
                   {
                      var stream = $(this).parent().parent().attr('id').replace('stream-preset-', '');
                      var cmd = $('#stream-preset-cmd-' + stream).val();
@@ -801,7 +838,7 @@
                spreset.append( $('<div>').text('Description: ').append(
                   $('<input>').attr('id', 'stream-preset-desc-' + stream).attr('type', 'text').val(settings.settings.streams[stream].preset.desc)
                ).append(
-                  $('<span>').text('<save>').click(function()
+                  $('<button>').text('save').click(function()
                   {
                      var stream = $(this).parent().parent().attr('id').replace('stream-preset-', '');
                      var desc = $('#stream-preset-desc-' + stream).val();
@@ -816,7 +853,7 @@
                spreset.append( $('<div>').text('Name: ').append(
                   $('<input>').attr('id', 'stream-preset-name-' + stream).attr('type', 'text').val(settings.settings.streams[stream].preset.name)
                ).append(
-                  $('<span>').text('<save>').click(function()
+                  $('<button>').text('save').click(function()
                   {
                      var stream = $(this).parent().parent().attr('id').replace('stream-preset-', '');
                      var name = $('#stream-preset-name-' + stream).val();
@@ -874,6 +911,8 @@
                 logs = settings.settings.log.reverse(),
                 len = logs.length;
 
+            tbody.html('');
+
             for(i = 0; i < len; i++)
             {
                cur = settings.settings.log[i];
@@ -886,7 +925,6 @@
                   $('<td>').text(cur[2])
                );
 
-
                tbody.append(tr);
             }
          }