Browse Source

Theme - Side Menu: Fix sub menu icons.

fusionate 1 year ago
parent
commit
274a5f8095
2 changed files with 23 additions and 2 deletions
  1. 10 1
      resources/classes/menu.php
  2. 13 1
      themes/default/css.php

+ 10 - 1
resources/classes/menu.php

@@ -1150,9 +1150,18 @@ if (!class_exists('menu')) {
 							if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
 								$html .= "	<div id='sub_".$menu_item_main['menu_item_uuid']."' class='menu_side_sub' style='display: none;'>\n";
 								foreach ($menu_item_main['menu_items'] as $menu_index_sub => $menu_item_sub) {
+									$menu_sub_icon = null;
+									if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
+										if (!empty($menu_item_sub['menu_item_icon']) && substr($menu_item_sub['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon
+											$menu_sub_icon = "<span class='".escape($menu_item_sub['menu_item_icon'])."'></span>";
+										}
+										else {
+											$menu_sub_icon = null;
+										}
+									}
 									$html .= "		<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
 									$html .= 			"<span class='menu_side_item_title' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null).">".$menu_item_sub['menu_language_title']."</span>";
-									$html .= 		"</a>\n";
+									$html .= 		$menu_sub_icon."</a>\n";
 								}
 								$html .= "	</div>\n";
 							}

+ 13 - 1
themes/default/css.php

@@ -737,13 +737,25 @@ else { //default: white
 	ul.dropdown-menu li.nav-item > a.nav-link > span.fas,
 	ul.dropdown-menu li.nav-item > a.nav-link > span.fa-solid,
 	ul.dropdown-menu li.nav-item > a.nav-link > span.fa-brands,
-	ul.dropdown-menu li.nav-item > a.nav-link > span.fa-regular  {
+	ul.dropdown-menu li.nav-item > a.nav-link > span.fa-regular,
+	div.menu_side_sub > a.menu_side_item_sub > span.fas,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-solid,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-brands,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-regular {
 		display: inline-block;
 		font-size: 8pt;
 		margin: 0 0 0 8px;
 		opacity: 0.30;
 		}
 
+	div.menu_side_sub > a.menu_side_item_sub > span.fas,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-solid,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-brands,
+	div.menu_side_sub > a.menu_side_item_sub > span.fa-regular {
+		float: right;
+		margin: 4px -1px 0 0;
+		}
+
 	/* header domain/user name */
 	ul.navbar-nav > li.nav-item > a.header_user,
 	ul.navbar-nav > li.nav-item > a.header_domain {