diff --git a/server-rel.html b/server-rel.html index c7a7876d..eac4bf07 100644 --- a/server-rel.html +++ b/server-rel.html @@ -28,13 +28,26 @@ body +.floatright +{ + float: right; +} + + + + /* content - tables */ table { width: 100%; - margin-top: 5px; - border-spacing: 0; + /*margin-top: 5px;*/ + /*border-spacing: 0;*/ +} + +table +{ + border-spacing: 0 4px; } table thead @@ -59,6 +72,7 @@ table td color: #505050; } + tbody tr:nth-child(even) { background-color: #f0f0f0; @@ -123,6 +137,8 @@ tbody input tbody td button { padding: 2px 7px 2px 7px; + text-transform: uppercase; + font-weight: bold; } tbody td.center @@ -132,6 +148,11 @@ tbody td.center +.outsidetable td +{ + padding-top: 30px; + background-color: #fafafa; +} @@ -225,6 +246,7 @@ tbody td.center #header-title > span, #header-connection, #header-host, #nav, th, +#login > button, p, label { @@ -232,12 +254,11 @@ label text-transform: uppercase; } -#login > input, #login > button +#login > input { font: normal bold 11pt Arial, sans-serif; } - td { font: normal normal 10pt Arial, sans-serif; @@ -391,7 +412,8 @@ td 'timeout': 2500, 'error': function() { - setHeaderState('disconnected'); + //setHeaderState('disconnected'); + showTab('disconnect'); }, 'success': function(d) { @@ -471,8 +493,8 @@ td //TODO fixme login creds var host = $('').attr('type', 'text').attr('placeholder', 'http://localhost:4242'); - var user = $('').attr('type', 'text').attr('placeholder', 'USERNAME');/*.attr('value', 'testaccount'); */ - var pass = $('').attr('type', 'password').attr('placeholder', 'PASSWORD');/*.attr('value', 'pisvlek'); */ + var user = $('').attr('type', 'text').attr('placeholder', 'USERNAME').attr('value', 'testaccount'); + var pass = $('').attr('type', 'password').attr('placeholder', 'PASSWORD').attr('value', 'pisvlek'); var conn = $('').click(function() { // get login info @@ -511,7 +533,7 @@ td console.log('error logging in: ' + errorstr); } }); - }).text('connect'); + }).text('login'); $('#page').append( $('').attr('id', 'login').append(host).append(user).append(pass).append(conn) @@ -550,7 +572,7 @@ td tr.append( $('').attr('class', 'center').append( $('').click(function() { - var id = $(this).parent().attr('id').replace('protocol-', ''); + var id = $(this).parent().parent().attr('id').replace('protocol-', ''); delete settings.settings.config.protocols[protocol]; $(this).parent().parent().remove(); loadSettings(); @@ -561,7 +583,7 @@ td // add new limit! - $nprot = $(''); + $nprot = $('').attr('class', 'outsidetable'); // protocol select $pname = $('').attr('id', 'new-protocol-name'); $pname.append( $('').attr('value', 'HTTP').text('HTTP') ); @@ -569,7 +591,7 @@ td $nprot.append( $('').append($pname) ); // val - $nprot.append( $('').append( $('').attr('type', 'text').attr('id', 'new-protocol-val') ) ); + $nprot.append( $('').append( $('').attr('type', 'number').attr('id', 'new-protocol-val') ) ); $nprot.append( $('').attr('class', 'center').append( @@ -668,7 +690,7 @@ $('#page').append( $('').text('TODO stream settings: ' + sname + ' / ' + stre tr.append( $('').attr('class', 'center').append( $('').click(function() { - var id = $(this).parent().attr('id').replace('limits-', ''); + var id = $(this).parent().parent().attr('id').replace('limits-', ''); settings.settings.config.limits.splice(id, 1); $(this).parent().parent().remove(); @@ -679,7 +701,7 @@ $('#page').append( $('').text('TODO stream settings: ' + sname + ' / ' + stre } // add new limit! - $nltr = $(''); + $nltr = $('').attr('class', 'outsidetable'); // type select $ltype = $('').attr('id', 'new-limit-type'); @@ -757,6 +779,17 @@ $('#page').append( $('').text('TODO stream settings: ' + sname + ' / ' + stre $table.append($tbody); $('#page').append($table); + $('#page').append( + $('').attr('class', 'floatright').click(function() + { + settings.settings.clearstatlogs = 1; + loadSettings(function() + { + showTab('logs'); + }); + }).text('Purge logs') + ); + break;
').text('TODO stream settings: ' + sname + ' / ' + stre tr.append( $('
').text('TODO stream settings: ' + sname + ' / ' + stre } // add new limit! - $nltr = $('
').text('TODO stream settings: ' + sname + ' / ' + stre $table.append($tbody); $('#page').append($table); + $('#page').append( + $('').attr('class', 'floatright').click(function() + { + settings.settings.clearstatlogs = 1; + loadSettings(function() + { + showTab('logs'); + }); + }).text('Purge logs') + ); + break;