diff --git a/admin/survey/script/narocila.js b/admin/survey/script/narocila.js index 67ef3e31e..7752e7288 100644 --- a/admin/survey/script/narocila.js +++ b/admin/survey/script/narocila.js @@ -61,6 +61,11 @@ function prepareNarocilaTableAdmin(){ deferRender: true, dom: 'Blfrtip', responsive: true, + columnDefs: [ + {responsivePriority: 1, targets: 0}, + {responsivePriority: 2, targets: 7}, + {responsivePriority: 3, targets: 4} + ], language: { "url": siteUrl+"admin/survey/script/datatables/Slovenian.json" }, @@ -118,6 +123,11 @@ function preparePlacilaTableAdmin(){ deferRender: true, dom: 'Blfrtip', responsive: true, + columnDefs: [ + {responsivePriority: 1, targets: 0}, + {responsivePriority: 2, targets: 3}, + {responsivePriority: 3, targets: 2} + ], language: { "url": siteUrl+"admin/survey/script/datatables/Slovenian.json" }, diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index 53776e362..70a9fe97b 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -340,7 +340,14 @@ class UserNarocila{ foreach($data as $usr_id => $data_row){ - echo ''; + if($data_row['status'] == '0') + $status_color = 'red'; + elseif($data_row['status'] == '1') + $status_color = 'green'; + else + $status_color = 'black'; + + echo ''; echo ''.$data_row['name'].' '.$data_row['surname'].' '.($data_row['podjetje_ime'] != '' ? '('.$data_row['podjetje_ime'].')' : '').''; echo ''.$data_row['email'].''; @@ -361,14 +368,6 @@ class UserNarocila{ else echo ''.$cena['final'].''; - - if($data_row['status'] == '0') - $status_color = 'red'; - elseif($data_row['status'] == '1') - $status_color = 'green'; - else - $status_color = 'black'; - echo ''; echo $lang['srv_narocilo_status_'.$data_row['status']]; diff --git a/public/css/admin.css b/public/css/admin.css index 3a0854b01..bda092d82 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -26925,6 +26925,17 @@ label.user_access_locked:hover, #narocila table.dataTable.user_narocila_admin { padding: 20px 0; } +@media screen and (max-width: 700px) { + #narocila table.dataTable.user_narocila_admin tr.red_bg { + /*background-color: #eecccc;*/ + } + #narocila table.dataTable.user_narocila_admin tr.green_bg { + background-color: #ddeedd; + } + #narocila table.dataTable.user_narocila_admin tr.black_bg { + background-color: #eeeeee; + } +} #narocila table.dataTable.user_narocila_admin td:nth-child(n+3) { text-align: center; } diff --git a/resources/sass/admin/payments.scss b/resources/sass/admin/payments.scss index 57f6bf56a..565bd13b2 100644 --- a/resources/sass/admin/payments.scss +++ b/resources/sass/admin/payments.scss @@ -206,6 +206,20 @@ label.user_access_locked, table.dataTable.user_narocila_admin{ padding: 20px 0; + @media screen and (max-width: 700px) { + tr{ + &.red_bg{ + /*background-color: #eecccc;*/ + } + &.green_bg{ + background-color: #ddeedd; + } + &.black_bg{ + background-color: #eeeeee; + } + } + } + td:nth-child(n+3){ text-align: center; }