From 478fc8d0605441a8329452af549b9205ea7fbcc5 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 16 Jun 2019 13:30:16 -0700
Subject: [PATCH] Tablerender: setContent('list') added to login menu and news
 menus.

---
 class2.php                                 |  2 +-
 e107_handlers/news_class.php               | 24 ++++++++++++++++++++--
 e107_plugins/login_menu/login_menu.php     |  6 ++++++
 e107_plugins/news/news_archive_menu.php    |  6 ++++++
 e107_plugins/news/news_categories_menu.php |  1 +
 e107_plugins/news/news_months_menu.php     |  8 ++++++++
 6 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/class2.php b/class2.php
index 2c7c9d1e1..481f831a0 100755
--- a/class2.php
+++ b/class2.php
@@ -1026,7 +1026,7 @@ if (!class_exists('e107table', false))
 		 */
 		public function setUniqueId($id)
 		{
-			$this->uniqueId = !empty($id) ? $id : null;
+			$this->uniqueId = !empty($id) ? eHelper::dasherize($id) : null;
 			return $this;
 		}
 
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index 38c84960c..ce6f46df7 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -908,7 +908,17 @@ class e_news_tree extends e_front_tree_model
 				}
 
 				$mod = true === $tablerender ? 'news_latest_menu' : $tablerender;
-				return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
+
+				if(strpos($ret,'<ul ') !== false)
+				{
+					e107::getRender()->setUniqueId(varset($parms['mode'], $mod))->setContent('list', true);
+				}
+
+				$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
+
+
+
+				return $text;
 			}
 
 			if($return) return $ret;
@@ -1134,7 +1144,17 @@ class e_news_category_tree extends e_front_tree_model
 				}
 
 				$mod = true === $tablerender ? 'news_categories_menu' : $tablerender;
-				return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
+
+				if(strpos($ret,'<ul ') !== false)
+				{
+					e107::getRender()->setUniqueId($mod)->setContent('list', true);
+				}
+
+				$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
+
+
+
+				return $text;
 			}
 
 			if($return) return $ret;
diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php
index e1a76af21..2a290e798 100644
--- a/e107_plugins/login_menu/login_menu.php
+++ b/e107_plugins/login_menu/login_menu.php
@@ -152,6 +152,11 @@ if (USER == TRUE || ADMIN == TRUE)
 	}
 	
 	//render
+	if(strpos($text,'<ul ') !== false)
+	{
+		$ns->setUniqueId('login-menu')->setContent('list', true);
+	}
+
 	$ns->tablerender($caption, $text, 'login');
 
 // END LOGGED CODE	
@@ -188,6 +193,7 @@ else
 	} else {
 		$caption = LAN_LOGINMENU_5;
 	}
+
 	$ns->tablerender($caption, $text, 'login');
 }
 // END NOT LOGGED CODE
diff --git a/e107_plugins/news/news_archive_menu.php b/e107_plugins/news/news_archive_menu.php
index 5732d92df..ba34b658d 100644
--- a/e107_plugins/news/news_archive_menu.php
+++ b/e107_plugins/news/news_archive_menu.php
@@ -105,6 +105,12 @@ e107::plugLan('news');
 $caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE;
 
 
+if(strpos($start,'<ul ') !== false)
+{
+	e107::getRender()->setUniqueId('news-archive-menu')->setContent('list', true);
+}
+
 e107::getRender()->tablerender($caption, $start.$text.$end, 'news-archive-menu');
 
+
 //e107::getDebug()->log($arr);
diff --git a/e107_plugins/news/news_categories_menu.php b/e107_plugins/news/news_categories_menu.php
index 5ed0543e9..1687c7328 100644
--- a/e107_plugins/news/news_categories_menu.php
+++ b/e107_plugins/news/news_categories_menu.php
@@ -23,6 +23,7 @@ if(false === $cached)
 		$parms = $parm;
 	}
 
+	/** @var e_news_category_tree $ctree */
 	$ctree = e107::getObject('e_news_category_tree', null, e_HANDLER.'news_class.php');
 
 	$parms['tmpl']      = 'news_menu';
diff --git a/e107_plugins/news/news_months_menu.php b/e107_plugins/news/news_months_menu.php
index 89a81955e..cbd7c1893 100644
--- a/e107_plugins/news/news_months_menu.php
+++ b/e107_plugins/news/news_months_menu.php
@@ -134,7 +134,15 @@ if(false === $cached)
 			$cached .= $footer;
 
 		}
+
+		if(strpos($cached,'<ul ') !== false)
+		{
+			e107::getRender()->setUniqueId('news-months-menu')->setContent('list', true);
+		}
+
 		$cached = $ns->tablerender(BLOGCAL_L1." ".$req_year, $cached, 'news_months_menu', true);
+
+
 	}
 	e107::getCache()->set($cString, $cached);
 }