may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popravki napak - gdpr tabela

Browse Source
This commit is contained in:
pero1203 2022-05-26 11:37:14 +02:00
parent 2f2f177503
commit 0c3513b06b
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/classes/class.GDPR.php
View File

@ -522,7 +522,7 @@ class GDPR{
echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>'; echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>';
// Odgovorna oseba // Odgovorna oseba
echo '<td style="text-align:left; white-space:nowrap;">'; echo '<td style="text-align:left;">';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '') if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />'; echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />';
if($row['gu_phone'] != '') if($row['gu_phone'] != '')
@ -532,7 +532,7 @@ class GDPR{
echo '</td>'; echo '</td>';
// Organizacija // Organizacija
echo '<td style="text-align:left; white-space:nowrap;">'; echo '<td style="text-align:left;">';
if($row['gu_type'] == '1'){ if($row['gu_type'] == '1'){
if($row['gu_organization'] != '') if($row['gu_organization'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />'; echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />';
@ -619,7 +619,7 @@ class GDPR{
echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>'; echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>';
// Odgovorna oseba // Odgovorna oseba
echo '<td style="text-align:left; white-space:nowrap;">'; echo '<td style="text-align:left;">';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '') if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />'; echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />';
if($row['gu_phone'] != '') if($row['gu_phone'] != '')
@ -629,7 +629,7 @@ class GDPR{
echo '</td>'; echo '</td>';
// Organizacija // Organizacija
echo '<td style="text-align:left; white-space:nowrap;">'; echo '<td style="text-align:left;">';
if($row['gu_type'] == '1'){ if($row['gu_type'] == '1'){
if($row['gu_organization'] != '') if($row['gu_organization'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />'; echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />';

4
admin/survey/classes/tracking/CrossRoad.php
View File

@ -560,10 +560,8 @@ class CrossRoad {
# GDPR # GDPR
case 'gdpr': case 'gdpr':
if ($_GET['m'] == 'gdpr_requests') if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all')
$layout_width = 'wide'; $layout_width = 'wide';
elseif ($_GET['m'] == 'gdpr_requests_all')
$layout_width = 'fullscreen';
else else
$layout_width = 'narrow'; $layout_width = 'narrow';

4
public/css/admin_new.css
View File

@ -10735,10 +10735,6 @@ table.gdpr_surveys {
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }
table.gdpr_surveys.all {
width: calc(100% - 64px);
margin: 0 32px;
}
table.gdpr_surveys tr.red_row td { table.gdpr_surveys tr.red_row td {
background-color: #FFEFEF !important; background-color: #FFEFEF !important;
} }

5
resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
View File

@ -5,11 +5,6 @@ table {
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
&.all{
width: calc(100% - 64px);
margin: 0 32px;
}
tr.red_row { tr.red_row {
td { td {
background-color: $light-red !important; background-color: $light-red !important;