diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/crophead.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 15 |
3 files changed, 13 insertions, 9 deletions
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl index a5a80c187..db1915d22 100755 --- a/view/tpl/crophead.tpl +++ b/view/tpl/crophead.tpl @@ -1,3 +1,3 @@ -<script type="text/javascript" src="library/cropperjs/dist/cropper.js" language="javascript"></script> -<link rel="stylesheet" href="library/cropperjs/dist/cropper.css" type="text/css" /> +<script type="text/javascript" src="library/cropperjs/dist/cropper.min.js" language="javascript"></script> +<link rel="stylesheet" href="library/cropperjs/dist/cropper.min.css" type="text/css" /> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index f7ec7db23..175d813c5 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -7,6 +7,9 @@ {{if $entry.ignlink}} <a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a> {{/if}} + {{if $entry.censor}} + <a class="directory-censor btn btn-danger btn-sm" href="{{$entry.censor}}"> {{$entry.censor_label}}</a> + {{/if}} {{if $entry.connect}} <a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a> {{/if}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 057d5b491..146c510f1 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -82,7 +82,7 @@ {{if $notification.filter}} $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { e.preventDefault(); - $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); + $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggleClass('d-none'); $(this).toggleClass('active sticky-top'); }); $(document).on('click', '#cn-{{$notification.type}}-input-clear', function(e) { @@ -117,6 +117,7 @@ {{/foreach}} function getData(b64mid, notify_id) { + $(document).scrollTop(0); $('.thread-wrapper').remove(); bParam_mid = b64mid; mode = 'replace'; @@ -143,16 +144,16 @@ </a> </div> <div id="nav-notifications-forums-template" rel="template"> - <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> + <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'> <span class="float-right badge badge-secondary">{10}</span> <img class="menu-img-1" src="{1}"> <span class="">{2}</span> <i class="fa fa-{11} text-muted"></i> </a> </div> - <div id="notifications" class="navbar-nav"> + <div id="notifications" class="border rounded border-bottom-0 list-group list-group-flush navbar-nav collapse"> {{foreach $notifications as $notification}} - <div class="collapse {{$notification.type}}-button"> + <div class="list-group collapse {{$notification.type}}-button"> <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}"> <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}} <span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span> @@ -160,7 +161,7 @@ <div class="spinner s"></div> </div> </a> - <div id="nav-{{$notification.type}}-sub" class="collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> + <div id="nav-{{$notification.type}}-sub" class="list-group border-bottom collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} <a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} @@ -185,8 +186,8 @@ </div> {{/if}} {{/if}} - <div id="nav-{{$notification.type}}-menu"></div> - <div id="nav-{{$notification.type}}-loading" style="display: none;"> + <div id="nav-{{$notification.type}}-menu" class="list-group"></div> + <div id="nav-{{$notification.type}}-loading" class="list-group-item border-0" style="display: none;"> {{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> |