Merge branch '0.9' into develop

slawkens · Jul 21, 2023 · 712ca30 · 712ca30
2 parents 707aea1 + 5fa4890
commit 712ca30
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/admin/pages/menus.php b/admin/pages/menus.php
@@ -46,6 +46,7 @@
 		if ($cache->enabled()) {
 			$cache->delete('template_menus');
 		}
+
 		success('Saved at ' . date('H:i'));
 	}
 
@@ -56,6 +57,7 @@
 		echo 'Cannot find template config.php file.';
 		return;
 	}
+
 	if (!isset($config['menu_categories'])) {
 		echo "No menu categories set in template config.php.<br/>This template doesn't support dynamic menus.";
 		return;
@@ -75,6 +77,7 @@
 	$menus_db = $db->query('SELECT `name`, `link`, `blank`, `color`, `category`, `ordering` FROM `' . TABLE_PREFIX . 'menu` WHERE `enabled` = 1 AND `template` = ' . $db->quote($template) . ' ORDER BY `ordering` ASC;')->fetchAll();
 	foreach ($menus_db as $menu) {
 		$menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link'], 'blank' => $menu['blank'], 'color' => $menu['color'], 'ordering' => $menu['ordering']);
+		var_dump($menu['color']);
 	}
 	$last_id = array();
 	?>
@@ -91,15 +94,16 @@
 							<ul class="sortable" id="sortable-<?php echo $id ?>">
 								<?php
 								if (isset($menus[$id])) {
-									foreach ($menus[$id] as $i => $menu):
+									$i = 0;
+									foreach ($menus[$id] as $menu):
 										?>
 										<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'] ?>"/>
 											<input type="hidden" name="menu_blank[<?php echo $id ?>][]" value="0"/>
 											<label><input class="blank-checkbox" type="checkbox" <?php echo($menu['blank'] == 1 ? 'checked' : '') ?>/><span title="Open in New Window">New Window</span></label>
-											<input class="color-picker" type="text" name="menu_color[<?php echo $id ?>][]" value="#<?php echo $menu['color'] ?>"/>
+											<input class="color-picker" type="text" name="menu_color[<?php echo $id ?>][]" value="<?php echo (empty($menu['color']) ? ($config['menu_default_color'] ?? '#ffffff') : $menu['color']); ?>"/>
 											<a class="remove-button" id="remove-button-<?php echo $id ?>-<?php echo $i ?>"><i class="fas fa-trash"></a></i></li>
-										<?php $last_id[$id] = $i;
+										<?php $i++; $last_id[$id] = $i;
 									endforeach;
 								} ?>
 							</ul>
@@ -120,7 +124,8 @@
 	<?php
 	$twig->display('admin.menus.js.html.twig', array(
 		'menus' => $menus,
-		'last_id' => $last_id
+		'last_id' => $last_id,
+		'menu_default_color' => $config['menu_default_color'] ?? '#ffffff'
 	));
 	?>
 	<?php

diff --git a/system/templates/admin.menus.js.html.twig b/system/templates/admin.menus.js.html.twig
@@ -18,7 +18,7 @@
 			var cat = $(this).attr("id").replace('add-button-', '');
 			var id = last_id[cat];
 			last_id[cat]++;
-			$('#sortable-' + cat).append('<li class="ui-state-default" id="list-' + cat + '-' + id + '"><label>Name:</label> <input type="text" name="menu[' + cat + '][]" value=""/> <label>Link:</label> <input type="text" name="menu_link[' + cat + '][]" value=""/><input type="hidden" name="menu_blank[' + cat + '][]" value="0" /> <label><input class="blank-checkbox" type="checkbox"/><span title="Open in New Window">New Window</span></label> <input class="color-picker" type="text" name="menu_color[' + cat + '][]" value="#ffffff" /><a class="remove-button" id="remove-button-' + cat + '-' + id + '"><i class="fas fa-trash"></i></a></li>'); //add input bo
+			$('#sortable-' + cat).append('<li class="ui-state-default" id="list-' + cat + '-' + id + '"><label>Name:</label> <input type="text" name="menu[' + cat + '][]" value=""/> <label>Link:</label> <input type="text" name="menu_link[' + cat + '][]" value=""/><input type="hidden" name="menu_blank[' + cat + '][]" value="0" /> <label><input class="blank-checkbox" type="checkbox"/><span title="Open in New Window">New Window</span></label> <input class="color-picker" type="text" name="menu_color[' + cat + '][]" value="{{ menu_default_color }}" /><a class="remove-button" id="remove-button-' + cat + '-' + id + '"><i class="fas fa-trash"></i></a></li>'); //add input bo
 			$('#remove-button-' + cat + '-' + id).click(function () {
 				$('#list-' + $(this).attr("id").replace('remove-button-', '')).remove();
 			});
@@ -69,4 +69,4 @@
 			]
 		});
 	}
-</script>
+</script>
diff --git a/templates/kathrine/config.php b/templates/kathrine/config.php
@@ -1,8 +1,10 @@
 <?php
+$config['menu_default_color'] = '#ffffff';
+
 $config['menu_categories'] = array(
 	MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),
 	MENU_CATEGORY_ACCOUNT => array('id' => 'account', 'name' => 'Account'),
 	MENU_CATEGORY_COMMUNITY => array('id' => 'community', 'name' => 'Community'),
 	MENU_CATEGORY_LIBRARY => array('id' => 'library', 'name' => 'Library'),
 	MENU_CATEGORY_SHOP => array('id' => 'shops', 'name' => 'Shop')
-);
+);
diff --git a/templates/tibiacom/config.php b/templates/tibiacom/config.php
@@ -1,4 +1,6 @@
 <?php
+$config['menu_default_color'] = '#ffffff';
+
 $config['menu_categories'] = array(
 	MENU_CATEGORY_NEWS => array('id' => 'news', 'name' => 'Latest News'),
 	MENU_CATEGORY_ACCOUNT => array('id' => 'account', 'name' => 'Account'),