From 74862811b24c14a980e422fe4dfae879f4ff5b37 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Thu, 4 Aug 2022 12:32:01 +0300 Subject: [PATCH] v6.1.3.0 Change log: https://roxy-wi.org/changelog.py#6_1_3 --- app/logs.py | 3 ++- app/templates/404.html | 15 ++++++++++++--- app/templates/500.html | 15 ++++++++++++--- app/templates/base.html | 2 +- app/templates/login.html | 12 ++++++------ inc/images/404.png | Bin 480280 -> 0 bytes inc/images/500.png | Bin 829368 -> 0 bytes inc/images/loading.gif | Bin 37382 -> 51117 bytes inc/images/logo_login.png | Bin 18390 -> 53042 bytes inc/images/logo_menu.png | Bin 5742 -> 17506 bytes inc/style.css | 6 ++---- 11 files changed, 35 insertions(+), 18 deletions(-) delete mode 100644 inc/images/404.png delete mode 100644 inc/images/500.png diff --git a/app/logs.py b/app/logs.py index 7e15b919..285efbf6 100644 --- a/app/logs.py +++ b/app/logs.py @@ -27,6 +27,7 @@ minut = form.getvalue('minut') minut1 = form.getvalue('minut1') waf = form.getvalue('waf') service = form.getvalue('service') +remote_file = form.getvalue('file') print('Content-type: text/html\n') funct.check_login() @@ -56,6 +57,6 @@ else: template = template.render( h2=1, autorefresh=1, title=title, role=role, user=user, select_id="serv", selects=servers, serv=form.getvalue('serv'), rows=rows, grep=grep, exgrep=exgrep, hour=hour, hour1=hour1, minut=minut, - minut1=minut1, waf=waf, service=service, user_services=user_services, token=token + minut1=minut1, waf=waf, service=service, user_services=user_services, token=token, remote_file=remote_file ) print(template) diff --git a/app/templates/404.html b/app/templates/404.html index e416adae..5251dab3 100644 --- a/app/templates/404.html +++ b/app/templates/404.html @@ -46,7 +46,7 @@
- logo + logo
@@ -63,11 +63,20 @@

404 - Page not found

+
- 404 error -

Sorry, but page not found. Try another page

+
+ Oops +
diff --git a/app/templates/500.html b/app/templates/500.html index 1dba9f5f..f9067de8 100644 --- a/app/templates/500.html +++ b/app/templates/500.html @@ -46,7 +46,7 @@
- logo + logo
@@ -63,13 +63,22 @@

500 - Internal error

+
- 500 error -

Sorry, but something went wrong..... Check httpd error log and create issue on GitHub or write to the chat

+
+ Oops +
diff --git a/app/templates/base.html b/app/templates/base.html index c3f55fd7..686f06bb 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -52,7 +52,7 @@
- logo + logo
diff --git a/app/templates/login.html b/app/templates/login.html index 7dc24a87..2e74e56a 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block content %} +{% block content %} {% from 'include/input_macros.html' import input %}