blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

- NavigationWidget header menu dropdown fixed

Browse Source 
- NavigationWidget optimizations
This commit is contained in:
Paolo
2018-07-11 11:57:17 +02:00
parent bfaf4e774b
commit 095ce57da4
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/widgets/navigationHeader.php
+1 -9
View File
@@ -1,11 +1,3 @@
<div class="navbar-header"> <div class="navbar-header">
<span> <span id="header-menu" class="menu-header-items"></span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Men&uuml; umschalten </span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</span>
<span class="menu-header-items"></span>
</div> </div>
public/css/NavigationWidget.css
+12 -9
View File
@@ -34,20 +34,23 @@
text-decoration: underline; text-decoration: underline;
} }
.navbar-brand { .navbar-header {
float: left;
height: 50px;
padding-top: 15px; padding-top: 15px;
padding-right: 20px; height: 50px;
padding-left: 7px;
font-size: 18px;
} }
.navbar-brand-icon { .navbar-brand-icon {
float: left;
height: 50px; height: 50px;
padding-top: 15px; top: 0px;
padding-left: 7px;
font-size: 16px; font-size: 16px;
margin-right: 3px; margin-right: 3px;
} }
.header-menu-link-entry {
padding-right: 23px;
padding-top: 15px;
font-size: 18px;
color: #5e5e5e !important;
background-color: transparent;
text-decoration: none !important;
}
public/js/NavigationWidget.js
+28 -19
View File
@@ -38,7 +38,7 @@ var FHC_NavigationWidget = {
if (e != null) strHeaderMenu += FHC_NavigationWidget._buildHeaderMenuStructure(e); if (e != null) strHeaderMenu += FHC_NavigationWidget._buildHeaderMenuStructure(e);
}); });
$(".menu-header-items").html(strHeaderMenu); $("#header-menu").html(strHeaderMenu);
} }
} }
} }
@@ -142,24 +142,26 @@ var FHC_NavigationWidget = {
var strHeaderMenu = ""; var strHeaderMenu = "";
if (item["icon"] != "undefined" && item["icon"] != "") var icon = "";
if (item["icon"] != null && item["icon"] != "")
{ {
strHeaderMenu += '<i class="navbar-brand-icon fa fa-' + item["icon"] + ' fa-fw"></i>'; icon = '<i class="navbar-brand-icon fa fa-' + item["icon"] + ' fa-fw"></i>';
}
if (item["children"] != null && Object.keys(item["children"]).length > 0)
{
strHeaderMenu += '<span><a class="navbar-brand" data-toggle="dropdown" href="#" aria-expanded="false">';
} }
var target = ""; var target = "";
if (item["target"] != null) target = item["target"]; if (item["target"] != null) target = item["target"];
strHeaderMenu += '<span class="dropdown">';
if (item["children"] != null && Object.keys(item["children"]).length > 0) if (item["children"] != null && Object.keys(item["children"]).length > 0)
{ {
strHeaderMenu += '<a class="dropdown-toggle header-menu-link-entry" data-toggle="dropdown" href="#">';
strHeaderMenu += icon;
strHeaderMenu += item["description"] + " "; strHeaderMenu += item["description"] + " ";
strHeaderMenu += '<i class="fa fa-caret-down"></i></a>'; strHeaderMenu += '<i class="fa fa-caret-down"></i>';
strHeaderMenu += '<ul class="dropdown-menu dropdown-user">'; strHeaderMenu += '</a>';
strHeaderMenu += '<ul class="dropdown-menu">';
jQuery.each(item["children"], function(i, e) { jQuery.each(item["children"], function(i, e) {
if (e != null) if (e != null)
@@ -167,23 +169,30 @@ var FHC_NavigationWidget = {
var eTarget = ""; var eTarget = "";
if (e["target"] != null) eTarget = e["target"]; if (e["target"] != null) eTarget = e["target"];
strHeaderMenu += '<li><a href="' + e["link"] + '" target="' + eTarget + '">'; var eIcon = "";
if (e["icon"] != null && e["icon"] != "") eIcon += '<i class="fa fa-' + e["icon"] + ' fa-fw"></i>';
if (e["icon"] != "undefined" && e["icon"] != "") strHeaderMenu += '<li>';
{ strHeaderMenu += '<a href="' + e["link"] + '" target="' + eTarget + '">';
strHeaderMenu += '<i class="fa fa-' + e["icon"] + ' fa-fw"></i>'; strHeaderMenu += eIcon;
} strHeaderMenu += e["description"];
strHeaderMenu += '</a>';
strHeaderMenu += e["description"] + '</a></li>'; strHeaderMenu += '</li>';
} }
}); });
strHeaderMenu += '</ul></span>';
strHeaderMenu += '</ul>';
} }
else else
{ {
strHeaderMenu += '<a class="navbar-brand" href="' + item["link"] + '" target="' + target + '">' + item["description"] + '</a>'; strHeaderMenu += '<a class="header-menu-link-entry" href="' + item["link"] + '" target="' + target + '">' +
icon +
item["description"] +
'</a>';
} }
strHeaderMenu += '</span>';
return strHeaderMenu; return strHeaderMenu;
}, },