LSP: added basepath and changed stream status display
This commit is contained in:
parent
ca21530c84
commit
166a5be276
3 changed files with 48 additions and 16 deletions
|
@ -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 "<span>Unknown, checking...</span>";
|
||||
}
|
||||
if(text == undefined)
|
||||
{
|
||||
switch(status)
|
||||
{
|
||||
case 1: return "<span class='green'>Running</span>"; break;
|
||||
case 0: return "<span class='red'>Offline</span>"; break;
|
||||
case -1: return "<span>Unknown, checking...</span>"; break;
|
||||
default: return "<span class='green'>" + status + "</span>"; break;
|
||||
case 0: return "<span class='red'>Unavailable</span>"; break;
|
||||
case 1: return "<span class='green'>Active</span>"; break;
|
||||
case 2: return "<span class='orange'>Inactive</span>"; break;
|
||||
default: return "<span>"+status+"</span>"; break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch(status)
|
||||
{
|
||||
case -1: return "<span>Unknown, checking...</span>"; break;
|
||||
case 0: return "<span class='red'>"+text+"</span>"; break;
|
||||
case 1: return "<span class='green'>"+text+"</span>"; break;
|
||||
case 2: return "<span class='orange'>"+text+"</span>"; break;
|
||||
default: return "<span>"+text+"</span>"; break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
25
lsp/main.js
25
lsp/main.js
|
@ -206,6 +206,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
if (settings.settings.config.basepath == undefined)
|
||||
{
|
||||
settings.settings.config.basepath = "";
|
||||
}
|
||||
|
||||
$('#page').append(
|
||||
$('<div>').attr('id', 'editserver').append(
|
||||
|
@ -217,9 +221,13 @@
|
|||
$('<input>').attr('type', 'text').attr('placeholder', 'NAME').attr('id', 'config-name').attr('value', settings.settings.config.name)
|
||||
)
|
||||
).append(
|
||||
$('<label>').text('version').append(
|
||||
$('<label>').text('Version').append(
|
||||
$('<span>').text(settings.settings.config.version)
|
||||
).append($uptodate)
|
||||
).append(
|
||||
$('<label>').text('Base path').append(
|
||||
$('<input>').attr('type','text').attr('placeholder','BASE PATH').attr('id','config-basepath').val(settings.settings.config.basepath)
|
||||
)
|
||||
).append(
|
||||
$('<label>').text('time').append(
|
||||
$('<span>').text( formatDate(settings.settings.config.time) )
|
||||
|
@ -235,7 +243,6 @@
|
|||
)
|
||||
);
|
||||
|
||||
|
||||
function showStats()
|
||||
{
|
||||
getStatData(function(data)
|
||||
|
@ -258,9 +265,11 @@
|
|||
{
|
||||
var host = $('#config-host').val();
|
||||
var name = $('#config-name').val();
|
||||
var path = $('#config-basepath').val();
|
||||
|
||||
settings.settings.config.host = host;
|
||||
settings.settings.config.name = name;
|
||||
settings.settings.config.basepath = path;
|
||||
|
||||
loadSettings(function()
|
||||
{
|
||||
|
@ -682,11 +691,12 @@
|
|||
{
|
||||
if (streams[stream][2])
|
||||
{
|
||||
streamstatus = streams[stream][2];
|
||||
//there is an error
|
||||
streamstatus = formatStatus(streams[stream][0],streams[stream][2]);
|
||||
}
|
||||
else
|
||||
{
|
||||
streamstatus = streams[stream][0];
|
||||
streamstatus = formatStatus(streams[stream][0]);
|
||||
}
|
||||
}
|
||||
$(this).children(':nth-child(5)').html(formatStatus(streamstatus));
|
||||
|
@ -713,6 +723,7 @@
|
|||
for(stream in settings.settings.streams)
|
||||
{
|
||||
|
||||
//backwards compatibility
|
||||
//if sid does not yet exist, create it
|
||||
if (settings.settings.streams[stream].sid == undefined)
|
||||
{
|
||||
|
@ -748,10 +759,12 @@
|
|||
|
||||
if (cstr.error)
|
||||
{
|
||||
cstr.online = cstr.error;
|
||||
$tr.append( $('<td>').html( formatStatus( cstr.online, cstr.error ) ) );
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$tr.append( $('<td>').html( formatStatus( cstr.online ) ) );
|
||||
}
|
||||
|
||||
var cviewers = 0;
|
||||
|
||||
|
|
|
@ -186,6 +186,11 @@ tbody td.center
|
|||
color: #14991a;
|
||||
}
|
||||
|
||||
.orange
|
||||
{
|
||||
color: #ff8a00;
|
||||
}
|
||||
|
||||
.loggingin
|
||||
{
|
||||
color: #ee8833;
|
||||
|
|
Loading…
Add table
Reference in a new issue