diff --git a/lsp/functions.js b/lsp/functions.js index d984bd08..e9892782 100644 --- a/lsp/functions.js +++ b/lsp/functions.js @@ -140,7 +140,6 @@ }, 'capabilities': {} }; - $.ajax( { 'url': settings.server, @@ -429,18 +428,33 @@ * Formats the status property to a string (with colors!) * @param status, the status property of a stream */ - function formatStatus(status) + function formatStatus(status,text) { if(status == undefined) { return "Unknown, checking..."; } - switch(status) + if(text == undefined) { - case 1: return "Running"; break; - case 0: return "Offline"; break; - case -1: return "Unknown, checking..."; break; - default: return "" + status + ""; break; + switch(status) + { + case -1: return "Unknown, checking..."; break; + case 0: return "Unavailable"; break; + case 1: return "Active"; break; + case 2: return "Inactive"; break; + default: return ""+status+""; break; + } + } + else + { + switch(status) + { + case -1: return "Unknown, checking..."; break; + case 0: return ""+text+""; break; + case 1: return ""+text+""; break; + case 2: return ""+text+""; break; + default: return ""+text+""; break; + } } } diff --git a/lsp/main.js b/lsp/main.js index 04f92a66..ca99c9a2 100644 --- a/lsp/main.js +++ b/lsp/main.js @@ -206,7 +206,11 @@ } } } - + if (settings.settings.config.basepath == undefined) + { + settings.settings.config.basepath = ""; + } + $('#page').append( $('
').attr('id', 'editserver').append( $('