mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-16 22:42:16 +00:00
- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter
- Added method deleteCustomFilter to model Filters_model - Changed parameter filterId to filter_id in FilterWidget, infocenterData - Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item - Changed NavigationMenuWidget to allow two links in one menu item
This commit is contained in:
@@ -7,7 +7,7 @@ class NavigationMenuWidget extends Widget
|
||||
{
|
||||
private $navigationMenu;
|
||||
|
||||
private static $NavigationMenuWidgetInstance;
|
||||
private static $navigationMenuWidgetInstance;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -16,7 +16,7 @@ class NavigationMenuWidget extends Widget
|
||||
{
|
||||
$this->navigationMenu = $widgetData;
|
||||
|
||||
self::$NavigationMenuWidgetInstance = $this;
|
||||
self::$navigationMenuWidgetInstance = $this;
|
||||
|
||||
$this->view('widgets/navigationMenu');
|
||||
}
|
||||
@@ -26,7 +26,7 @@ class NavigationMenuWidget extends Widget
|
||||
*/
|
||||
public static function printNavigationMenu()
|
||||
{
|
||||
foreach (self::$NavigationMenuWidgetInstance->navigationMenu as $item)
|
||||
foreach (self::$navigationMenuWidgetInstance->navigationMenu as $item)
|
||||
{
|
||||
self::printNavItem($item);
|
||||
}
|
||||
@@ -41,6 +41,11 @@ class NavigationMenuWidget extends Widget
|
||||
|
||||
echo '<li class="'.$expanded.'">';
|
||||
|
||||
if (isset($item['subscriptLink']) && isset($item['subscriptDescription']))
|
||||
{
|
||||
echo '<span>';
|
||||
}
|
||||
|
||||
echo '<a href="'.$item['link'].'"'.$expanded.'>';
|
||||
|
||||
if (isset($item['icon']))
|
||||
@@ -48,7 +53,6 @@ class NavigationMenuWidget extends Widget
|
||||
echo '<i class="fa fa-'.$item['icon'].' fa-fw"></i> ';
|
||||
}
|
||||
|
||||
// echo '<span>'.$item['description'].'</span>'.'<span style="">test</span>';
|
||||
echo $item['description'];
|
||||
|
||||
if (!empty($item['children']))
|
||||
@@ -58,6 +62,16 @@ class NavigationMenuWidget extends Widget
|
||||
|
||||
echo '</a>';
|
||||
|
||||
if (isset($item['subscriptLink']) && isset($item['subscriptDescription']))
|
||||
{
|
||||
echo '<a class="menuSubscriptLink" href="'.$item['subscriptLink'].'">'.$item['subscriptDescription'].'</a>';
|
||||
}
|
||||
|
||||
if (isset($item['subscriptLink']) && isset($item['subscriptDescription']))
|
||||
{
|
||||
echo '</span>';
|
||||
}
|
||||
|
||||
if (!empty($item['children']))
|
||||
{
|
||||
$level = '';
|
||||
|
||||
Reference in New Issue
Block a user