From 2f2f1775036e6dbb08cc8e4aaa89310e8b795d95 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Thu, 26 May 2022 11:33:31 +0200 Subject: [PATCH] Redesign - popravki napak - gdpr tabela --- admin/survey/classes/class.GDPR.php | 2 +- admin/survey/classes/tracking/CrossRoad.php | 4 +++- public/css/admin_new.css | 8 ++++++++ .../sass/admin_new/pages/gdpr_pages/gdpr_tables.scss | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index c4f5689e2..4dc8e419c 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -491,7 +491,7 @@ class GDPR{ ORDER BY date(r.datum) ASC"); if(mysqli_num_rows($sql) > 0){ - echo ''; + echo '
'; echo ''; echo ''; diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 12a19451c..2163b847b 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -560,8 +560,10 @@ class CrossRoad { # GDPR case 'gdpr': - if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requestsall') + if ($_GET['m'] == 'gdpr_requests') $layout_width = 'wide'; + elseif ($_GET['m'] == 'gdpr_requests_all') + $layout_width = 'fullscreen'; else $layout_width = 'narrow'; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 74f593bd5..46be9181e 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10731,6 +10731,14 @@ table.variableView { width: 100%; } +table.gdpr_surveys { + table-layout: fixed; + width: 100%; +} +table.gdpr_surveys.all { + width: calc(100% - 64px); + margin: 0 32px; +} table.gdpr_surveys tr.red_row td { background-color: #FFEFEF !important; } diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss index ba6a9f1c7..5367592cf 100644 --- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss +++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss @@ -2,6 +2,14 @@ table { &.gdpr_surveys { + table-layout: fixed; + width: 100%; + + &.all{ + width: calc(100% - 64px); + margin: 0 32px; + } + tr.red_row { td { background-color: $light-red !important;
'.$lang['srv_gdpr_requests_author'].'