Unification of the variable menu_default_links_color

This commit is contained in:
slawkens 2025-02-09 01:02:14 +01:00
parent f97f8cbe87
commit f646856e20
5 changed files with 8 additions and 7 deletions

View File

@ -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']);
?>
<li class="ui-state-default" id="list-<?php echo $id ?>-<?php echo $i ?>"><label>Name:</label> <input type="text" name="menu[<?php echo $id ?>][]" value="<?php echo escapeHtml($menu['name']); ?>"/>
<label>Link:</label> <input type="text" name="menu_link[<?php echo $id ?>][]" value="<?php echo $menu['link'] ?>"/>

View File

@ -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) {

View File

@ -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 () {

View File

@ -1,5 +1,5 @@
<?php
$config['menu_default_color'] = '#ffffff';
$config['menu_default_links_color'] = '#ffffff';
$config['menu_categories'] = array(
MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),

View File

@ -1,5 +1,5 @@
<?php
$config['menu_default_color'] = '#ffffff';
$config['menu_default_links_color'] = '#ffffff';
$config['menu_categories'] = array(
MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),