diff --git a/core/menu/app_config.php b/core/menu/app_config.php index df80515875..bf46c8ab0c 100644 --- a/core/menu/app_config.php +++ b/core/menu/app_config.php @@ -184,6 +184,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_icon_color"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_category"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = "true"; diff --git a/core/menu/app_languages.php b/core/menu/app_languages.php index 723f57d730..35cd87c29e 100644 --- a/core/menu/app_languages.php +++ b/core/menu/app_languages.php @@ -540,6 +540,33 @@ $text['label-icon']['zh-cn'] = "图标"; $text['label-icon']['ja-jp'] = "アイコン"; $text['label-icon']['ko-kr'] = "아이콘"; +$text['label-icon_color']['en-us'] = "Icon Color"; +$text['label-icon_color']['en-gb'] = "Icon Color"; +$text['label-icon_color']['ar-eg'] = "لون الأيقونة"; +$text['label-icon_color']['de-at'] = "Symbolfarbe"; +$text['label-icon_color']['de-ch'] = "Symbolfarbe"; +$text['label-icon_color']['de-de'] = "Symbolfarbe"; +$text['label-icon_color']['el-gr'] = "Χρώμα εικονιδίου"; +$text['label-icon_color']['es-cl'] = "Color del icono"; +$text['label-icon_color']['es-mx'] = "Color del icono"; +$text['label-icon_color']['fr-ca'] = "Couleur de l'icône"; +$text['label-icon_color']['fr-fr'] = "Couleur de l'icône"; +$text['label-icon_color']['he-il'] = "צבע סמל"; +$text['label-icon_color']['it-it'] = "Colore dell'icona"; +$text['label-icon_color']['ka-ge'] = "ხატულა ფერი"; +$text['label-icon_color']['nl-nl'] = "Icoon Kleur"; +$text['label-icon_color']['pl-pl'] = "Kolor ikony"; +$text['label-icon_color']['pt-br'] = "Cor do ícone"; +$text['label-icon_color']['pt-pt'] = "Cor do ícone"; +$text['label-icon_color']['ro-ro'] = "Culoarea pictogramei"; +$text['label-icon_color']['ru-ru'] = "Цвет значка"; +$text['label-icon_color']['sv-se'] = "Ikon färg"; +$text['label-icon_color']['uk-ua'] = "Колір значка"; +$text['label-icon_color']['tr-tr'] = "Simge Rengi"; +$text['label-icon_color']['zh-cn'] = "图标颜色"; +$text['label-icon_color']['ja-jp'] = "アイコンの色"; +$text['label-icon_color']['ko-kr'] = "아이콘 색상"; + $text['label-groups']['en-us'] = "Groups"; $text['label-groups']['en-gb'] = "Groups"; $text['label-groups']['ar-eg'] = "المجموعات"; diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index dba0d09a89..a5e24a849e 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -51,6 +51,7 @@ $menu_item_link = ''; $menu_item_category = ''; $menu_item_icon = ''; + $menu_item_icon_color = ''; $menu_item_description = ''; $menu_item_protected = ''; $menu_item_parent_uuid = null; @@ -102,6 +103,7 @@ $menu_item_link = $_POST["menu_item_link"] ?? ''; $menu_item_category = $_POST["menu_item_category"] ?? ''; $menu_item_icon = $_POST["menu_item_icon"] ?? ''; + $menu_item_icon_color = $_POST["menu_item_icon_color"] ?? ''; $menu_item_description = $_POST["menu_item_description"] ?? ''; $menu_item_protected = $_POST["menu_item_protected"] ?? ''; $menu_item_parent_uuid = $_POST["menu_item_parent_uuid"] ?? null; @@ -173,6 +175,7 @@ $array['menu_items'][0]['menu_item_link'] = $menu_item_link; $array['menu_items'][0]['menu_item_category'] = $menu_item_category; $array['menu_items'][0]['menu_item_icon'] = $menu_item_icon; + $array['menu_items'][0]['menu_item_icon_color'] = $menu_item_icon_color; $array['menu_items'][0]['menu_item_description'] = $menu_item_description; $array['menu_items'][0]['menu_item_protected'] = $menu_item_protected; $array['menu_items'][0]['menu_item_uuid'] = $menu_item_uuid; @@ -198,6 +201,7 @@ $array['menu_items'][0]['menu_item_link'] = $menu_item_link; $array['menu_items'][0]['menu_item_category'] = $menu_item_category; $array['menu_items'][0]['menu_item_icon'] = $menu_item_icon; + $array['menu_items'][0]['menu_item_icon_color'] = $menu_item_icon_color; $array['menu_items'][0]['menu_item_description'] = $menu_item_description; $array['menu_items'][0]['menu_item_protected'] = $menu_item_protected; $array['menu_items'][0]['menu_item_uuid'] = $menu_item_uuid; @@ -313,6 +317,7 @@ $menu_item_link = $row["menu_item_link"]; $menu_item_category = $row["menu_item_category"]; $menu_item_icon = $row["menu_item_icon"]; + $menu_item_icon_color = $row["menu_item_icon_color"]; $menu_item_description = $row["menu_item_description"]; $menu_item_protected = $row["menu_item_protected"]; $menu_item_parent_uuid = $row["menu_item_parent_uuid"]; @@ -430,7 +435,7 @@ echo "
| \n"; - echo " | "; echo "|
| ".$text['label-icon_color']." | "; + echo ""; + echo " |
| ".$text['label-parent_menu']." | "; echo ""; diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index 282fe7e9bf..9da3c1c654 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -104,6 +104,7 @@ $menu_item_title = $row2['menu_item_title']; $menu_item_link = $row2['menu_item_link']; $menu_item_icon = $row2['menu_item_icon']; + $menu_item_icon_color = $row2['menu_item_icon_color']; //get the groups that have been assigned to the menu $sql = "select "; @@ -149,7 +150,7 @@ } //format icon - $menu_item_icon = !empty($menu_item_icon) ? "" : null; + $menu_item_icon = !empty($menu_item_icon) ? "" : null; //display the content of the list if (permission_exists('menu_item_edit')) { @@ -291,6 +292,7 @@ $menu_item_title = $row['menu_item_title']; $menu_item_link = $row['menu_item_link']; $menu_item_icon = $row['menu_item_icon']; + $menu_item_icon_color = $row['menu_item_icon_color']; $menu_item_protected = $row['menu_item_protected']; //get the groups that have been assigned to the menu @@ -336,7 +338,7 @@ } //format icon - $menu_item_icon = !empty($menu_item_icon) ? "" : null; + $menu_item_icon = !empty($menu_item_icon) ? "" : null; //display the content of the list if (permission_exists('menu_item_edit')) { @@ -437,4 +439,4 @@ echo "\n"; -?> +?> \ No newline at end of file diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 86c8b8983c..9df1c94320 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -427,6 +427,7 @@ if (!class_exists('menu')) { $menu_item_parent_uuid = $uuid_array[$menu['parent_uuid']] ?? null; $menu_item_category = $menu['category']; $menu_item_icon = $menu['icon'] ?? null; + $menu_item_icon_color = $menu['icon_color'] ?? null; $menu_item_path = $menu['path']; $menu_item_order = $menu['order'] ?? null; $menu_item_description = $menu['desc'] ?? null; @@ -471,6 +472,7 @@ if (!class_exists('menu')) { $array['menu_items'][$x]['menu_item_link'] = $menu_item_path; $array['menu_items'][$x]['menu_item_category'] = $menu_item_category; $array['menu_items'][$x]['menu_item_icon'] = $menu_item_icon; + $array['menu_items'][$x]['menu_item_icon_color'] = $menu_item_icon_color; if (!empty($menu_item_order)) { $array['menu_items'][$x]['menu_item_order'] = $menu_item_order; } @@ -745,7 +747,7 @@ if (!class_exists('menu')) { //get the menu from the database $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, "; $sql .= "i.menu_item_title, i.menu_item_protected, i.menu_item_category, "; - $sql .= "i.menu_item_icon, i.menu_item_uuid, i.menu_item_parent_uuid "; + $sql .= "i.menu_item_icon, i.menu_item_icon_color, i.menu_item_uuid, i.menu_item_parent_uuid "; $sql .= "from v_menu_items as i, v_menu_languages as l "; $sql .= "where i.menu_item_uuid = l.menu_item_uuid "; $sql .= "and l.menu_language = :menu_language "; @@ -814,7 +816,7 @@ if (!class_exists('menu')) { } //get the child menu from the database - $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, i.menu_item_title, i.menu_item_protected, i.menu_item_category, i.menu_item_icon, i.menu_item_uuid, i.menu_item_parent_uuid "; + $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, i.menu_item_title, i.menu_item_protected, i.menu_item_category, i.menu_item_icon, i.menu_item_icon_color, i.menu_item_uuid, i.menu_item_parent_uuid "; $sql .= "from v_menu_items as i, v_menu_languages as l "; $sql .= "where i.menu_item_uuid = l.menu_item_uuid "; $sql .= "and l.menu_language = :menu_language "; @@ -854,6 +856,7 @@ if (!class_exists('menu')) { $menu_item_link = $row['menu_item_link']; $menu_item_category = $row['menu_item_category']; $menu_item_icon = $row['menu_item_icon']; + $menu_item_icon_color = $row['menu_item_icon_color']; $menu_item_uuid = $row['menu_item_uuid']; $menu_item_parent_uuid = $row['menu_item_parent_uuid']; @@ -1010,7 +1013,7 @@ if (!class_exists('menu')) { $mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null; if ($this->settings->get('theme', 'menu_main_icons', true) === true) { if (!empty($menu_parent['menu_item_icon']) && substr($menu_parent['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon - $menu_main_icon = ""; + $menu_main_icon = ""; } else { $menu_main_icon = null; @@ -1043,7 +1046,7 @@ if (!class_exists('menu')) { $menu_sub_icon = null; if ($this->settings->get('theme', 'menu_sub_icons', true) !== false) { if (!empty($menu_sub['menu_item_icon']) && substr($menu_sub['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon - $menu_sub_icon = ""; + $menu_sub_icon = ""; } else { $menu_sub_icon = null; @@ -1211,7 +1214,7 @@ if (!class_exists('menu')) { $html .= " \n"; } if (!empty($menu_item_main['menu_item_icon']) && substr($menu_item_main['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon - $html .= ""; + $html .= ""; } $html .= ""; $html .= "\n"; @@ -1222,7 +1225,7 @@ if (!class_exists('menu')) { $menu_sub_icon = null; if ($this->settings->get('theme', 'menu_sub_icons', true) !== 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 = ""; + $menu_sub_icon = ""; } else { $menu_sub_icon = null; diff --git a/resources/fontawesome/fa_icons.php b/resources/fontawesome/fa_icons.php index 9b2e128fed..558cea25d0 100644 --- a/resources/fontawesome/fa_icons.php +++ b/resources/fontawesome/fa_icons.php @@ -113,6 +113,6 @@ if ( !empty($font_awesome_icons) && is_array($font_awesome_icons) ) { foreach ($font_awesome_icons as $icon) { - echo "\n"; + echo "\n"; } } \ No newline at end of file diff --git a/themes/default/css.php b/themes/default/css.php index b2d13c6882..746d7a87f4 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -772,7 +772,6 @@ else { //default: white 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, |