Adapt to changes in Echo

2 files changed, 42 insertions, 6 deletions

diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index d35ddcf..c698a87 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -333,7 +333,8 @@ class TyrianTemplate extends BaseTemplate {
 	/*************************************************************************************************/
 	function personaltools() {
 		$personal_tools = $this->getPersonalTools();
-		$notification_tool = NULL;
+		$notifications_message_tool = NULL;
+		$notifications_alert_tool = NULL;
 
 		?>
 		<li class="dropdown">
@@ -350,8 +351,11 @@ class TyrianTemplate extends BaseTemplate {
 			<ul class="dropdown-menu" role="menu">
 				<?php
 					foreach ( $personal_tools as $key => $item ) {
-						if ($key === 'notifications') {
-							$notification_tool = $item;
+						echo $key;
+						if ($key === 'notifications-alert') {
+							$notifications_alert_tool = $item;
+						} else if ($key === 'notifications-message') {
+							$notifications_message_tool = $item;
 						} else {
 							echo $this->makeListItem( $key, $item );
 						}
@@ -361,8 +365,12 @@ class TyrianTemplate extends BaseTemplate {
 		</li>
 		<?php
 
-		if (!is_null($notification_tool)) {
-			echo $this->makeListItem('notifications', $notification_tool);
+		if (!is_null($notifications_message_tool)) {
+			echo $this->makeListItem('notifications-message', $notifications_message_tool);
+		}
+
+		if (!is_null($notifications_alert_tool)) {
+			echo $this->makeListItem('notifications-alert', $notifications_alert_tool);
 		}
 	}
 
diff --git a/main.css b/main.css
index 873e606..259a50c 100644
--- a/main.css
+++ b/main.css
@@ -219,6 +219,32 @@ div#preferences table td {
 	background-color: #4b406d;
 }
 
+/* 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;
+	background-color: transparent;
+	font-size: 1.125em;
+	font-weight: bold;
+	color: white;
+	cursor: pointer;
+	text-decoration: none;
+	margin-top: 0;
+	display: inline-block;
+	padding: 10px;
+	padding-left: 35px;
+	height: 40px;
+	background-position: 10px 10px;
+	background-size: 1.1em;
+	background-repeat: no-repeat;
+}
+
+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;
 }
@@ -227,7 +253,9 @@ div#content .flow-topic-title {
 	font-family: 'Bitter';
 }
 
+
+
 body.mw-special-Specialpages h2 {
 	border: none !important;
 	margin-bottom: 0.75em;
-}
\ No newline at end of file
+}