From ffe536a57fecd49c59f4468d1700683e7befda45 Mon Sep 17 00:00:00 2001 From: envoyr Date: Mon, 21 Feb 2022 19:29:34 +0100 Subject: [PATCH] make tables more customizable --- .../admin/admin/tablelisting.admin.php | 31 ++++++++++++-- templates/Froxlor/table/table.html.twig | 16 ++++++-- templates/Froxlor/table/tablemacros.html.twig | 40 +++++++++++++++++++ 3 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 templates/Froxlor/table/tablemacros.html.twig diff --git a/lib/tablelisting/admin/admin/tablelisting.admin.php b/lib/tablelisting/admin/admin/tablelisting.admin.php index 75efea07..5efd0385 100644 --- a/lib/tablelisting/admin/admin/tablelisting.admin.php +++ b/lib/tablelisting/admin/admin/tablelisting.admin.php @@ -34,24 +34,33 @@ return [ ], 'diskspace' => [ 'title' => $lng['customer']['diskspace'], + 'type' => 'usage', ], 'diskspace_used' => [ 'title' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')', + 'type' => 'usage', ], 'traffic' => [ - 'title' => $lng['customer']['traffic'] + 'title' => $lng['customer']['traffic'], + 'type' => 'usage', ], 'traffic_used' => [ - 'title' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')' + 'title' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')', + 'type' => 'usage', ], 'deactivated' => [ - 'title' => $lng['admin']['deactivated'] + 'title' => $lng['admin']['deactivated'], + 'type' => 'boolean', ], ], 'visible_columns' => getVisibleColumnsForListing('admin_list', [ 'loginname', 'name', 'diskspace', + 'diskspace_used', + 'traffic', + 'traffic_used', + 'deactivated', ]), 'actions' => [ 'delete' => [ @@ -62,6 +71,22 @@ return [ 'title' => 'Show', 'href' => '#', ] + ], + 'contextual_class' => [ + 'deactivated' => [ + 'value' => true, + 'return' => 'bg-secondary' + ], + 'diskspace_used' => [ + 'column' => 'diskspace', + 'operator' => '>=', + 'return' => 'bg-danger' + ], + 'traffic_used' => [ + 'column' => 'traffic', + 'operator' => '>=', + 'return' => 'bg-danger' + ], ] ] ]; diff --git a/templates/Froxlor/table/table.html.twig b/templates/Froxlor/table/table.html.twig index a0b0344a..2ff84e36 100644 --- a/templates/Froxlor/table/table.html.twig +++ b/templates/Froxlor/table/table.html.twig @@ -1,5 +1,7 @@ {% macro table(table_options, api_response, action, title = "") %} + {% import "Froxlor/table/tablemacros.html.twig" as tablemacros %} +
{% if title is not empty %}