mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 10:50:25 +02:00
Code Issues Releases Wiki Activity

Issue #255 - Partial fix for empty sidebar menu.

Browse Source
This commit is contained in:
Cameron
2013-05-06 16:33:56 -07:00
parent 438bf16b0c
commit a3cdbb42c1
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
class2.php
View File

@@ -1087,6 +1087,10 @@ if(e_ADMIN_AREA)
else else
{ {
require_once (THEME.'theme.php'); require_once (THEME.'theme.php');
if(isset($SC_WRAPPER))
{
e107::scStyle($SC_WRAPPER);
}
} }

6
e107_core/shortcodes/single/navigation.php
View File

@@ -17,9 +17,7 @@ function navigation_shortcode($parm='')
$data = $nav->initData($category); $data = $nav->initData($category);
// $data = $nav->collection($category); // $data = $nav->collection($category);
if($data) return $nav->render($data, $template);
{
return $nav->render($data, $template);
}
} }

11
e107_handlers/sitelinks_class.php
View File

@@ -1371,7 +1371,10 @@ class e_navigation
$sc = e107::getScBatch('navigation'); $sc = e107::getScBatch('navigation');
$sc->template = $template; $sc->template = $template;
$ret = $template['start']; $head = $template['start'];
$foot = $template['end'];
$ret = "";
foreach ($data as $_data) foreach ($data as $_data)
{ {
$sc->setVars($_data); $sc->setVars($_data);
@@ -1379,10 +1382,8 @@ class e_navigation
$itemTmpl = count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active]; $itemTmpl = count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active];
$ret .= e107::getParser()->parseTemplate($itemTmpl, TRUE); $ret .= e107::getParser()->parseTemplate($itemTmpl, TRUE);
} }
$ret .= $template['end']; return ($ret != '') ? $head.$ret.$foot : '';
return $ret;
} }

8
e107_themes/bootstrap/theme.php
View File

@@ -118,10 +118,11 @@ function tablestyle($caption, $text, $mode='')
} }
} }
// $SC_WRAPPER['NAVIGATION=side'] = '<div class="well sidebar-nav">{---}</div><!--/.well -->'; //FIXME
// TODO Convert to : default-home and default-other layouts. // TODO Convert to : default-home and default-other layouts.
$HEADER['default'] = ' $HEADER['default'] = '
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
@@ -144,10 +145,7 @@ $HEADER['default'] = '
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span3"> <div class="span3">
<div class="well sidebar-nav"> {NAVIGATION=side}
{NAVIGATION=side}
</div><!--/.well -->
{SETSTYLE=menu} {SETSTYLE=menu}
{MENU=1} {MENU=1}
</div><!--/span--> </div><!--/span-->