Merge branch 'pr/FreddleSpl0it/4527' into feature/bootstrap5

mailcow · Jun 15, 2022 · 5629d47 · 5629d47
2 parents 7ae7f25 + 37b4ff8
commit 5629d47
Show file tree

Hide file tree

Showing 160 changed files with 339,922 additions and 5,861 deletions.
diff --git a/data/web/admin.php b/data/web/admin.php
@@ -83,13 +83,16 @@
   ];
 }
 
+$themes = array_diff(scandir('/web/css/themes'), array('..', '.'));
+$themes = array_filter((str_replace("-bootstrap.css", "", $themes)));
 
 $template = 'admin.twig';
 $template_data = [
   'tfa_data' => $tfa_data,
   'tfa_id' => @$_SESSION['tfa_id'],
   'fido2_cid' => @$_SESSION['fido2_cid'],
   'fido2_data' => $fido2_data,
+  'themes' => $themes,
   'gal' => @$_SESSION['gal'],
   'license_guid' => license('guid'),
   'api' => [
@@ -112,6 +115,7 @@
   'password_complexity' => password_complexity('get'),
   'show_rspamd_global_filters' => @$_SESSION['show_rspamd_global_filters'],
   'lang_admin' => json_encode($lang['admin']),
+  'lang_datatables' => json_encode($lang['datatables']),
 ];
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';
diff --git a/data/web/css/build/001-bootstrap.min.css b/data/web/css/build/001-bootstrap.min.css
diff --git a/data/web/css/build/002-breakpoint.min.css b/data/web/css/build/002-breakpoint.min.css