Merge pull request #863 from Arantor/release-2.1

More menu madness

Sources/Subs.php

@@ -4073,7 +4073,10 @@ function setupMenuContext()
 		$context['menu_buttons']['moderate']['title'] .= ' <span class="amt">' . $context['open_mod_reports'] . '</span>';
 
 	if (!empty($context['unapproved_members']))
+	{
 		$context['menu_buttons']['admin']['sub_buttons']['memberapprove']['title'] .= ' <span class="amt">' . $context['unapproved_members'] . '</span>';
+		$context['menu_buttons']['admin']['title'] .= ' <span class="amt">' . $context['unapproved_members'] . '</span>';
+	}
 
 	if (!$user_info['is_guest'] && $context['user']['unread_messages'] > 0 && isset($context['menu_buttons']['pm']))
 	{

Themes/default/index.template.php

@@ -203,15 +203,15 @@ function template_body_above()
 		echo '
 				</li>';
 
-		// This will only apply if we're powerful and can actually see reports.
-		if (!empty($context['open_mod_reports']) && $context['show_open_reports'])
-			echo '
-				<li class="modnotice"><a href="', $scripturl, '?action=moderate;area=reports">', $txt['mod_reports_waiting'], ' <span class="amt">', $context['open_mod_reports'], '</span></a></li>';
-
 		// Are there any members waiting for approval?
 		if (!empty($context['unapproved_members']))
 			echo '
-				<li class="modnotice"><a href="', $scripturl, '?action=admin;area=viewmembers;sa=browse;type=approve">', $txt['approve_members_waiting'], ' <span class="amt">', $context['unapproved_members'], '</span></a></li>';
+				<li><a href="', $scripturl, '?action=admin;area=viewmembers;sa=browse;type=approve">', $txt['approve_members_waiting'], ' <span class="amt">', $context['unapproved_members'], '</span></a></li>';
+
+		// This will only apply if we're powerful and can actually see reports.
+		if (!empty($context['open_mod_reports']) && $context['show_open_reports'])
+			echo '
+				<li><a href="', $scripturl, '?action=moderate;area=reports">', $txt['mod_reports_waiting'], ' <span class="amt">', $context['open_mod_reports'], '</span></a></li>';
 
 		echo '
 			</ul>';