diff --git a/app/templates/admin.html b/app/templates/admin.html index 92fb3c85..c3e1f300 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -163,15 +163,15 @@ - - - - - - - - - + + + + + + + + + @@ -184,7 +184,7 @@ - - - - -
HostnameIPPort(?)GroupEnableVirt(?)Alert(?)Metrics(?)Slave for (?)CredentialsIPPort(?)GroupEnableVirt(?)Alert(?)Metrics(?)Slave for (?)Credentials Desciption
+ @@ -199,28 +199,28 @@ {% endfor %} + {% if server.5 == 1 %} {% else %} {% endif %} + {% if server.4 == 1 %} {% else %} {% endif %} + {% if server.8 == 1 %} {% else %} {% endif %} + {% if server.9 == 1 %} {% else %} @@ -269,76 +269,6 @@

+ Add

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -544,9 +474,95 @@
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New hostname + +
IP + +
Port(?) + +
Group + +
Enable + +
Virt(?) + +
Alert(?) + +
Metrics(?) + +
Slave for + +
Credentials + +
Desciption + +
+
{% endblock %} \ No newline at end of file diff --git a/app/templates/viewstats.html b/app/templates/viewstats.html index a8967104..4abedea8 100644 --- a/app/templates/viewstats.html +++ b/app/templates/viewstats.html @@ -35,7 +35,7 @@ $('td').css('font-size', '11'); $('h1').css('display', 'none'); $('td').css('border-color', '#ddd'); - $('td').css('padding', '4px'); + $('td').css('padding', '3px'); $('th').css('padding-top', '4px'); $('th').css('padding-bottom', '4px'); $('th').css('border-color', '#ddd'); diff --git a/inc/style.css b/inc/style.css index 17aafa2b..fb6ab1d9 100644 --- a/inc/style.css +++ b/inc/style.css @@ -304,10 +304,25 @@ pre { border-bottom: 1px solid #ddd; border-radius: 5px; } - -/*.overviewTd { - padding-top: 20px; -}*/ +.checkbox { + width: 60px; + padding-left: 5px; +} +.checkbox-head { + padding: 0; +} +.ip-field { + width: 100px; +} +.group-field, .slave-field { + width: 10%; +} +.slave-field { + padding-left: 10px; +} +.cred-field { + width: 17%; +} .overviewTr { margin: 0; background-color: #f6f8fa; @@ -343,6 +358,10 @@ pre { border: none; width: 23%; } +.padding20 { + padding: 15px; + width: 30%; +} .first-collumn { padding-left: 15px; width: 15%; @@ -477,7 +496,7 @@ b, strong { font-weight: bold; } -button, +//button, input, optgroup, select, diff --git a/inc/users.js b/inc/users.js index fd1b0efd..1f1f9460 100644 --- a/inc/users.js +++ b/inc/users.js @@ -187,65 +187,7 @@ $( function() { } } } ); - }); - $('#add-server').click(function() { - $('#error').remove(); - $('.alert-danger').remove(); - var typeip = 0; - var enable = 0; - var alert_en = 0; - var metrics = 0; - if ($('#typeip').is(':checked')) { - typeip = '1'; - } - if ($('#enable').is(':checked')) { - enable = '1'; - } - if ($('#alert').is(':checked')) { - var alert_en = '1'; - } - if ($('#metrics').is(':checked')) { - var metrics = '1'; - } - $.ajax( { - url: "sql.py", - data: { - newserver: "1", - servername: $('#new-server-add').val(), - newip: $('#new-ip').val(), - newport: $('#new-port').val(), - newservergroup: $('#new-server-group-add').val(), - typeip: typeip, - enable: enable, - slave: $('#slavefor' ).val(), - cred: $('#credentials').val(), - alert_en: alert_en, - metrics: metrics, - page: cur_url[0], - desc: $('#desc').val() - }, - type: "GET", - success: function( data ) { - data = data.replace(/\s+/g,' '); - if (data.indexOf('error') != '-1') { - $("#ajax-servers").append(data); - $('#errorMess').click(function() { - $('#error').remove(); - $('.alert-danger').remove(); - }); - } else { - $('.alert-danger').remove(); - $("#ajax-servers").append(data); - $(".newserver").addClass( "update", 1000, callbackServer ); - $( "input[type=submit], button" ).button(); - $( "input[type=checkbox]" ).checkboxradio(); - $( "select" ).selectmenu(); - $.getScript(awesome); - } - } - } ); - }); - + }); $('#add-ssh').click(function() { $('#error').remove(); $('.alert-danger').remove(); @@ -349,9 +291,29 @@ $( function() { } }); $('#add-server-button').click(function() { - if ($('#server-add-table').css('display', 'none')) { - $('#server-add-table').show("blind", "fast"); - } + $( "#server-add-table" ).dialog({ + resizable: false, + height: "auto", + width: 600, + modal: true, + title: "Add new server", + show: { + effect: "fade", + duration: 200 + }, + hide: { + effect: "fade", + duration: 200 + }, + buttons: { + "Add": function() { + addServer(); + }, + Cancel: function() { + $( this ).dialog( "close" ); + } + } + }); }); $('#add-ssh-button').click(function() { if ($('#ssh-add-table').css('display', 'none')) { @@ -422,7 +384,75 @@ $( function() { }); } ); - +function addServer() { + $('#error').remove(); + $('.alert-danger').remove(); + var servername = $('#new-server-add').val(); + var newip = $('#new-ip').val(); + var newservergroup = $('#new-server-group-add').val(); + var cred = $('#credentials').val(); + var typeip = 0; + var enable = 0; + var alert_en = 0; + var metrics = 0; + if ($('#typeip').is(':checked')) { + typeip = '1'; + } + if ($('#enable').is(':checked')) { + enable = '1'; + } + if ($('#alert').is(':checked')) { + var alert_en = '1'; + } + if ($('#metrics').is(':checked')) { + var metrics = '1'; + } + if (servername == '' || newip == '' || newservergroup == '' || cred == '') { + alert('All fields must be completed'); + } else { + $.ajax( { + url: "sql.py", + data: { + newserver: "1", + servername: servername, + newip: newip, + newport: $('#new-port').val(), + newservergroup: newservergroup, + typeip: typeip, + enable: enable, + slave: $('#slavefor' ).val(), + cred: cred, + alert_en: alert_en, + metrics: metrics, + page: cur_url[0], + desc: $('#desc').val() + }, + type: "GET", + success: function( data ) { + data = data.replace(/\s+/g,' '); + if (data.indexOf('error') != '-1') { + $("#ajax-servers").append(data); + $('#errorMess').click(function() { + $('#error').remove(); + $('.alert-danger').remove(); + }); + } else { + $('.alert-danger').remove(); + $("#ajax-servers").append(data); + $(".newserver").addClass( "update", 1000 ); + setTimeout(function() { + $( ".newserver" ).removeClass( "update" ); + }, 2500 ); + $( "input[type=submit], button" ).button(); + $( "input[type=checkbox]" ).checkboxradio(); + $( "select" ).selectmenu(); + $.getScript(awesome); + } + } + } ); + $( "#server-add-table" ).dialog("close" ); + } +} function updateSettings(param, val) { $('.alert-danger').remove(); $.ajax( {