Attempt to allow mediawiki to handle the Echo locations dynamically

Signed-off-by: Brian Evans <grknight@gentoo.org>

2 files changed, 18 insertions, 12 deletions

diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index 4be0530..6287925 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -334,8 +334,6 @@ class TyrianTemplate extends BaseTemplate {
 	/*************************************************************************************************/
 	function personaltools() {
 		$personal_tools = $this->getPersonalTools();
-		$notifications_message_tool = NULL;
-		$notifications_alert_tool = NULL;
 
 		?>
 		<li class="dropdown">
@@ -356,6 +354,8 @@ class TyrianTemplate extends BaseTemplate {
 							$notifications_alert_tool = $item;
 						} else if ($key === 'notifications-message') {
 							$notifications_message_tool = $item;
+						} else if ($key === 'notifications-notice') {
+							$notifications_notice_tool = $item;
 						} else {
 							echo $this->makeListItem( $key, $item );
 						}
@@ -365,11 +365,15 @@ class TyrianTemplate extends BaseTemplate {
 		</li>
 		<?php
 
-		if (!is_null($notifications_message_tool)) {
+		if (isset($notifications_message_tool)) {
 			echo $this->makeListItem('notifications-message', $notifications_message_tool);
 		}
 
-		if (!is_null($notifications_alert_tool)) {
+		if (isset($notifications_notice_tool)) {
+			echo $this->makeListItem('notifications-notice', $notifications_notice_tool);
+		}
+
+		if (isset($notifications_alert_tool)) {
 			echo $this->makeListItem('notifications-alert', $notifications_alert_tool);
 		}
 	}
diff --git a/main.css b/main.css
index 847aad3..705304e 100644
--- a/main.css
+++ b/main.css
@@ -222,7 +222,7 @@ div#preferences table td {
 
 /* mw-echo-notifications-badge mw-echo-notification-badge-nojs oo-ui-image-invert oo-ui-iconElement oo-ui-iconElement-icon oo-ui-icon-speechBubble */
 /* oo-ui-widget oo-ui-widget-enabled oo-ui-labelElement oo-ui-labelElement-label oo-ui-buttonElement oo-ui-buttonElement-framed oo-ui-buttonElement-button oo-ui-iconElement-icon oo-ui-flaggedElement-primary mw-echo-notifications-badge oo-ui-icon-speechBubble oo-ui-iconElement oo-ui-image-invert */
-
+/*
 body.skin-tyrian #pt-notifications-alert .mw-echo-notifications-badge,
 body.skin-tyrian #pt-notifications-message .mw-echo-notifications-badge {
 	border-radius: 0.2em;
@@ -243,26 +243,28 @@ body.skin-tyrian #pt-notifications-message .mw-echo-notifications-badge {
 	top: 0;
 	width: auto;
 }
-
+*/
+body.skin-tyrian #pt-notifications-alert .mw-echo-notifications-badge,
 body.skin-tyrian #pt-notifications-notice .mw-echo-notifications-badge {
-	top :0;
-	height: 100%;
-	width: 100%;
+	/* top :0; */
+	height: auto;
+	width: auto;
 }
 
 body.skin-tyrian #pt-notifications-alert .mw-echo-notifications-badge:before,
 body.skin-tyrian #pt-notifications-notice .mw-echo-notifications-badge:before {
-	top: 7px;
+	/* top: 7px; */
+	top: 1012px;
 }
-
+/*
 body.skin-tyrian #pt-notifications-alert .mw-echo-notifications-badge:after,
 body.skin-tyrian #pt-notifications-notice .mw-echo-notifications-badge:after {
 	top: 0;
 }
-
 body.ltr #pt-notifications-alert .mw-echo-notifications-badge, body.ltr #pt-notifications-message .mw-echo-notifications-badge {
 	background-position: 10px 10px !important;
 }
+*/
 
 .flow-board-header, .flow-board-navigation, .flow-board-header-menu, .flow-board {
 	max-width: none;