mirror of
https://github.com/e107inc/e107.git
synced 2025-03-14 01:19:44 +01:00
Remove deprecated $HEADER / $FOOTER from bootstrap3 theme to avoid confusing developers.
This commit is contained in:
Cameron
parent
479cdd7d8f
commit
238756446c
@ -42,7 +42,7 @@ require_once("../class2.php");
|
||||
|
||||
if(e_MENUMANAGER_ACTIVE === false )
|
||||
{
|
||||
if(!deftrue("e_DEBUG_MENUMANAGER"))
|
||||
if(!deftrue("e_DEBUG"))
|
||||
{
|
||||
e107::getJs()->inlineCSS('
|
||||
|
||||
@ -879,7 +879,7 @@ class e_menu_layout
|
||||
{
|
||||
$template = $head[$k]."\n{---}".$foot[$k];
|
||||
$layout['templates'][$k] = $template;
|
||||
$layout['menus'][$k] = self::countMenus($template);
|
||||
$layout['menus'][$k] = self::countMenus($template, $k);
|
||||
}
|
||||
|
||||
|
||||
@ -889,7 +889,7 @@ class e_menu_layout
|
||||
}
|
||||
|
||||
|
||||
private static function countMenus($template)
|
||||
private static function countMenus($template, $name)
|
||||
{
|
||||
if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $template, $matches))
|
||||
{
|
||||
@ -897,6 +897,8 @@ class e_menu_layout
|
||||
return $matches[1];
|
||||
}
|
||||
|
||||
e107::getDebug()->log("No Menus Found in Template:".$name." with strlen: ".strlen($template));
|
||||
|
||||
return array();
|
||||
}
|
||||
|
||||
|
||||
@ -1247,6 +1247,8 @@ class pluginManager{
|
||||
|
||||
$text = "";
|
||||
|
||||
$plg = e107::getPlug();
|
||||
|
||||
foreach($pluginList as $plug)
|
||||
{
|
||||
e107::loadLanFiles($plug['plugin_path'],'admin');
|
||||
@ -1264,10 +1266,10 @@ class pluginManager{
|
||||
$plugin_config_icon = "";
|
||||
|
||||
|
||||
|
||||
if(deftrue('e_DEBUG_PLUGMANAGER'))
|
||||
{
|
||||
$plug_vars = e107::getPlug()->getMeta($plug['plugin_path']);
|
||||
$plg->load($plug['plugin_path']);
|
||||
$plug_vars = $plg->getMeta();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -541,245 +541,9 @@ $LAYOUT['jumbotron_sidebar_right'] = '
|
||||
|
||||
|
||||
/* XXX EVERYTHING BELOW THIS POINT IS UNUSED FOR NOW */
|
||||
|
||||
|
||||
|
||||
|
||||
$HEADER['default'] = '
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<div class="container-fluid">
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<a class="brand" href="'.SITEURL.'">{SITENAME}</a>
|
||||
<div class="nav-collapse collapse">
|
||||
{NAVIGATION=main}
|
||||
<div class="pull-right">{BOOTSTRAP_USERNAV}</div>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span3">
|
||||
{NAVIGATION|s=side}
|
||||
{SETSTYLE=menu}
|
||||
{MENU=1}
|
||||
</div><!--/span-->
|
||||
<div class="span9">
|
||||
{SETSTYLE=default}
|
||||
{WMESSAGE}
|
||||
';
|
||||
|
||||
|
||||
|
||||
$FOOTER['default'] = '
|
||||
{SETSTYLE=span4}
|
||||
|
||||
</div><!--/span-->
|
||||
</div><!--/row-->
|
||||
|
||||
<hr>
|
||||
|
||||
<footer class="center">
|
||||
{SITEDISCLAIMER}
|
||||
</footer>
|
||||
|
||||
</div><!--/.fluid-container-->';
|
||||
|
||||
|
||||
$HEADER['default-home'] = $HEADER['default'];
|
||||
|
||||
|
||||
$FOOTER['default-home'] = '
|
||||
|
||||
{SETSTYLE=span4}
|
||||
|
||||
<div class="row-fluid">
|
||||
{MENU=2}
|
||||
</div><!--/row-->
|
||||
<div class="row-fluid">
|
||||
{MENU=3}
|
||||
</div><!--/row-->
|
||||
|
||||
</div><!--/span-->
|
||||
</div><!--/row-->
|
||||
|
||||
<hr>
|
||||
|
||||
<footer class="center">
|
||||
{SITEDISCLAIMER}
|
||||
</footer>
|
||||
|
||||
</div><!--/.fluid-container-->';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// HERO http://twitter.github.com/bootstrap/examples/hero.html
|
||||
//FIXME insert shortcodes while maintaining only bootstrap classes.
|
||||
|
||||
$HEADER['hero'] = '
|
||||
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<a class="brand" href="#">Project name</a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li><a href="#about">About</a></li>
|
||||
<li><a href="#contact">Contact</a></li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Action</a></li>
|
||||
<li><a href="#">Another action</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
<li class="divider"></li>
|
||||
<li class="nav-header">Nav header</li>
|
||||
<li><a href="#">Separated link</a></li>
|
||||
<li><a href="#">One more separated link</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<form class="navbar-form pull-right">
|
||||
<input class="span2" type="text" placeholder="Email">
|
||||
<input class="span2" type="password" placeholder="Password">
|
||||
<button type="submit" class="btn">Sign in</button>
|
||||
</form>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
<!-- Main hero unit for a primary marketing message or call to action -->
|
||||
<div class="hero-unit">';
|
||||
|
||||
/*
|
||||
<h1>Hello, world!</h1>
|
||||
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
|
||||
<p><a class="btn btn-primary btn-large">Learn more »</a></p>
|
||||
*/
|
||||
|
||||
|
||||
//FIXME insert shortcodes while maintaining classes.
|
||||
$FOOTER['hero'] = '
|
||||
</div>
|
||||
|
||||
<!-- Example row of columns -->
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Heading</h2>
|
||||
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
|
||||
<p><a class="btn" href="#">View details »</a></p>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h2>Heading</h2>
|
||||
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
|
||||
<p><a class="btn" href="#">View details »</a></p>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h2>Heading</h2>
|
||||
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
|
||||
<p><a class="btn" href="#">View details »</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<footer>
|
||||
<p>© Company 2012</p>
|
||||
</footer>
|
||||
|
||||
</div> <!-- /container -->';
|
||||
|
||||
|
||||
// Marketing Narrow - http://twitter.github.com/bootstrap/examples/marketing-narrow.html
|
||||
//FIXME insert shortcodes while maintaing classes.
|
||||
|
||||
$HEADER['marketing-narrow'] = '
|
||||
<div class="container-narrow">
|
||||
|
||||
<div class="masthead">
|
||||
<ul class="nav nav-pills pull-right">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li><a href="#">About</a></li>
|
||||
<li><a href="#">Contact</a></li>
|
||||
</ul>
|
||||
<h3 class="muted">Project name</h3>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<div class="jumbotron">
|
||||
<h1>Super awesome marketing speak!</h1>
|
||||
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
|
||||
<a class="btn btn-large btn-success" href="#">Sign up today</a>
|
||||
';
|
||||
|
||||
|
||||
//FIXME insert shortcodes while maintaing classes.
|
||||
|
||||
$FOOTER['marketing-narrow'] = '
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<div class="row-fluid marketing">
|
||||
<div class="span6">
|
||||
<h4>Subheading</h4>
|
||||
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
|
||||
|
||||
<h4>Subheading</h4>
|
||||
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
|
||||
|
||||
<h4>Subheading</h4>
|
||||
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
|
||||
</div>
|
||||
|
||||
<div class="span6">
|
||||
<h4>Subheading</h4>
|
||||
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
|
||||
|
||||
<h4>Subheading</h4>
|
||||
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
|
||||
|
||||
<h4>Subheading</h4>
|
||||
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<div class="footer">
|
||||
<p>© Company 2012</p>
|
||||
</div>
|
||||
|
||||
</div> <!-- /container -->
|
||||
|
||||
';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* $HEADER AND $FOOTER are deprecated.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
@ -789,9 +553,9 @@ $FOOTER['marketing-narrow'] = '
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
|
||||
$HEADER['docs'] = <<<TMPL
|
||||
$LAYOUT['docs'] = <<<TMPL
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
@ -836,13 +600,9 @@ $HEADER['docs'] = <<<TMPL
|
||||
<div class="span9">
|
||||
|
||||
|
||||
{---}
|
||||
|
||||
|
||||
|
||||
TMPL;
|
||||
|
||||
|
||||
$FOOTER['docs'] = <<<TMPL
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -869,7 +629,7 @@ $FOOTER['docs'] = <<<TMPL
|
||||
TMPL;
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -894,4 +654,4 @@ $NEWSCAT_ITEM = "\n\n\n\n<!-- News Category Item -->\n\n\n\n
|
||||
</td></tr></table></div>
|
||||
";
|
||||
|
||||
?>
|
||||
?>
|
||||
@ -224,7 +224,46 @@ class theme_shortcodes extends e_shortcode
|
||||
return $tp->parseTemplate($text,true,$login_menu_shortcodes);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* @example shortcode to render news.
|
||||
*/
|
||||
function sc_bootstrap_news_example($parm=null)
|
||||
{
|
||||
$news = e107::getObject('e_news_tree'); // get news class.
|
||||
$sc = e107::getScBatch('news'); // get news shortcodes.
|
||||
$tp = e107::getParser(); // get parser.
|
||||
|
||||
$newsCategory = 1; // null, number or array(1,3,4);
|
||||
|
||||
$opts = array(
|
||||
'db_order' =>'n.news_sticky DESC, n.news_datestamp DESC', //default is n.news_datestamp DESC
|
||||
'db_where' => "FIND_IN_SET(0, n.news_render_type)", // optional
|
||||
'db_limit' => '6', // default is 10
|
||||
);
|
||||
|
||||
// load active news items. ie. the correct userclass, start/end time etc.
|
||||
$data = $news->loadJoinActive($newsCategory, false, $opts)->toArray(); // false to utilize the built-in cache.
|
||||
$TEMPLATE = "{NEWS_TITLE} : {NEWS_CATEGORY_NAME}<br />";
|
||||
|
||||
$text = '';
|
||||
|
||||
foreach($data as $row)
|
||||
{
|
||||
|
||||
$sc->setScVar('news_item', $row); // send $row values to shortcodes.
|
||||
$text .= $tp->parseTemplate($TEMPLATE, true, $sc); // parse news shortcodes.
|
||||
}
|
||||
|
||||
return $text;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user