diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 3 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 5 |
6 files changed, 17 insertions, 9 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 5b1273e25..76e829b04 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -170,6 +170,9 @@ a.wikilist { } /* notifications */ +.notifications-btn { + opacity: .5; +} .notification-content { max-height: 70vh; diff --git a/view/js/main.js b/view/js/main.js index 11a09b647..a228e6fbc 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -373,10 +373,12 @@ function notificationsUpdate() { if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) { $('.notifications-btn').css('opacity', 1); + $('#no_notifications').hide(); } else { $('.notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('show'); + $('#no_notifications').show(); } if(data.home || data.intros || data.register || data.mail || data.notify || data.files) { diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 399ee42cf..a2a9f3f27 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -23,7 +23,7 @@ $.post(url, data, function(data) { if(timer) clearTimeout(timer); - NavUpdate(); + updateInit(); $.colorbox.close(); }) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2f9dd9f15..ffaa4e208 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -340,7 +340,7 @@ var activeCommentText = ''; $.get('{{$baseurl}}/tagger/' + id + '?term=' + reply); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,3000); + timer = setTimeout(updateInit,3000); liking = 1; } } @@ -359,7 +359,7 @@ var activeCommentText = ''; if(reply && reply.length) { commentBusy = true; $('body').css('cursor', 'wait'); - $.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate); + $.get('{{$baseurl}}/filer/' + id + '?term=' + reply, updateInit); liking = 1; $('#item-filer-dialog').modal('hide'); } @@ -372,13 +372,13 @@ var activeCommentText = ''; function itemBookmark(id) { $.get('{{$baseurl}}/bookmarks?f=&item=' + id); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } function itemAddToCal(id) { $.get('{{$baseurl}}/events/add/' + id); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } function toggleVoting() { @@ -409,7 +409,7 @@ var activeCommentText = ''; if(id && icon) { $.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } } diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index dd2a67a63..0ac836b38 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -4,10 +4,10 @@ {{if $create}} <a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> {{else}} - <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> + <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} - <h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2> + <h2>{{$title}}{{if $cat.0}} - {{$cat.0}}{{/if}}</h2> </div> <div class="clearfix section-content-wrapper"> {{foreach $apps as $ap}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 299c07592..9d2e08c41 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -63,7 +63,7 @@ $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { e.preventDefault(); $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); - $(this).toggleClass('active'); + $(this).toggleClass('active sticky-top'); }); {{/if}} {{/foreach}} @@ -85,6 +85,9 @@ {{if $notifications}} <div id="notifications_wrapper"> + <div id="no_notifications" class="d-xl-none"> + {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> + </div> <div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="nav-notifications-template" rel="template"> <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}"> |