harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zotlabs 2017-11-15 12:41:24 -08:00
commit d479ed00e4
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/channel.php
View File

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

28
view/css/widgets.css
View File

@ -168,3 +168,31 @@ a.wikilist {
.active .conv-participants { .active .conv-participants {
color: #fff; 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;
}

35
view/tpl/notifications_widget.tpl
View File

@ -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> <script>
var notifications_parent; var notifications_parent;
$(document).ready(function() { $(document).ready(function() {
@ -44,6 +15,7 @@
}); });
}); });
{{if $module == 'display'}}
$(document).on('click', '.notification', function(e) { $(document).on('click', '.notification', function(e) {
var b64mid = $(this).data('b64mid'); var b64mid = $(this).data('b64mid');
var path = $(this)[0].pathname.substr(1,7); var path = $(this)[0].pathname.substr(1,7);
@ -60,11 +32,12 @@
liveUpdate(); liveUpdate();
if($('#notifications_wrapper').hasClass('fs')) 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> </script>
{{/if}}
{{if $notifications}} {{if $notifications}}
<div id="notifications_wrapper"> <div id="notifications_wrapper">