mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

News menus and others corrected for consistent list alignment and styling.

Browse Source
This commit is contained in:
Cameron 2016-12-07 09:38:55 -08:00
parent a23e89d6c1
commit b422906eca
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/news_class.php
View File

@ -836,7 +836,7 @@ class e_news_category_item extends e_front_model
{
return '';
}
return (string) $this->cat('news_count');
return (string) e107::getParser()->toBadge( $this->cat('news_count'));
}
}

2
e107_plugins/news/news_months_menu.php
View File

@ -124,7 +124,7 @@ if(false === $cached)
$cached = $template['start'].implode(varset($template['separator'],''), $menu_text).$template['end'];
if($cached)
{
if(!$parms['showarchive']) $cached .= '<ul class="nav nav-list e-menu-link news-menu-archive"><li><a href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></li></ul>';
if(!$parms['showarchive']) $cached .= '<div class="e-menu-link news-menu-archive"><a class="btn btn-default btn-sm" href="'.e_PLUGIN_ABS.'blogcalendar_menu/archive.php">'.BLOGCAL_L2.'</a></div>';
$cached = $ns->tablerender(BLOGCAL_L1." ".$req_year, $cached, 'news_months_menu', true);
}
e107::getCache()->set($cString, $cached);

17
e107_plugins/news/templates/news_menu_template.php
View File

@ -16,25 +16,21 @@ global $sc_style;
// category menu
$NEWS_MENU_TEMPLATE['category']['start'] = '<ul class="nav nav-list news-menu-category">';
$NEWS_MENU_TEMPLATE['category']['start'] = '<ul class="news-menu-category">';
$NEWS_MENU_TEMPLATE['category']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['category']['item'] = '
<li><a class="e-menu-link newscats{active}" href="{NEWS_CATEGORY_URL}">{NEWS_CATEGORY_TITLE} <span>{NEWS_CATEGORY_NEWS_COUNT}</span></a></li>
<li><a class="e-menu-link newscats{active}" href="{NEWS_CATEGORY_URL}">{NEWS_CATEGORY_TITLE}{NEWS_CATEGORY_NEWS_COUNT}</a></li>
';
$NEWS_MENU_WRAPPER['category']['NEWS_CATEGORY_NEWS_COUNT'] = "({---})"; // Wrap brackets around the news count when value is returned.
//$NEWS_MENU_TEMPLATE['category']['separator'] = '<br />';
// months menu
$NEWS_MENU_TEMPLATE['months']['start'] = '<ul class="nav nav-list news-menu-months">';
$NEWS_MENU_TEMPLATE['months']['start'] = '<ul class="news-menu-months">';
$NEWS_MENU_TEMPLATE['months']['end'] = '</ul>';
$NEWS_MENU_TEMPLATE['months']['item'] = '
<li><a class="e-menu-link newsmonths{active}" href="{url}">{month} <span>({count})</span></a></li>
<li><a class="e-menu-link newsmonths{active}" href="{url}">{month} <span class="badge">{count}</span></a></li>
';
//$NEWS_MENU_TEMPLATE['months']['separator'] = '<br />';
@ -44,11 +40,10 @@ $NEWS_MENU_TEMPLATE['months']['item'] = '
// latest menu
$NEWS_MENU_TEMPLATE['latest']['start'] = '<ul class="nav nav-list news-menu-latest">';
$NEWS_MENU_TEMPLATE['latest']['start'] = '<ul class="news-menu-latest">';
$NEWS_MENU_TEMPLATE['latest']['end'] = '</ul>'; // Example: $NEWS_MENU_TEMPLATE['latest']['end'] '<br />{currentTotal} from {total}';
$NEWS_MENU_TEMPLATE['latest']['item'] = '<li><a class="e-menu-link newsmonths" href="{NEWSURL}">{NEWSTITLE} <span>{NEWSCOMMENTCOUNT}</span></a></li>';
$NEWS_MENU_TEMPLATE['latest']['item'] = '<li><a class="e-menu-link newsmonths" href="{NEWSURL}">{NEWSTITLE} <span class="badge">{NEWSCOMMENTCOUNT}</span></a></li>';
$NEWS_MENU_WRAPPER['latest']['NEWSCOMMENTCOUNT'] = "({---})";

6
e107_themes/bootstrap3/style.css
View File

@ -136,6 +136,12 @@ table label.checkbox {
margin-left: 20px;
}
/* Fix sidebar list alignments */
#sidebar .panel-body span.badge { float:right}
#sidebar .panel-body ul { padding-left:15px }
#sidebar .panel-body ul li { padding-bottom:8px }
#sidebar .panel-body ul.list-unstyled { padding-left:0}