From 00aaa0a48160a0695023a26720568a545d8abd12 Mon Sep 17 00:00:00 2001 From: Aidaho12 <buffoon2001@mail.ru> Date: Sat, 7 Jul 2018 15:43:31 +0600 Subject: [PATCH] v2.6.1 Bugs --- app/delver.py | 4 ++-- app/edit.py | 7 +++++-- app/templates/add.html | 5 +++++ app/templates/admin.html | 5 +++++ app/templates/runtimeapi.html | 11 ++++++++--- app/templates/servers.html | 5 +++++ inc/nprogress.css | 2 +- inc/style.css | 5 ++++- install.sh | 2 +- 9 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app/delver.py b/app/delver.py index 6a79ef35..aba35e69 100644 --- a/app/delver.py +++ b/app/delver.py @@ -22,7 +22,7 @@ try: cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) user_id = cookie.get('uuid') user = sql.get_user_name_by_uuid(user_id.value) - servers = sql.get_dick_permit() + servers = sql.get_dick_permit(disable=0) token = sql.get_token(user_id.value) except: pass @@ -72,4 +72,4 @@ output_from_parsed_template = template.render(h2 = 1, title = "Delete old versio Select = form.getvalue('del'), file = file, token = token) -print(output_from_parsed_template) +print(output_from_parsed_template) \ No newline at end of file diff --git a/app/edit.py b/app/edit.py index 31d1a452..fe0c3541 100644 --- a/app/edit.py +++ b/app/edit.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 import os import sql -import http +import http, cgi import funct import sql from jinja2 import Environment, FileSystemLoader @@ -10,6 +10,7 @@ template = env.get_template('runtimeapi.html') print('Content-type: text/html\n') funct.check_login() +form = cgi.FieldStorage() try: cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) @@ -17,6 +18,7 @@ try: user = sql.get_user_name_by_uuid(user_id.value) servers = sql.get_dick_permit(virt=1) token = sql.get_token(user_id.value) + servbackend = form.getvalue('servbackend') except: pass @@ -27,5 +29,6 @@ output_from_parsed_template = template.render(h2 = 1, onclick = "showRuntime()", select_id = "serv", selects = servers, - token = token) + token = token, + servbackend = servbackend) print(output_from_parsed_template) \ No newline at end of file diff --git a/app/templates/add.html b/app/templates/add.html index eb70e6dc..e1570d71 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -6,6 +6,11 @@ <li><a href="#frontend">Frontend</a></li> <li><a href="#backend">Backend</a></li> <li><a href="#ssl">SSL certificates</a></li> + {% if user %} + <a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a> + {% else %} + <a href=/app/login.py title="Login" class="login"> Login</a> + {% endif %} </ul> <div id="listen"> <form name="add-listner" action="/app/add.py"> diff --git a/app/templates/admin.html b/app/templates/admin.html index 84709e2e..9f6b7bca 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -11,6 +11,11 @@ <li><a href="#servers">Servers</a></li> <li><a href="#roles">Roles</a></li> <li><a href="#ssh">SSH credentials</a></li> + {% if user %} + <a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a> + {% else %} + <a href=/app/login.py title="Login" class="login"> Login</a> + {% endif %} </ul> <div id="users"> <table class="overview" id="ajax-users"> diff --git a/app/templates/runtimeapi.html b/app/templates/runtimeapi.html index 1ebbc3cd..c0cdcb15 100644 --- a/app/templates/runtimeapi.html +++ b/app/templates/runtimeapi.html @@ -10,8 +10,8 @@ </tr> <tr> <td class="padding10 first-collumn" style="width: 25%;"> - <form action= {{ action }} method="get"> - <select autofocus required id="{{ select_id }}"> + <form action="{{ action }}" method="get"> + <select autofocus required id="{{ select_id }}" name="{{ select_id }}"> <option disabled>Choose server</option> {% for select in selects %} <option value="{{ select.2 }}">{{ select.1 }}</option> @@ -30,7 +30,7 @@ </select> </td> <td> - <input type="text" name="servbackend" id="servbackend" size=35 title="Frontend, backend/server, show: info, pools or help" required class="form-control"> + <input type="text" name="servbackend" id="servbackend" size=35 title="Frontend, backend/server, show: info, pools or help" required class="form-control" value="{{ servbackend }}"> </td> <td> {% if role <= 2 %} @@ -43,4 +43,9 @@ </form> </tr> </table> + <script> + if($('#servbackend').val()) { + window.onload = {{ onclick }} + } + </script> {% endblock %} \ No newline at end of file diff --git a/app/templates/servers.html b/app/templates/servers.html index ea917d17..89573e17 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -8,6 +8,11 @@ <ul> <li><a href="#servers">Servers</a></li> <li><a href="#ssh">SSH credentials</a></li> + {% if user %} + <a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a> + {% else %} + <a href=/app/login.py title="Login" class="login"> Login</a> + {% endif %} </ul> <div id="servers"> diff --git a/inc/nprogress.css b/inc/nprogress.css index 42d37deb..95495825 100644 --- a/inc/nprogress.css +++ b/inc/nprogress.css @@ -30,7 +30,7 @@ position: fixed; z-index: 1031; top: 15px; - right: 175px; + right: 285px; } #nprogress .spinner-icon { width: 18px; diff --git a/inc/style.css b/inc/style.css index b532d70c..82e6cb94 100644 --- a/inc/style.css +++ b/inc/style.css @@ -419,7 +419,8 @@ pre { color: #fff !important; } .ui-tabs-nav { - padding-left: 20px !important; + border-radius: 0 !important; + padding-left: 25px !important; } .ui-tabs .ui-tabs-panel { padding: 0 !important; @@ -427,6 +428,8 @@ pre { } .ui-tabs { padding-left: 0 !important; + margin-top: -5px !important; + margin-left: -2px; } .ui-widget-header { background: #5d9ceb !important; diff --git a/install.sh b/install.sh index 0df74ff8..96135d5a 100644 --- a/install.sh +++ b/install.sh @@ -57,7 +57,7 @@ else yum -y install epel-release fi - yum -y install git nmap-ncat net-tools lshw python34 dos2unix python34-pip httpd mod_ssl gcc python34-devel + yum -y install git nmap-ncat net-tools lshw python34 dos2unix python34-pip httpd mod_ssl python34-devel HTTPD_CONFIG="/etc/httpd/conf/httpd.conf" HAPROXY_WI_VHOST_CONF="/etc/httpd/conf.d/haproxy-wi.conf" HTTPD_NAME="httpd"