Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

include/channel.php

@@ -1743,7 +1743,7 @@ function get_theme_uid() {
 		if((get_pconfig(local_channel(),'system','always_my_theme')) || (! $uid))
 			return local_channel();
 	}
-	if(! $uierd) {
+	if(! $uid) {
 		$x = get_sys_channel();
 		if($x)
 			return $x['channel_id'];

view/css/widgets.css

@@ -168,3 +168,31 @@ a.wikilist {
 .active .conv-participants {
 	color: #fff;
 }
+
+/* notifications */
+
+.notification-content {
+	max-height: 70vh;
+	overflow: auto;
+}
+
+.notification-content.collapsing {
+	overflow: hidden;
+}
+
+.fs {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	padding: 4.5rem .5rem 1rem .5rem;
+	background-color: white;
+	width: 100%;
+	max-width: 100%;
+	height: 100%;
+	z-index: 1029;
+	overflow: auto;
+}
+
+#notifications {
+	margin-bottom: 1rem;
+}

view/tpl/notifications_widget.tpl

@@ -1,32 +1,3 @@
-<style>
-	.notification-content {
-		max-height: 70vh;
-		overflow: auto;
-	}
-
-	.notification-content.collapsing {
-		overflow: hidden;
-	}
-
-	.fs {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		padding: 4.5rem .5rem 1rem .5rem;
-		background-color: white;
-		width: 100%;
-		max-width: 100%;
-		height: 100%;
-		z-index: 1029;
-		overflow: auto;
-	}
-
-	#notifications {
-		margin-bottom: 1rem;
-	}
-</style>
-
-{{if $module == 'display'}}
 <script>
 	var notifications_parent;
 	$(document).ready(function() {
@@ -44,6 +15,7 @@
 		});
 	});
 
+	{{if $module == 'display'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
@@ -60,11 +32,12 @@
 			liveUpdate();
 
 			if($('#notifications_wrapper').hasClass('fs'))
-				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); //var notifications_parent is defined in redbasic.js
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
 		}
 	});
+	{{/if}}
 </script>
-{{/if}}
+
 
 {{if $notifications}}
 <div id="notifications_wrapper">