1
0
mirror of https://github.com/e107inc/e107.git synced 2025-03-13 17:09:46 +01:00

Merge pull request #2968 from Jimmi08/archive-news-menu-2

Closes #2946 news_archive_menu templated
This commit is contained in:
Cameron 2018-01-09 09:41:47 -08:00 committed by GitHub
commit 6e3b2611b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 34 deletions

View File

@ -29,12 +29,8 @@ foreach($tmp as $id => $val)
// e107::getDebug()->log($val);
}
$text = "<ul class='news-archive-menu'>";
$template = e107::getTemplate('news', 'news_menu', 'archive');
foreach($arr as $year=>$val)
{
if($year == date('Y'))
@ -49,51 +45,61 @@ foreach($arr as $year=>$val)
}
$id = "news-archive-".$year;
$text .= "<li>";
$text .= "<a class='e-expandit {$expandOpen}' href='#".$id."'>".$year."</a>";
$text .= "<ul id='".$id."' class='news-archive-menu-months' style='display:".$displayYear."'>";
$var = array('EXPANDOPEN' => $expandOpen,
'YEAR_ID' => $id,
'YEAR_NAME' => $year,
'YEAR_DISPLAY' => $displayYear
);
$text .= $tp->simpleParse($template['year_start'], $var);
foreach($val as $month=>$items)
{
//$displayMonth = ($mCount === 1) ? 'display:block': 'display:none';
$idm = "news-archive-".$year.'-'.$month;
$text .= "<li>";
$text .= "<a class='e-expandit' href='#".$idm."'>".$monthLabels[$month];
$var = array('MONTH_ID' => $idm,
'MONTH_NAME' => $monthLabels[$month],
'MONTH_COUNT'=> count($items),
);
$text .= $tp->simpleParse($template['month_start'], $var);
/*
if(!empty($parm['badges'])) // param only (no menu-manager config. To be replaced by template.
{
$num = count($items);
$text .= "<span class='badge'>".$num."</span>";
}
$text .= "</a>";
$text .= "<ul id='".$idm."' class='news-archive-menu-items' style='display:none'>";
} */
foreach($items as $row)
{
$url = e107::getUrl()->create('news/view/item', $row, array('allow' => 'news_sef,news_title,news_id,category_sef,category_name,category_id'));
$text .= "<li><a href='".$url."'>".$tp->toHtml($row['news_title'],false,'TITLE')."</a></li>";
$var = array('ITEM_URL' => $url,
'ITEM_TITLE' => $tp->toHtml($row['news_title'],false,'TITLE'),
);
$text .= $tp->simpleParse($template['item'], $var);
}
$text .= "</ul>";
$text .= "</li>";
$text .= $template['month_end'];
}
$text .= "</ul>";
$text .= "</li>";
$text .= $template['year_end'];
}
$text .= "</ul>";
$caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE;
$start = $template['start'];
$end = $template['end']; ;
e107::plugLan('news');
e107::getRender()->tablerender($caption, $text, 'news-archive-menu');
$caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE;
e107::getRender()->tablerender($caption, $start.$text.$end, 'news-archive-menu');
//e107::getDebug()->log($arr);

View File

@ -34,10 +34,7 @@ $NEWS_MENU_TEMPLATE['months']['item'] = '
';
//$NEWS_MENU_TEMPLATE['months']['separator'] = '<br />';
// latest menu
$NEWS_MENU_TEMPLATE['latest']['start'] = '<ul class="news-menu-latest">';
@ -130,6 +127,23 @@ $NEWS_MENU_TEMPLATE['carousel']['nav'] = '<li data-target="#news-carousel" data-
// TODO
$NEWS_MENU_TEMPLATE['archive'] = array();
$NEWS_MENU_TEMPLATE['archive']['start'] = '<ul class="news-archive-menu">';
$NEWS_MENU_TEMPLATE['archive']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['archive']['year_start'] = "<li>
<a class='e-expandit {EXPANDOPEN}' href='#{YEAR_ID}'>{YEAR_NAME}</a>
<ul id='{YEAR_ID}' class='news-archive-menu-months' style='display:{YEAR_DISPLAY}'>
";
$NEWS_MENU_TEMPLATE['archive']['year_end'] = '</ul></li>';
$NEWS_MENU_TEMPLATE['archive']['month_start'] = "<li>
<a class='e-expandit' href='#{MONTH_ID}'>{MONTH_NAME}<span class='badge'>{MONTH_COUNT}</span></a>
<ul id='{MONTH_ID}' class='news-archive-menu-items' style='display:none'>
";
$NEWS_MENU_TEMPLATE['archive']['month_end'] = '</ul></li>';
$NEWS_MENU_TEMPLATE['archive']['item'] = "
<li><a href='{ITEM_URL}'>{ITEM_TITLE}</a></li>
";