From 191daff468d33f2b2d22a517a4ebad8ca209ccb3 Mon Sep 17 00:00:00 2001
From: Marco Malavolti <marco.malavolti@garr.it>
Date: Wed, 17 Jul 2024 18:47:07 +0200
Subject: [PATCH] Fixed stdout/stderr for Docker + Update UI
---
eccs-logrotate.conf | 2 +-
eccs.ini | 5 +-
supervisord.conf | 4 +-
web/eccs.css | 34 +------
web/footer.php | 6 +-
web/header.php | 1 +
web/index.php | 9 +-
web/master.css | 26 ++++++
web/old-ie.css | 211 ++++++++++++++++++++++++++++++++++++++++++++
9 files changed, 253 insertions(+), 45 deletions(-)
create mode 100644 web/old-ie.css
diff --git a/eccs-logrotate.conf b/eccs-logrotate.conf
index 2244e9f..6762a49 100644
--- a/eccs-logrotate.conf
+++ b/eccs-logrotate.conf
@@ -1,4 +1,4 @@
-/home/eccs/logs/eccs-uwsgi.log {
+/home/eccs/logs/eccs-uwsgi-req.log {
su root root
create 664 eccs eccs
rotate 30
diff --git a/eccs.ini b/eccs.ini
index 2a55c66..eee853f 100644
--- a/eccs.ini
+++ b/eccs.ini
@@ -23,12 +23,9 @@ wsgi-file = eccs-wsgi.py
plugins = python3,logfile
enable-threads = true
-logto = logs/%(project)-uwsgi.log
req-logger = file:logs/%(project)-uwsgi-req.log
-logger = file:logs/%(project)-uwsgi-error.log
log-maxsize = 100000000
-log-backupname = logs/%(project)-uwsgi.old.log
-log-format = %(addr)|[%(ctime)]|%(method)|%(uri)
+log-format = %(addr)|[%(ctime)]|%(method)|%(uri)|%(uagent)|%(referer)
# Each 1000 request restart workers
max-requests = 1000
diff --git a/supervisord.conf b/supervisord.conf
index 7c160b8..05cf6a9 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -29,9 +29,9 @@ autorestart=true
[program:uwsgi]
command=uwsgi --ini /home/eccs/eccs.ini
user=eccs
-stdout_logfile=/home/eccs/logs/eccs-uwsgi-supervisor.log
+stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
-stderr_logfile=/home/eccs/logs/eccs-uwsgi-supervisor.log
+stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
autostart=true
autorestart=true
diff --git a/web/eccs.css b/web/eccs.css
index c735b89..3f30665 100644
--- a/web/eccs.css
+++ b/web/eccs.css
@@ -54,44 +54,12 @@ table {
font-weight: bold;
}
-.footer {
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- background-color: #003f5f;
- font-size: 15px;
-}
-
-.footer a {
- color: #668c9e;
- text-decoration: none;
-}
-
-.footer a:hover {
- text-decoration: underline;
-}
-
-.footer a:not(:last-child) {
- padding-right: 1em;
-}
-
-.footer .col-1-1 {
- text-align: left;
-}
-
-.footer .col-1-2 {
- text-align: right;
- white-space: nowrap;
-}
-
div#calendarGo {
float:right;
position: relative;
top: 2px;
}
-
button#goButton {
float:right;
padding-right: 10px;
@@ -257,4 +225,4 @@ input[type=checkbox] {
opacity: 0.6;
display: none;
background-size: 100px 100px;
-}
\ No newline at end of file
+}
diff --git a/web/footer.php b/web/footer.php
index 7e38926..3c5ffe7 100644
--- a/web/footer.php
+++ b/web/footer.php
@@ -1,5 +1,5 @@
<?php ?>
- <div class="footer">
+ <footer style="visibility: hidden;">
<div class="central-section">
<div class="col-1-1" style="padding:15px; display:inline-block">
<img src="eu_logo.png"/>
@@ -7,8 +7,8 @@
<div class="col-1-2" style="color:white">
<a href="https://edugain.org/privacy/" target="_blank">Privacy Notice</a>
- <a href="https://edugain.org/disclaimer/" target="_blank">Disclaimer</a>
+ <a href="https://edugain.org/disclaimer/" target="_blank">Disclaimer</a>
<a href="https://www.geant.org/Policies" target="_blank">Policies</a>
</div>
</div>
- </div>
+ </footer>
diff --git a/web/header.php b/web/header.php
index 03975c1..8436d34 100644
--- a/web/header.php
+++ b/web/header.php
@@ -1,4 +1,5 @@
<?php ?>
+<div id="inner" style="position: relative;">
<header>
<div style="position: relative; height: 115px; width: 100%; background: #003f5f">
<img id="geant_logo_t" src="geant_logo1.png" style="position: absolute; left: 20px; bottom: 0px;">
diff --git a/web/index.php b/web/index.php
index 14530b4..90d6eb4 100644
--- a/web/index.php
+++ b/web/index.php
@@ -27,6 +27,11 @@ $data[ 'check_result' ] = htmlspecialchars($_GET[ "check_result" ]);
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="format-detection" content="telephone=no" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
+ <title>eduGAIN Connectivity Check Service</title>
+
+ <!--[if lt IE 9]>
+ <link rel="stylesheet" type="text/css" href="old-ie.css" />
+ <![endif]-->
<link rel="stylesheet" type="text/css" href="master.css?v=1" />
<link rel="stylesheet" type="text/css" href="et-menu-master.css" />
@@ -54,7 +59,7 @@ $data[ 'check_result' ] = htmlspecialchars($_GET[ "check_result" ]);
}).datepicker("setDate","<?php echo $data[ 'date' ] ?>");
} );
</script>
- <title>eduGAIN Connectivity Check Service</title>
+
</head>
<body>
<!-- eduGAIN Header START -->
@@ -129,8 +134,8 @@ $data[ 'check_result' ] = htmlspecialchars($_GET[ "check_result" ]);
</div>
</div>
</div> <!-- END main_body -->
+ </div> <!-- END wrap -->
<?php include 'footer.php'; ?>
<?php include 'edugain-scripts-css.php'; ?>
- </div> <!-- END wrap -->
</body>
</html>
diff --git a/web/master.css b/web/master.css
index 15fbafa..0e897ad 100644
--- a/web/master.css
+++ b/web/master.css
@@ -163,6 +163,10 @@ footer a {
background-position: 90% 5px;
background-image: url('../images/warning-icon.png');
}
+
+.entity_links {
+ padding: 5px;
+}
/* ------- Table Style 1 ------- */
.ts-1 {
@@ -396,3 +400,25 @@ div.api-help dt {
top: 50%;
display: none;
}
+
+#issues {
+ font-size: 14px;
+}
+
+#issues td.issues-title {
+ font-size: 1.2em;
+ background-color: #F1893B;
+ color: #FFF;
+ padding-left: 0.5em;
+ padding-right: 1em;
+}
+
+#issues td {
+
+}
+
+#issues th {
+ text-align: left;
+ padding-left: 2em;
+}
+
diff --git a/web/old-ie.css b/web/old-ie.css
new file mode 100644
index 0000000..b757877
--- /dev/null
+++ b/web/old-ie.css
@@ -0,0 +1,211 @@
+@CHARSET "UTF-8";
+
+html {
+ background-color: #EEF;
+}
+
+body {
+ color: #004360;
+ background-color: #FFF;
+ font-family: "Segoe UI","Segoe",Helvetica,Open Sans,sans-serif,Tahoma,sans-serif;
+ font-size: 12px;
+ width: 1200px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+h1, h2 {
+ margin: 0;
+ padding: 0;
+}
+
+h1 {
+ font-size: 1.7em;
+}
+
+h2 {
+ font-size: 1.3em;
+}
+
+img {
+ border: none;
+}
+
+
+a {
+ text-decoration: none;
+ color: #004360;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+
+
+footer {
+ vertical-align: bottom;
+ width: 100%;
+ background-color: #EEE;
+ padding-top: 1em;
+ padding-bottom: 0.5em;
+ margin-top: 1em;
+ clear: both;
+}
+
+
+footer .col-1-1 {
+ vertical-align: bottom;
+ float: left;
+}
+
+footer .col-1-2 {
+ vertical-align: bottom;
+ white-space: nowrap;
+ text-align: right;
+}
+
+footer a {
+ padding-left: 1em;
+}
+
+
+.central-section {
+ width: 1000px;
+ margin-left: auto;
+ margin-right: auto;
+}
+.main-nav {
+ border-top: 1px solid #EEE;
+ border-bottom: 1px solid #EEE;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ letter-spacing: 0.1em;
+}
+
+.main-nav ul {
+ list-style-type: none;
+ padding-left: 1em;
+}
+
+#nav_icon {
+ display: none;
+}
+
+
+/* Specific images */
+
+#main_logo {
+ width: 180px;
+}
+
+#geant_logo {
+ width: 50px;
+}
+
+#world_small {
+ width: 400px;
+}
+
+
+/* ======================================================================================== */
+.ts-1 {
+ border-collapse: collapse;
+/* margin: auto; */
+ padding-top: 3em;
+}
+
+.ts-1 caption {
+ color: #FFF;
+ background-color: #F1893B;
+ font-size: 1.2em;
+ font-weight: normal;
+ padding: 0.5em 1em 0.5em 1em;
+ margin-bottom: 0.4em;
+ white-space: nowrap;
+}
+
+.ts-1 caption img {
+ vertical-align: middle;
+ padding-left: 1em;
+}
+
+.ts-1 th{
+ font-weight: normal;
+ text-align: left;
+ padding: 1em 2em 1em 1em;
+ border-right: 1px solid #f1893b;
+}
+.ts-1 td{
+ text-align: right;
+ padding: 1em 1em 1em 2em;
+}
+
+.ts-1 tr {
+ border-bottom: 1px solid #f1893b;
+ margin: 0;
+}
+
+.ts-1 .last-row {
+ border-bottom: none;
+}
+
+
+
+
+
+.highlight-section-1 {
+ background-color: #EEE;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ position: relative;
+ top: 0;
+}
+
+.central-section .col-1-1 {
+ display: inline-block;
+ width: 60%;
+ float: left;
+}
+
+.central-section .col-1-2 {
+ text-align: right;
+}
+
+.highlight-section-1 .col-1-1 {
+/* position: relative; */
+/* top: -50px; */
+}
+
+.highlight-section-1 .col-1-2 {
+ display: inline-block;
+/* width: 35%; */
+}
+
+
+h2.highlight-header {
+ color: #F1893B;
+ background-color: #FFF;
+ font-weight: normal;
+ display: inline-block;
+ padding:0.5em;
+ margin: 0;
+ margin-left: 1em;
+}
+
+
+#eduGAIN-numbers-table_2 {
+ text-align: center;
+}
+
+
+
+
+#eduGAIN-numbers-table_1 {
+ display: none;
+}
+
+
+
+
+
--
GitLab