1
0
mirror of https://github.com/e107inc/e107.git synced 2025-05-06 20:25:25 +02:00

Merge pull request from rica-carv/rica-carv-viewforum_caption

Enable templating of viewforum caption
This commit is contained in:
Cameron 2016-11-17 12:36:33 -08:00 committed by GitHub
commit 1a2e1bf2f9
2 changed files with 5 additions and 1 deletions

@ -163,6 +163,7 @@ if (empty($FORUM_VIEW_START))
if(!empty($FORUM_VIEWFORUM_TEMPLATE) && is_array($FORUM_VIEWFORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // New v2.x bootstrap Template.
{
$FORUM_VIEW_CAPTION = $FORUM_VIEWFORUM_TEMPLATE['caption'];
$FORUM_VIEW_START_CONTAINER = $FORUM_VIEWFORUM_TEMPLATE['start'];
$FORUM_VIEW_START = $FORUM_VIEWFORUM_TEMPLATE['header'];
$FORUM_VIEW_FORUM = $FORUM_VIEWFORUM_TEMPLATE['item'];
@ -564,7 +565,9 @@ $forum_view_end = $tp->parseTemplate($FORUM_VIEW_END, false, $sc);
if ($forum->prefs->get('enclose'))
{
// $forum_view_subs????
$ns->tablerender($forum->prefs->get('title'), $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, array('forum_viewforum', 'main1'));
$caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, TRUE, $sc) : $forum->prefs->get('title');
$ns->tablerender($caption, $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, array('forum_viewforum', 'main1'));
}
else
{

@ -286,6 +286,7 @@ $FORUM_CRUMB['forum']['value'] = "{FORUM_TITLE}";
//TODO Find a good place to put a {SEARCH} dropdown.
$FORUM_VIEWFORUM_TEMPLATE['caption'] = "";
$FORUM_VIEWFORUM_TEMPLATE['start'] = "";
$FORUM_VIEWFORUM_TEMPLATE['header'] = "<div class=' row-fluid'><div>{BREADCRUMB}</div></div>
<div class='row row-fluid'>