From b422906eca0f1ffe9cca69ef708fa8f63fcbd221 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 7 Dec 2016 09:38:55 -0800
Subject: [PATCH] News menus and others corrected for consistent list alignment
 and styling.

---
 e107_handlers/news_class.php                    |  2 +-
 e107_plugins/news/news_months_menu.php          |  2 +-
 .../news/templates/news_menu_template.php       | 17 ++++++-----------
 e107_themes/bootstrap3/style.css                |  6 ++++++
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index 52efbb04c..259fd4954 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -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'));
 	}
 }
 
diff --git a/e107_plugins/news/news_months_menu.php b/e107_plugins/news/news_months_menu.php
index 77ccc5ea3..21dd51a5c 100644
--- a/e107_plugins/news/news_months_menu.php
+++ b/e107_plugins/news/news_months_menu.php
@@ -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);
diff --git a/e107_plugins/news/templates/news_menu_template.php b/e107_plugins/news/templates/news_menu_template.php
index 4b4c12dc7..5a78e3a0a 100644
--- a/e107_plugins/news/templates/news_menu_template.php
+++ b/e107_plugins/news/templates/news_menu_template.php
@@ -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']	= "({---})";
 
 
 
diff --git a/e107_themes/bootstrap3/style.css b/e107_themes/bootstrap3/style.css
index fe1741caa..2dfe3a42a 100644
--- a/e107_themes/bootstrap3/style.css
+++ b/e107_themes/bootstrap3/style.css
@@ -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}
+