mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 12:21:45 +02:00
Code Issues Releases Wiki Activity

Issue #435 - Initial Bootstrap3 theme added.

Browse Source
This commit is contained in:
Cameron
2013-12-21 01:32:39 -08:00
parent e778a4483f
commit e2d67d8ecd
9 changed files with 715 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/page_shortcodes.php
View File

@@ -189,7 +189,7 @@ class cpage_shortcodes extends e_shortcode
$size = vartrue($options['size'], "");
$inc = ($size) ? " btn-".$size : "";
return '<a class="cpage btn'.$inc.'" href="'.$url.'">'.$text.'</a>';
return '<a class="cpage btn btn-default'.$inc.'" href="'.$url.'">'.$text.'</a>';
}

1
e107_core/shortcodes/single/wmessage.php
View File

@@ -36,7 +36,6 @@ function wmessage_shortcode($parm)
if (strpos($front_url, 'http') === FALSE) $front_url = SITEURL.$front_url;
if (deftrue('e_FRONTPAGE') || ($parm == 'force') || ((e_SELF == $front_url) && (($parm == 'ignore_query') || (e_QUERY == $front_qry))))
{
// Actually want to display a welcome message here

12
e107_core/templates/header_default.php
View File

@@ -576,6 +576,18 @@ echo "</head>\n";
// ---------- New in 2.0 -------------------------------------------------------
if(isset($LAYOUT) && is_array($LAYOUT)) // $LAYOUT is a combined $HEADER,$FOOTER.
{
foreach($LAYOUT as $key=>$template)
{
list($hd,$ft) = explode("{...}",$template);
$HEADER[$key] = $hd;
$FOOTER[$key] = $ft;
}
unset($hd,$ft);
}
$def = THEME_LAYOUT; // The active layout based on custompage matches.
// echo "DEF = ".$def."<br />";