diff --git a/cgi-bin/delver.py b/cgi-bin/delver.py index cea041de..ad1feb83 100644 --- a/cgi-bin/delver.py +++ b/cgi-bin/delver.py @@ -23,7 +23,9 @@ funct.chooseServer("delver.py#conf", "Delete Versions HAproxy config", "n") if serv is not None and form.getvalue('open') is not None: print('

Choose old version

') - print('
') + print('' + '' + '
') import glob diff --git a/cgi-bin/overview.py b/cgi-bin/overview.py index e65e0350..b6948cdd 100644 --- a/cgi-bin/overview.py +++ b/cgi-bin/overview.py @@ -21,12 +21,14 @@ try: except IOError: print("Can't load users DB") -print('

Quick Status

') +print('

Quick Status

' + '
') commands = [ "ps -Af |grep [h]aproxy |wc -l" ] print('' '' + '' '') @@ -51,17 +54,25 @@ print('' '' '' + '' '') for i in sorted(listhap.listhap): print('') -print('' +print('
User nameLogin name' 'Role' '' @@ -44,6 +46,7 @@ for f in open(USERS, 'r'): if i is 4: style = 'style="display: none;" class="show-users"' print('
' + users['firstName'] + ' ' + users['lastName'] +'') + print(users['login']+'') print(users['role']) print('
Server' 'HAproxy status' + '' + 'Action' '' '' - 'Update' + 'Update' '' '
' + i + '') funct.ssh_command(listhap.listhap.get(i), commands, server_status="1") + print('') + print('show' % listhap.listhap.get(i)) + print('edit' % listhap.listhap.get(i)) + print('compare' % listhap.listhap.get(i)) + print('map' % listhap.listhap.get(i)) print('
' '' '') -print('' - '' - '' - '' - '
Server' 'Server status' @@ -79,9 +90,5 @@ for i in sorted(listhap.listhap): funct.ssh_command(listhap.listhap.get(i), commands) print('
') +print('') funct.footer() \ No newline at end of file diff --git a/image/7.jpeg b/image/7.jpeg index f24329b4..b5aa504f 100644 Binary files a/image/7.jpeg and b/image/7.jpeg differ diff --git a/image/pic.rar b/image/pic.rar new file mode 100644 index 00000000..bf6335a8 Binary files /dev/null and b/image/pic.rar differ diff --git a/image/pic/compare.png b/image/pic/compare.png new file mode 100644 index 00000000..a298d052 Binary files /dev/null and b/image/pic/compare.png differ diff --git a/image/pic/edit.png b/image/pic/edit.png new file mode 100644 index 00000000..57605b85 Binary files /dev/null and b/image/pic/edit.png differ diff --git a/image/pic/map.png b/image/pic/map.png new file mode 100644 index 00000000..d43ee92c Binary files /dev/null and b/image/pic/map.png differ diff --git a/image/pic/show.png b/image/pic/show.png new file mode 100644 index 00000000..47b6f0ea Binary files /dev/null and b/image/pic/show.png differ diff --git a/index.html b/index.html index 6ab1f096..c10aa65e 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ Upload old config
Delete old config
diff --git a/script.js b/script.js index 8b63b234..7bfcbae6 100644 --- a/script.js +++ b/script.js @@ -20,12 +20,16 @@ $( function() { heightStyle: "content", icons: { "header": "ui-icon-plus", "activeHeader": "ui-icon-minus" } }); - /*$( "dropdown_selector" ).change(function() { - var $option = $(this).find('option:selected'); - if ($option == "tcp") { - $("#https-listen").hide(); - } - }); */ + $('#select_all').click(function(){ + var checkboxes = $(this).closest('form').find(':checkbox'); + if($(this).prop('checked')) { + $("form input[type='checkbox']").attr("checked",true).change(); + $("#label_select_all").text("Unselect all"); + } else { + $("form input[type='checkbox']").attr("checked",false).change(); + $("#label_select_all").text("Select all"); + } + }); $ ( "#show-all-users" ).click( function() { if($( "#show-all-users" ).text() == "Show all") { $( ".show-users" ).show("fast"); diff --git a/style.css b/style.css index b9b7f618..67cd3805 100644 --- a/style.css +++ b/style.css @@ -30,8 +30,10 @@ form { iframe { width: 33%; } -.top-menu { - background-color: #222; +.icon { + max-width: 20px; +} +.top-menu { box-shadow: 1px 1px 5px grey; min-height: 50px; margin-bottom: 20px; @@ -41,8 +43,11 @@ iframe { left: 0; z-index: 1000; } +.top-menu, .footer { + background-color: #33414E; +} .logoText { - color: #fff; + color: #EBF1F1; font-size: 30px; float: left; margin-left: 50px; @@ -110,7 +115,6 @@ iframe { } .param { font-weight: bold; - //background-color: #DCDCDC; padding-left: 13px; } .numRow { @@ -172,7 +176,6 @@ iframe { padding-top: 10px; } .footer { - background-color: #222; box-shadow: 1px 1px 5px grey; min-height: 50px; top: 0; @@ -232,7 +235,7 @@ iframe { padding: 10px; } .menu ul > li:hover{ - background-color: #333; + background-color: #3a4a4a; } .menu ul ul > li:hover{ background-color: #69e; @@ -245,7 +248,7 @@ iframe { position: relative; margin: 0; padding: 0; - background-color: #222222; + background-color: #33414E; } .menu ul ul{ display: none;