aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-15 12:41:24 -0800
committerzotlabs <mike@macgirvin.com>2017-11-15 12:41:24 -0800
commitd479ed00e4d4dd52ce139191c91911399df98a48 (patch)
treed13f20a045b86b7e7de4dc79596f431b99404aa8
parent67b6d41d57b20a223a0cb6f33cbf81473b0936ab (diff)
parent601f1eb624fce19a1da966e0e102b208a6ae7b74 (diff)
downloadvolse-hubzilla-d479ed00e4d4dd52ce139191c91911399df98a48.tar.gz
volse-hubzilla-d479ed00e4d4dd52ce139191c91911399df98a48.tar.bz2
volse-hubzilla-d479ed00e4d4dd52ce139191c91911399df98a48.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
-rw-r--r--include/channel.php2
-rw-r--r--view/css/widgets.css28
-rw-r--r--view/tpl/notifications_widget.tpl35
3 files changed, 33 insertions, 32 deletions
diff --git a/include/channel.php b/include/channel.php
index 2783dea97..708e74176 100644
--- a/include/channel.php
+++ b/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'];
diff --git a/view/css/widgets.css b/view/css/widgets.css
index cea3a3820..5b1273e25 100644
--- a/view/css/widgets.css
+++ b/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;
+}
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 29892ba79..3ef7bff7d 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/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">