diff --git a/cgi-bin/add.py b/cgi-bin/add.py index 24337ca4..77e0e0d6 100644 --- a/cgi-bin/add.py +++ b/cgi-bin/add.py @@ -277,7 +277,7 @@ print('' 'IP and Port:' '' ':' - '' + '' '
IP for bind listner, if empty will be assignet on all IPs. Start typing ip, or press down.
' '' '' diff --git a/cgi-bin/funct.py b/cgi-bin/funct.py index 6ed402d9..81fe32d8 100644 --- a/cgi-bin/funct.py +++ b/cgi-bin/funct.py @@ -37,9 +37,8 @@ def logging(serv, action): now_utc = datetime.now(timezone(time_zone)) IP = cgi.escape(os.environ["REMOTE_ADDR"]) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) - firstName = cookie.get('FirstName') - lastName = cookie.get('LastName') - mess = now_utc.strftime(dateFormat) + " from " + IP + " user: " + firstName.value + " " + lastName.value + " " + action + " for: " + serv + "\n" + login = cookie.get('login') + mess = now_utc.strftime(dateFormat) + " from " + IP + " user: " + login.value + " " + action + " for: " + serv + "\n" log = open(fullpath + "log/config_edit.log", "a") log.write(mess) log.close @@ -57,11 +56,15 @@ def telegram_send_mess(mess): bot = telegram.Bot(token=token_bot, request=pp) bot.send_message(chat_id=channel_name, text=mess) -def check_login(): +def check_login(**kwargs): cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) login = cookie.get('login') + role = cookie.get('role') ref = os.environ.get("SCRIPT_NAME") - + + if kwargs.get("admins_area") == "1" and role.value != "admin": + print('') + if login is None: print('' % ref) @@ -161,8 +164,8 @@ def footer(): print('' '
' '

' - 'UP' - '

' + 'UP' + '
' '
' '
' '
' @@ -414,7 +417,7 @@ def choose_only_select(serv, **kwargs): print('' % (listhap.get(i), selected, i)) def chooseServer(formName, title, note): - print('

' + title + '

') + print('

' + title + '

') print('

Choose server

') print('
') print('

' % grep) print('' '' - '' - '' + '') +if form.getvalue('serv') is not None: + print('' + '' + 'Update' + '' + '') +print('' '

' '') diff --git a/cgi-bin/overview.py b/cgi-bin/overview.py index 19406768..adf00515 100644 --- a/cgi-bin/overview.py +++ b/cgi-bin/overview.py @@ -27,11 +27,11 @@ print('

Quick Status

' if funct.is_admin(): print('' - 'User name' + 'Login' 'Group' '' 'Role' - '' + '' '' '' 'Show all' @@ -47,10 +47,10 @@ if funct.is_admin(): users = json.loads(f) if i is 4: style = 'style="display: none;" class="show-users"' - print('' + users['firstName'] + ' ' + users['lastName'] +'') + print('' + users['login'] +'') print(users['group']+'') print(users['role']) - print('') + print('') print('' 'Server' @@ -59,10 +59,11 @@ print('' '' '' 'Action' - '' - '' - 'Update' - '' + '' + '' + '' + 'Update' + '' '' '') @@ -70,16 +71,16 @@ listhap = funct.get_dick_after_permit() commands = [ "ps -Af |grep [h]aproxy |wc -l" ] for i in sorted(listhap): - print('' + i + '') + print('%s' % (i, i, i)) funct.ssh_command(listhap.get(i), commands, server_status="1") print('') print('show' % listhap.get(i)) print('edit' % listhap.get(i)) print('compare' % listhap.get(i)) print('map' % listhap.get(i)) - print('') + print('') -print('' +print('
' '' '
Server' 'Server status' @@ -87,12 +88,13 @@ print('
' '' 'Update' '' + '' '' '') print('') commands = [ "cat /etc/haproxy/haproxy.cfg |grep -E '^listen|^backend|^frontend' |grep -v stats |wc -l", "uname -smor", "haproxy -v |head -1", "top -u haproxy -b -n 1" ] for i in sorted(listhap): - print('') + print('') print('') diff --git a/cgi-bin/users b/cgi-bin/users index aed30cbe..79692c13 100644 --- a/cgi-bin/users +++ b/cgi-bin/users @@ -1,3 +1,3 @@ -{ "firstName": "admin", "lastName": "admin", "login": "admin", "password": "admin", "role": "admin", "group": "admin" } -{ "firstName": "Editor", "lastName": "Editor", "login": "Editor", "password": "Editor@123", "role": "editor", "group": "admin" } -{ "firstName": "Guest", "lastName": "Guest", "login": "Guest", "password": "Guest@123", "role": "guest", "group": "admin" } +{ "login": "admin", "password": "admin", "role": "admin", "group": "all" } +{ "login": "Editor", "password": "Editor@123", "role": "editor", "group": "all" } +{ "login": "Guest", "password": "Guest@123", "role": "guest", "group": "all" } diff --git a/script.js b/script.js index 7bfcbae6..5eaadd34 100644 --- a/script.js +++ b/script.js @@ -4,16 +4,17 @@ $( function() { $( "#tabs" ).tabs( "option", "active", 2 ); } ); $( "select" ).selectmenu(); - + var tooltips = $( "[title]" ).tooltip({ position: { my: "left top", - at: "right+5 top-5", + at: "right+5 top-25", collision: "none" } }); $( "input[type=submit], button" ).button(); $( "input[type=checkbox]" ).checkboxradio(); + $( "#number" ).spinner(); $( ".controlgroup" ).controlgroup(); $( ".configShow" ).accordion({ collapsible: true, @@ -261,4 +262,13 @@ $( function() { $("#optionsInput2").append(ui.item.value + " ") } }); -} ); \ No newline at end of file + input = $(''); + $( "#add-user" ).click( function(){ + $( "#users-table" ).append(input); + }); +} ); + +function removeUser(id) { + document.getElementById(id).parentNode.removeChild(document.getElementById(id)); + return false; +} \ No newline at end of file diff --git a/style.css b/style.css index 84eca285..a8aff637 100644 --- a/style.css +++ b/style.css @@ -150,6 +150,12 @@ iframe { padding-left: 10px; padding-right: 10px; } +.line:hover, .line3:hover, tr:hover { + background-color: #EEEEEE; +} +.overviewHead:hover { + background-color: #EBF1F1 +} .comment { color: #aaa; } @@ -164,6 +170,9 @@ iframe { .addButton { padding-top: 15px; } +.addButton:hover { + background-color: #fff; +} .addSuc { padding-left: 20px; padding-top: 20px; @@ -220,12 +229,12 @@ iframe { .add-button { background-color: #5CB85C; border-radius: 5px; - margin-left: 20px; color: #fff; padding: 5px; padding-right: 10px; padding-left: 10px; float: right; + margin-right: 10px; } .serverDown { background-color: red; @@ -237,6 +246,16 @@ iframe { .ro { border: none; } +.remove { + color: #fff; + text-shadow: 0 1px 0 rgba(0,0,0,.1); + background-color: #ca4333; + background-image: linear-gradient(180deg,#d44a3a,#bc3829); + background-repeat: repeat-x; + border-color: #d44a3a; + padding: 5px; + border-radius: 3px; +} .menu { margin-left: 13%; font-weight: bold; @@ -319,6 +338,10 @@ iframe { background-color: #5D9CEB !important; border-color: #5D9CEB !important; } +.ui-button { + padding-left: 10px !important; + padding-right: 10px !important; +} .ui-tooltip, .arrow:after { background: #33414E !important; border: 1px solid #33414E !important;

' + i + ':

' + i + ':

Total listen/frontend/backend:
')
 	funct.ssh_command(listhap.get(i), commands)
 	print('