diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 4dc8e419c..9c5fd35f6 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -522,7 +522,7 @@ class GDPR{
echo '
'.$row['u_name'].' '.$row['u_surname'].' ('.$row['u_email'].') | ';
// Odgovorna oseba
- echo '';
+ echo ' | ';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo ''.$lang['srv_gdpr_user_settings_firstname'].': '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').' ';
if($row['gu_phone'] != '')
@@ -532,7 +532,7 @@ class GDPR{
echo ' | ';
// Organizacija
- echo '';
+ echo ' | ';
if($row['gu_type'] == '1'){
if($row['gu_organization'] != '')
echo ''.$lang['srv_gdpr_user_settings_organization'].': '.$row['gu_organization'].' ';
@@ -619,7 +619,7 @@ class GDPR{
echo ' | '.$row['u_name'].' '.$row['u_surname'].' ('.$row['u_email'].') | ';
// Odgovorna oseba
- echo '';
+ echo ' | ';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo ''.$lang['srv_gdpr_user_settings_firstname'].': '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').' ';
if($row['gu_phone'] != '')
@@ -629,7 +629,7 @@ class GDPR{
echo ' | ';
// Organizacija
- echo '';
+ echo ' | ';
if($row['gu_type'] == '1'){
if($row['gu_organization'] != '')
echo ''.$lang['srv_gdpr_user_settings_organization'].': '.$row['gu_organization'].' ';
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index 2163b847b..c917dbf33 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -560,10 +560,8 @@ class CrossRoad {
# GDPR
case 'gdpr':
- if ($_GET['m'] == 'gdpr_requests')
+ if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all')
$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 46be9181e..2b5465978 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10735,10 +10735,6 @@ 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 5367592cf..5ff086fd2 100644
--- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
+++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
@@ -5,11 +5,6 @@ table {
table-layout: fixed;
width: 100%;
- &.all{
- width: calc(100% - 64px);
- margin: 0 32px;
- }
-
tr.red_row {
td {
background-color: $light-red !important;
|