diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-28 21:43:50 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-28 21:43:50 -0800 |
| commit | c1e44c0f54e2dc9a340f0d619fa8082ec12947c1 (patch) | |
| tree | 3bb0deca1c350445bcc8935afa2536bd842007e7 /view/tpl | |
| parent | 5cf2bf6b29fde04ddc791af8ce21731818bedb7a (diff) | |
| parent | edf6ad9eda323f6e04823b8c110d21d82d519d32 (diff) | |
| download | volse-hubzilla-c1e44c0f54e2dc9a340f0d619fa8082ec12947c1.tar.gz volse-hubzilla-c1e44c0f54e2dc9a340f0d619fa8082ec12947c1.tar.bz2 volse-hubzilla-c1e44c0f54e2dc9a340f0d619fa8082ec12947c1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/hq.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 50 |
2 files changed, 27 insertions, 33 deletions
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl index fce11ff83..099d892bb 100755 --- a/view/tpl/hq.tpl +++ b/view/tpl/hq.tpl @@ -1,13 +1,3 @@ -{{if $no_messages}} -<div class="alert alert-warning alert-dismissible fade show" role="alert"> - <button type="button" class="close" data-dismiss="alert" aria-label="Close"> - <span aria-hidden="true">×</span> - </button> - <h3>{{$no_messages_label.0}}</h3> - <br> - {{$no_messages_label.1}} -</div> -{{/if}} <div id="jot-popup"> {{$editor}} </div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 69e5e15bc..0f27b1a47 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -21,7 +21,7 @@ }; }); - {{if $module == 'display' || $module == 'hq'}} + {{if $module == 'display' || $module == 'hq' || $startpage == 'hq'}} $(document).on('click', '.notification', function(e) { var b64mid = $(this).data('b64mid'); var notify_id = $(this).data('notify_id'); @@ -31,30 +31,34 @@ if(b64mid === 'undefined' && notify_id === 'undefined') return; - {{if $module == 'display'}} - history.pushState(stateObj, '', 'display/' + b64mid); - {{/if}} - {{if $module == 'hq'}} - history.pushState(stateObj, '', 'hq/' + b64mid); - {{/if}} - - {{if $module == 'hq'}} - if(b64mid !== 'undefined') { - {{else}} - if(path === 'display' && b64mid) { - {{/if}} + {{if $module != 'hq' && $startpage == 'hq'}} e.preventDefault(); - - if(! page_load) { - if($(this).parent().attr('id') !== 'nav-pubs-menu') - $(this).fadeOut(); - - getData(b64mid, notify_id); + window.location.href = 'hq/' + b64mid; + return; + {{else}} + {{if $module == 'display'}} + history.pushState(stateObj, '', 'display/' + b64mid); + {{/if}} + + {{if $module == 'hq'}} + history.pushState(stateObj, '', 'hq/' + b64mid); + {{/if}} + + {{if $module == 'hq'}} + if(b64mid !== 'undefined') { + {{else}} + if(path === 'display' && b64mid) { + {{/if}} + e.preventDefault(); + + if(! page_load) { + getData(b64mid, notify_id); + } + + if($('#notifications_wrapper').hasClass('fs')) + $('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); } - - if($('#notifications_wrapper').hasClass('fs')) - $('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); - } + {{/if}} }); {{/if}} |