";
echo " | ".$text['label-parent_menu']." | ";
echo " ";
diff --git a/resources/bootstrap/glyphicons.json b/resources/bootstrap/glyphicons.json
new file mode 100644
index 0000000000..91577b3ffd
--- /dev/null
+++ b/resources/bootstrap/glyphicons.json
@@ -0,0 +1,1040 @@
+{
+ "icons":[
+ {
+ "id":"glyphicon-asterisk",
+ "unicode":"2a"
+ },
+ {
+ "id":"glyphicon-plus",
+ "unicode":"2b"
+ },
+ {
+ "id":"glyphicon-eur",
+ "unicode":"20ac"
+ },
+ {
+ "id":"glyphicon-euro",
+ "unicode":"20ac"
+ },
+ {
+ "id":"glyphicon-minus",
+ "unicode":"2212"
+ },
+ {
+ "id":"glyphicon-cloud",
+ "unicode":"2601"
+ },
+ {
+ "id":"glyphicon-envelope",
+ "unicode":"2709"
+ },
+ {
+ "id":"glyphicon-pencil",
+ "unicode":"270f"
+ },
+ {
+ "id":"glyphicon-glass",
+ "unicode":"e001"
+ },
+ {
+ "id":"glyphicon-music",
+ "unicode":"e002"
+ },
+ {
+ "id":"glyphicon-search",
+ "unicode":"e003"
+ },
+ {
+ "id":"glyphicon-heart",
+ "unicode":"e005"
+ },
+ {
+ "id":"glyphicon-star",
+ "unicode":"e006"
+ },
+ {
+ "id":"glyphicon-star-empty",
+ "unicode":"e007"
+ },
+ {
+ "id":"glyphicon-user",
+ "unicode":"e008"
+ },
+ {
+ "id":"glyphicon-film",
+ "unicode":"e009"
+ },
+ {
+ "id":"glyphicon-th-large",
+ "unicode":"e010"
+ },
+ {
+ "id":"glyphicon-th",
+ "unicode":"e011"
+ },
+ {
+ "id":"glyphicon-th-list",
+ "unicode":"e012"
+ },
+ {
+ "id":"glyphicon-ok",
+ "unicode":"e013"
+ },
+ {
+ "id":"glyphicon-remove",
+ "unicode":"e014"
+ },
+ {
+ "id":"glyphicon-zoom-in",
+ "unicode":"e015"
+ },
+ {
+ "id":"glyphicon-zoom-out",
+ "unicode":"e016"
+ },
+ {
+ "id":"glyphicon-off",
+ "unicode":"e017"
+ },
+ {
+ "id":"glyphicon-signal",
+ "unicode":"e018"
+ },
+ {
+ "id":"glyphicon-cog",
+ "unicode":"e019"
+ },
+ {
+ "id":"glyphicon-trash",
+ "unicode":"e020"
+ },
+ {
+ "id":"glyphicon-home",
+ "unicode":"e021"
+ },
+ {
+ "id":"glyphicon-file",
+ "unicode":"e022"
+ },
+ {
+ "id":"glyphicon-time",
+ "unicode":"e023"
+ },
+ {
+ "id":"glyphicon-road",
+ "unicode":"e024"
+ },
+ {
+ "id":"glyphicon-download-alt",
+ "unicode":"e025"
+ },
+ {
+ "id":"glyphicon-download",
+ "unicode":"e026"
+ },
+ {
+ "id":"glyphicon-upload",
+ "unicode":"e027"
+ },
+ {
+ "id":"glyphicon-inbox",
+ "unicode":"e028"
+ },
+ {
+ "id":"glyphicon-play-circle",
+ "unicode":"e029"
+ },
+ {
+ "id":"glyphicon-repeat",
+ "unicode":"e030"
+ },
+ {
+ "id":"glyphicon-refresh",
+ "unicode":"e031"
+ },
+ {
+ "id":"glyphicon-list-alt",
+ "unicode":"e032"
+ },
+ {
+ "id":"glyphicon-lock",
+ "unicode":"e033"
+ },
+ {
+ "id":"glyphicon-flag",
+ "unicode":"e034"
+ },
+ {
+ "id":"glyphicon-headphones",
+ "unicode":"e035"
+ },
+ {
+ "id":"glyphicon-volume-off",
+ "unicode":"e036"
+ },
+ {
+ "id":"glyphicon-volume-down",
+ "unicode":"e037"
+ },
+ {
+ "id":"glyphicon-volume-up",
+ "unicode":"e038"
+ },
+ {
+ "id":"glyphicon-qrcode",
+ "unicode":"e039"
+ },
+ {
+ "id":"glyphicon-barcode",
+ "unicode":"e040"
+ },
+ {
+ "id":"glyphicon-tag",
+ "unicode":"e041"
+ },
+ {
+ "id":"glyphicon-tags",
+ "unicode":"e042"
+ },
+ {
+ "id":"glyphicon-book",
+ "unicode":"e043"
+ },
+ {
+ "id":"glyphicon-bookmark",
+ "unicode":"e044"
+ },
+ {
+ "id":"glyphicon-print",
+ "unicode":"e045"
+ },
+ {
+ "id":"glyphicon-camera",
+ "unicode":"e046"
+ },
+ {
+ "id":"glyphicon-font",
+ "unicode":"e047"
+ },
+ {
+ "id":"glyphicon-bold",
+ "unicode":"e048"
+ },
+ {
+ "id":"glyphicon-italic",
+ "unicode":"e049"
+ },
+ {
+ "id":"glyphicon-text-height",
+ "unicode":"e050"
+ },
+ {
+ "id":"glyphicon-text-width",
+ "unicode":"e051"
+ },
+ {
+ "id":"glyphicon-align-left",
+ "unicode":"e052"
+ },
+ {
+ "id":"glyphicon-align-center",
+ "unicode":"e053"
+ },
+ {
+ "id":"glyphicon-align-right",
+ "unicode":"e054"
+ },
+ {
+ "id":"glyphicon-align-justify",
+ "unicode":"e055"
+ },
+ {
+ "id":"glyphicon-list",
+ "unicode":"e056"
+ },
+ {
+ "id":"glyphicon-indent-left",
+ "unicode":"e057"
+ },
+ {
+ "id":"glyphicon-indent-right",
+ "unicode":"e058"
+ },
+ {
+ "id":"glyphicon-facetime-video",
+ "unicode":"e059"
+ },
+ {
+ "id":"glyphicon-picture",
+ "unicode":"e060"
+ },
+ {
+ "id":"glyphicon-map-marker",
+ "unicode":"e062"
+ },
+ {
+ "id":"glyphicon-adjust",
+ "unicode":"e063"
+ },
+ {
+ "id":"glyphicon-tint",
+ "unicode":"e064"
+ },
+ {
+ "id":"glyphicon-edit",
+ "unicode":"e065"
+ },
+ {
+ "id":"glyphicon-share",
+ "unicode":"e066"
+ },
+ {
+ "id":"glyphicon-check",
+ "unicode":"e067"
+ },
+ {
+ "id":"glyphicon-move",
+ "unicode":"e068"
+ },
+ {
+ "id":"glyphicon-step-backward",
+ "unicode":"e069"
+ },
+ {
+ "id":"glyphicon-fast-backward",
+ "unicode":"e070"
+ },
+ {
+ "id":"glyphicon-backward",
+ "unicode":"e071"
+ },
+ {
+ "id":"glyphicon-play",
+ "unicode":"e072"
+ },
+ {
+ "id":"glyphicon-pause",
+ "unicode":"e073"
+ },
+ {
+ "id":"glyphicon-stop",
+ "unicode":"e074"
+ },
+ {
+ "id":"glyphicon-forward",
+ "unicode":"e075"
+ },
+ {
+ "id":"glyphicon-fast-forward",
+ "unicode":"e076"
+ },
+ {
+ "id":"glyphicon-step-forward",
+ "unicode":"e077"
+ },
+ {
+ "id":"glyphicon-eject",
+ "unicode":"e078"
+ },
+ {
+ "id":"glyphicon-chevron-left",
+ "unicode":"e079"
+ },
+ {
+ "id":"glyphicon-chevron-right",
+ "unicode":"e080"
+ },
+ {
+ "id":"glyphicon-plus-sign",
+ "unicode":"e081"
+ },
+ {
+ "id":"glyphicon-minus-sign",
+ "unicode":"e082"
+ },
+ {
+ "id":"glyphicon-remove-sign",
+ "unicode":"e083"
+ },
+ {
+ "id":"glyphicon-ok-sign",
+ "unicode":"e084"
+ },
+ {
+ "id":"glyphicon-question-sign",
+ "unicode":"e085"
+ },
+ {
+ "id":"glyphicon-info-sign",
+ "unicode":"e086"
+ },
+ {
+ "id":"glyphicon-screenshot",
+ "unicode":"e087"
+ },
+ {
+ "id":"glyphicon-remove-circle",
+ "unicode":"e088"
+ },
+ {
+ "id":"glyphicon-ok-circle",
+ "unicode":"e089"
+ },
+ {
+ "id":"glyphicon-ban-circle",
+ "unicode":"e090"
+ },
+ {
+ "id":"glyphicon-arrow-left",
+ "unicode":"e091"
+ },
+ {
+ "id":"glyphicon-arrow-right",
+ "unicode":"e092"
+ },
+ {
+ "id":"glyphicon-arrow-up",
+ "unicode":"e093"
+ },
+ {
+ "id":"glyphicon-arrow-down",
+ "unicode":"e094"
+ },
+ {
+ "id":"glyphicon-share-alt",
+ "unicode":"e095"
+ },
+ {
+ "id":"glyphicon-resize-full",
+ "unicode":"e096"
+ },
+ {
+ "id":"glyphicon-resize-small",
+ "unicode":"e097"
+ },
+ {
+ "id":"glyphicon-exclamation-sign",
+ "unicode":"e101"
+ },
+ {
+ "id":"glyphicon-gift",
+ "unicode":"e102"
+ },
+ {
+ "id":"glyphicon-leaf",
+ "unicode":"e103"
+ },
+ {
+ "id":"glyphicon-fire",
+ "unicode":"e104"
+ },
+ {
+ "id":"glyphicon-eye-open",
+ "unicode":"e105"
+ },
+ {
+ "id":"glyphicon-eye-close",
+ "unicode":"e106"
+ },
+ {
+ "id":"glyphicon-warning-sign",
+ "unicode":"e107"
+ },
+ {
+ "id":"glyphicon-plane",
+ "unicode":"e108"
+ },
+ {
+ "id":"glyphicon-calendar",
+ "unicode":"e109"
+ },
+ {
+ "id":"glyphicon-random",
+ "unicode":"e110"
+ },
+ {
+ "id":"glyphicon-comment",
+ "unicode":"e111"
+ },
+ {
+ "id":"glyphicon-magnet",
+ "unicode":"e112"
+ },
+ {
+ "id":"glyphicon-chevron-up",
+ "unicode":"e113"
+ },
+ {
+ "id":"glyphicon-chevron-down",
+ "unicode":"e114"
+ },
+ {
+ "id":"glyphicon-retweet",
+ "unicode":"e115"
+ },
+ {
+ "id":"glyphicon-shopping-cart",
+ "unicode":"e116"
+ },
+ {
+ "id":"glyphicon-folder-close",
+ "unicode":"e117"
+ },
+ {
+ "id":"glyphicon-folder-open",
+ "unicode":"e118"
+ },
+ {
+ "id":"glyphicon-resize-vertical",
+ "unicode":"e119"
+ },
+ {
+ "id":"glyphicon-resize-horizontal",
+ "unicode":"e120"
+ },
+ {
+ "id":"glyphicon-hdd",
+ "unicode":"e121"
+ },
+ {
+ "id":"glyphicon-bullhorn",
+ "unicode":"e122"
+ },
+ {
+ "id":"glyphicon-bell",
+ "unicode":"e123"
+ },
+ {
+ "id":"glyphicon-certificate",
+ "unicode":"e124"
+ },
+ {
+ "id":"glyphicon-thumbs-up",
+ "unicode":"e125"
+ },
+ {
+ "id":"glyphicon-thumbs-down",
+ "unicode":"e126"
+ },
+ {
+ "id":"glyphicon-hand-right",
+ "unicode":"e127"
+ },
+ {
+ "id":"glyphicon-hand-left",
+ "unicode":"e128"
+ },
+ {
+ "id":"glyphicon-hand-up",
+ "unicode":"e129"
+ },
+ {
+ "id":"glyphicon-hand-down",
+ "unicode":"e130"
+ },
+ {
+ "id":"glyphicon-circle-arrow-right",
+ "unicode":"e131"
+ },
+ {
+ "id":"glyphicon-circle-arrow-left",
+ "unicode":"e132"
+ },
+ {
+ "id":"glyphicon-circle-arrow-up",
+ "unicode":"e133"
+ },
+ {
+ "id":"glyphicon-circle-arrow-down",
+ "unicode":"e134"
+ },
+ {
+ "id":"glyphicon-globe",
+ "unicode":"e135"
+ },
+ {
+ "id":"glyphicon-wrench",
+ "unicode":"e136"
+ },
+ {
+ "id":"glyphicon-tasks",
+ "unicode":"e137"
+ },
+ {
+ "id":"glyphicon-filter",
+ "unicode":"e138"
+ },
+ {
+ "id":"glyphicon-briefcase",
+ "unicode":"e139"
+ },
+ {
+ "id":"glyphicon-fullscreen",
+ "unicode":"e140"
+ },
+ {
+ "id":"glyphicon-dashboard",
+ "unicode":"e141"
+ },
+ {
+ "id":"glyphicon-paperclip",
+ "unicode":"e142"
+ },
+ {
+ "id":"glyphicon-heart-empty",
+ "unicode":"e143"
+ },
+ {
+ "id":"glyphicon-link",
+ "unicode":"e144"
+ },
+ {
+ "id":"glyphicon-phone",
+ "unicode":"e145"
+ },
+ {
+ "id":"glyphicon-pushpin",
+ "unicode":"e146"
+ },
+ {
+ "id":"glyphicon-usd",
+ "unicode":"e148"
+ },
+ {
+ "id":"glyphicon-gbp",
+ "unicode":"e149"
+ },
+ {
+ "id":"glyphicon-sort",
+ "unicode":"e150"
+ },
+ {
+ "id":"glyphicon-sort-by-alphabet",
+ "unicode":"e151"
+ },
+ {
+ "id":"glyphicon-sort-by-alphabet-alt",
+ "unicode":"e152"
+ },
+ {
+ "id":"glyphicon-sort-by-order",
+ "unicode":"e153"
+ },
+ {
+ "id":"glyphicon-sort-by-order-alt",
+ "unicode":"e154"
+ },
+ {
+ "id":"glyphicon-sort-by-attributes",
+ "unicode":"e155"
+ },
+ {
+ "id":"glyphicon-sort-by-attributes-alt",
+ "unicode":"e156"
+ },
+ {
+ "id":"glyphicon-unchecked",
+ "unicode":"e157"
+ },
+ {
+ "id":"glyphicon-expand",
+ "unicode":"e158"
+ },
+ {
+ "id":"glyphicon-collapse-down",
+ "unicode":"e159"
+ },
+ {
+ "id":"glyphicon-collapse-up",
+ "unicode":"e160"
+ },
+ {
+ "id":"glyphicon-log-in",
+ "unicode":"e161"
+ },
+ {
+ "id":"glyphicon-flash",
+ "unicode":"e162"
+ },
+ {
+ "id":"glyphicon-log-out",
+ "unicode":"e163"
+ },
+ {
+ "id":"glyphicon-new-window",
+ "unicode":"e164"
+ },
+ {
+ "id":"glyphicon-record",
+ "unicode":"e165"
+ },
+ {
+ "id":"glyphicon-save",
+ "unicode":"e166"
+ },
+ {
+ "id":"glyphicon-open",
+ "unicode":"e167"
+ },
+ {
+ "id":"glyphicon-saved",
+ "unicode":"e168"
+ },
+ {
+ "id":"glyphicon-import",
+ "unicode":"e169"
+ },
+ {
+ "id":"glyphicon-export",
+ "unicode":"e170"
+ },
+ {
+ "id":"glyphicon-send",
+ "unicode":"e171"
+ },
+ {
+ "id":"glyphicon-floppy-disk",
+ "unicode":"e172"
+ },
+ {
+ "id":"glyphicon-floppy-saved",
+ "unicode":"e173"
+ },
+ {
+ "id":"glyphicon-floppy-remove",
+ "unicode":"e174"
+ },
+ {
+ "id":"glyphicon-floppy-save",
+ "unicode":"e175"
+ },
+ {
+ "id":"glyphicon-floppy-open",
+ "unicode":"e176"
+ },
+ {
+ "id":"glyphicon-credit-card",
+ "unicode":"e177"
+ },
+ {
+ "id":"glyphicon-transfer",
+ "unicode":"e178"
+ },
+ {
+ "id":"glyphicon-cutlery",
+ "unicode":"e179"
+ },
+ {
+ "id":"glyphicon-header",
+ "unicode":"e180"
+ },
+ {
+ "id":"glyphicon-compressed",
+ "unicode":"e181"
+ },
+ {
+ "id":"glyphicon-earphone",
+ "unicode":"e182"
+ },
+ {
+ "id":"glyphicon-phone-alt",
+ "unicode":"e183"
+ },
+ {
+ "id":"glyphicon-tower",
+ "unicode":"e184"
+ },
+ {
+ "id":"glyphicon-stats",
+ "unicode":"e185"
+ },
+ {
+ "id":"glyphicon-sd-video",
+ "unicode":"e186"
+ },
+ {
+ "id":"glyphicon-hd-video",
+ "unicode":"e187"
+ },
+ {
+ "id":"glyphicon-subtitles",
+ "unicode":"e188"
+ },
+ {
+ "id":"glyphicon-sound-stereo",
+ "unicode":"e189"
+ },
+ {
+ "id":"glyphicon-sound-dolby",
+ "unicode":"e190"
+ },
+ {
+ "id":"glyphicon-sound-5-1",
+ "unicode":"e191"
+ },
+ {
+ "id":"glyphicon-sound-6-1",
+ "unicode":"e192"
+ },
+ {
+ "id":"glyphicon-sound-7-1",
+ "unicode":"e193"
+ },
+ {
+ "id":"glyphicon-copyright-mark",
+ "unicode":"e194"
+ },
+ {
+ "id":"glyphicon-registration-mark",
+ "unicode":"e195"
+ },
+ {
+ "id":"glyphicon-cloud-download",
+ "unicode":"e197"
+ },
+ {
+ "id":"glyphicon-cloud-upload",
+ "unicode":"e198"
+ },
+ {
+ "id":"glyphicon-tree-conifer",
+ "unicode":"e199"
+ },
+ {
+ "id":"glyphicon-tree-deciduous",
+ "unicode":"e200"
+ },
+ {
+ "id":"glyphicon-cd",
+ "unicode":"e201"
+ },
+ {
+ "id":"glyphicon-save-file",
+ "unicode":"e202"
+ },
+ {
+ "id":"glyphicon-open-file",
+ "unicode":"e203"
+ },
+ {
+ "id":"glyphicon-level-up",
+ "unicode":"e204"
+ },
+ {
+ "id":"glyphicon-copy",
+ "unicode":"e205"
+ },
+ {
+ "id":"glyphicon-paste",
+ "unicode":"e206"
+ },
+ {
+ "id":"glyphicon-alert",
+ "unicode":"e209"
+ },
+ {
+ "id":"glyphicon-equalizer",
+ "unicode":"e210"
+ },
+ {
+ "id":"glyphicon-king",
+ "unicode":"e211"
+ },
+ {
+ "id":"glyphicon-queen",
+ "unicode":"e212"
+ },
+ {
+ "id":"glyphicon-pawn",
+ "unicode":"e213"
+ },
+ {
+ "id":"glyphicon-bishop",
+ "unicode":"e214"
+ },
+ {
+ "id":"glyphicon-knight",
+ "unicode":"e215"
+ },
+ {
+ "id":"glyphicon-baby-formula",
+ "unicode":"e216"
+ },
+ {
+ "id":"glyphicon-tent",
+ "unicode":"26fa"
+ },
+ {
+ "id":"glyphicon-blackboard",
+ "unicode":"e218"
+ },
+ {
+ "id":"glyphicon-bed",
+ "unicode":"e219"
+ },
+ {
+ "id":"glyphicon-apple",
+ "unicode":"f8ff"
+ },
+ {
+ "id":"glyphicon-erase",
+ "unicode":"e221"
+ },
+ {
+ "id":"glyphicon-hourglass",
+ "unicode":"231b"
+ },
+ {
+ "id":"glyphicon-lamp",
+ "unicode":"e223"
+ },
+ {
+ "id":"glyphicon-duplicate",
+ "unicode":"e224"
+ },
+ {
+ "id":"glyphicon-piggy-bank",
+ "unicode":"e225"
+ },
+ {
+ "id":"glyphicon-scissors",
+ "unicode":"e226"
+ },
+ {
+ "id":"glyphicon-bitcoin",
+ "unicode":"e227"
+ },
+ {
+ "id":"glyphicon-yen",
+ "unicode":"00a5"
+ },
+ {
+ "id":"glyphicon-ruble",
+ "unicode":"20bd"
+ },
+ {
+ "id":"glyphicon-scale",
+ "unicode":"e230"
+ },
+ {
+ "id":"glyphicon-ice-lolly",
+ "unicode":"e231"
+ },
+ {
+ "id":"glyphicon-ice-lolly-tasted",
+ "unicode":"e232"
+ },
+ {
+ "id":"glyphicon-education",
+ "unicode":"e233"
+ },
+ {
+ "id":"glyphicon-option-horizontal",
+ "unicode":"e234"
+ },
+ {
+ "id":"glyphicon-option-vertical",
+ "unicode":"e235"
+ },
+ {
+ "id":"glyphicon-menu-hamburger",
+ "unicode":"e236"
+ },
+ {
+ "id":"glyphicon-modal-window",
+ "unicode":"e237"
+ },
+ {
+ "id":"glyphicon-oil",
+ "unicode":"e238"
+ },
+ {
+ "id":"glyphicon-grain",
+ "unicode":"e239"
+ },
+ {
+ "id":"glyphicon-sunglasses",
+ "unicode":"e240"
+ },
+ {
+ "id":"glyphicon-text-size",
+ "unicode":"e241"
+ },
+ {
+ "id":"glyphicon-text-color",
+ "unicode":"e242"
+ },
+ {
+ "id":"glyphicon-text-background",
+ "unicode":"e243"
+ },
+ {
+ "id":"glyphicon-object-align-top",
+ "unicode":"e244"
+ },
+ {
+ "id":"glyphicon-object-align-bottom",
+ "unicode":"e245"
+ },
+ {
+ "id":"glyphicon-object-align-horizontal",
+ "unicode":"e246"
+ },
+ {
+ "id":"glyphicon-object-align-left",
+ "unicode":"e247"
+ },
+ {
+ "id":"glyphicon-object-align-vertical",
+ "unicode":"e248"
+ },
+ {
+ "id":"glyphicon-object-align-right",
+ "unicode":"e249"
+ },
+ {
+ "id":"glyphicon-triangle-right",
+ "unicode":"e250"
+ },
+ {
+ "id":"glyphicon-triangle-left",
+ "unicode":"e251"
+ },
+ {
+ "id":"glyphicon-triangle-bottom",
+ "unicode":"e252"
+ },
+ {
+ "id":"glyphicon-triangle-top",
+ "unicode":"e253"
+ },
+ {
+ "id":"glyphicon-console",
+ "unicode":"e254"
+ },
+ {
+ "id":"glyphicon-superscript",
+ "unicode":"e255"
+ },
+ {
+ "id":"glyphicon-subscript",
+ "unicode":"e256"
+ },
+ {
+ "id":"glyphicon-menu-left",
+ "unicode":"e257"
+ },
+ {
+ "id":"glyphicon-menu-right",
+ "unicode":"e258"
+ },
+ {
+ "id":"glyphicon-menu-down",
+ "unicode":"e259"
+ },
+ {
+ "id":"glyphicon-menu-up",
+ "unicode":"e260"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 73f219d05d..39cdffb21f 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -99,6 +99,7 @@ if (!class_exists('menu')) {
$menu_item_uuid = $menu['uuid'];
$menu_item_parent_uuid = $menu['parent_uuid'];
$menu_item_category = $menu['category'];
+ $menu_item_icon = $menu['icon'];
$menu_item_path = $menu['path'];
$menu_item_order = $menu['order'];
$menu_item_description = $menu['desc'];
@@ -120,6 +121,7 @@ if (!class_exists('menu')) {
$sql .= "menu_item_title, ";
$sql .= "menu_item_link, ";
$sql .= "menu_item_category, ";
+ $sql .= "menu_item_icon, ";
if (strlen($menu_item_order) > 0) {
$sql .= "menu_item_order, ";
}
@@ -135,6 +137,7 @@ if (!class_exists('menu')) {
$sql .= "'".check_str($menu_item_title)."', ";
$sql .= "'$menu_item_path', ";
$sql .= "'$menu_item_category', ";
+ $sql .= "'$menu_item_icon', ";
if (strlen($menu_item_order) > 0) {
$sql .= "'$menu_item_order', ";
}
@@ -404,7 +407,7 @@ if (!class_exists('menu')) {
//get the menu from the database
if (strlen($sql) == 0) { //default sql for base of the menu
- $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_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_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 = '".$_SESSION['domain']['language']['code']."' ";
@@ -475,7 +478,7 @@ if (!class_exists('menu')) {
$menu_item_level = $menu_item_level+1;
//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_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_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 = '".$_SESSION['domain']['language']['code']."' ";
@@ -513,6 +516,7 @@ if (!class_exists('menu')) {
//set the variables
$menu_item_link = $row['menu_item_link'];
$menu_item_category = $row['menu_item_category'];
+ $menu_item_icon = $row['menu_item_icon'];
$menu_item_uuid = $row['menu_item_uuid'];
$menu_item_parent_uuid = $row['menu_item_parent_uuid'];
diff --git a/themes/default/template.php b/themes/default/template.php
index dab74dcaa5..12666f7d58 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -2048,17 +2048,13 @@
}
$mod_a_2 = ($menu_parent['menu_item_link'] != '') ? $menu_parent['menu_item_link'] : '#';
$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
- if ($_SESSION['theme']['menu_main_icons']['boolean'] == 'true' || $_SESSION['theme']['menu_main_icons']['boolean'] == '') {
- switch ($menu_parent['menu_item_title']) {
- case "Home": $glyph = 'home'; break;
- case "Accounts": $glyph = 'user'; break;
- case "Dialplan": $glyph = 'transfer'; break;
- case "Apps": $glyph = 'send'; break;
- case "Status": $glyph = 'equalizer'; break;
- case "Advanced": $glyph = 'cog'; break;
- default: $glyph = null;
+ if ($_SESSION['theme']['menu_main_icons']['boolean'] != 'false') {
+ if ($menu_parent['menu_item_icon'] != '' && substr_count($menu_parent['menu_item_icon'], 'glyphicon-') > 0) {
+ $menu_main_icon = "";
+ }
+ else {
+ unset($menu_main_icon);
}
- $menu_main_icon = ($glyph != '') ? "" : null;
$menu_main_item = "".$menu_parent['menu_language_title']."";
}
else {
@@ -2079,14 +2075,15 @@
$mod_a_2 = PROJECT_PATH . $mod_a_2;
}
$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
- if ($_SESSION['theme']['menu_sub_icons']['boolean'] == 'true') {
- $mod_nw = ($menu_sub['menu_item_category'] == 'external') ? "" : null;
- switch ($menu_sub['menu_item_title']) {
- case 'Logout': $mod_icon = ""; break;
- default: $mod_icon = null;
+ if ($_SESSION['theme']['menu_sub_icons']['boolean'] != 'false') {
+ if ($menu_sub['menu_item_icon'] != '' && substr_count($menu_sub['menu_item_icon'], 'glyphicon-') > 0) {
+ $menu_sub_icon = "";
+ }
+ else {
+ unset($menu_sub_icon);
}
}
- echo "".(($_SESSION['theme']['menu_sub_icons']) ? "" : null).$menu_sub['menu_language_title'].$mod_icon.$mod_nw."\n";
+ echo "".(($_SESSION['theme']['menu_sub_icons']) ? "" : null).$menu_sub['menu_language_title'].$menu_sub_icon."\n";
}
echo "\n";
}
|