diff --git a/admin/pages/menus.php b/admin/pages/menus.php index a4ddb1ad..e2608b0b 100644 --- a/admin/pages/menus.php +++ b/admin/pages/menus.php @@ -85,7 +85,7 @@ if (isset($_POST['template'])) { if (isset($_GET['reset_colors'])) { foreach ($config['menu_categories'] as $id => $options) { - $color = $options['default_links_color'] ?? $config['menu_default_color'] ?? '#ffffff'; + $color = $options['default_links_color'] ?? ($config['menu_default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff')); Menu::where('template', $template)->where('category', $id)->update(['color' => str_replace('#', '', $color)]); } @@ -108,7 +108,7 @@ if (isset($_POST['template'])) { $title = 'Menus - ' . $template; - $canResetColors = isset($config['menu_default_color']); + $canResetColors = isset($config['menu_default_color']) || isset($config['menu_default_links_color']); foreach ($config['menu_categories'] as $id => $options) { if (isset($options['default_links_color'])) { $canResetColors = true; @@ -149,7 +149,7 @@ if (isset($_POST['template'])) { if (isset($menus[$id])) { $i = 0; foreach ($menus[$id] as $menu): - $color = (empty($menu['color']) ? ($cat['default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff')) : '#' . $menu['color']); + $color = (empty($menu['color']) ? ($cat['default_links_color'] ?? ($config['menu_default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff'))) : '#' . $menu['color']); ?>
  • diff --git a/system/template.php b/system/template.php index b3647e63..28db3675 100644 --- a/system/template.php +++ b/system/template.php @@ -154,7 +154,7 @@ function get_template_menus(): array }); $configMenuCategories = config('menu_categories'); - $configMenuDefaultColor = config('menu_default_color'); + $configMenuDefaultColor = config('menu_default_links_color') ?? config('menu_default_color'); $menus = []; foreach($result as $menu) { diff --git a/system/templates/admin.menus.js.html.twig b/system/templates/admin.menus.js.html.twig index 134d34c3..dcb4fd33 100644 --- a/system/templates/admin.menus.js.html.twig +++ b/system/templates/admin.menus.js.html.twig @@ -7,8 +7,9 @@ last_id[{{ cat }}] = {{ last_id[cat] }}; {% endfor %} + {% set menuDefaultLinksColor = config('menu_default_links_color') %} {% for cat, options in config('menu_categories') %} - colors[{{ cat }}] = '{{ options['default_links_color'] ?? config('menu_default_color') }}'; + colors[{{ cat }}] = '{{ options['default_links_color'] ?? (menuDefaultLinksColor ?? config('menu_default_color')) }}'; {% endfor %} $(function () { diff --git a/templates/kathrine/config.php b/templates/kathrine/config.php index 16face59..63847317 100644 --- a/templates/kathrine/config.php +++ b/templates/kathrine/config.php @@ -1,5 +1,5 @@ array('id' => 'news', 'name' => 'Latest News'), diff --git a/templates/tibiacom/config.php b/templates/tibiacom/config.php index 8f4e5813..7ed168d9 100644 --- a/templates/tibiacom/config.php +++ b/templates/tibiacom/config.php @@ -1,5 +1,5 @@ array('id' => 'news', 'name' => 'Latest News'),