diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/admin_site.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/main_slider.tpl | 59 | ||||
| -rw-r--r-- | view/tpl/messages_widget.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 14 | ||||
| -rw-r--r-- | view/tpl/settings_account.tpl | 3 |
5 files changed, 54 insertions, 39 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index fa942baff..bad68361b 100644 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -20,7 +20,7 @@ {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} - {{include file="field_checkbox.tpl" field=$enable_context_help}} + {{** include file="field_checkbox.tpl" field=$enable_context_help **}} {{if $directory_server}} {{include file="field_select.tpl" field=$directory_server}} {{/if}} @@ -72,10 +72,10 @@ {{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$delivery_interval}} + {{**include file="field_input.tpl" field=$delivery_interval**}} {{include file="field_input.tpl" field=$delivery_batch_count}} - {{include file="field_input.tpl" field=$force_queue}} - {{include file="field_input.tpl" field=$poll_interval}} + {{**include file="field_input.tpl" field=$force_queue**}} + {{**include file="field_input.tpl" field=$poll_interval**}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$default_expire_days}} {{include file="field_input.tpl" field=$active_expire_days}} diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index f5c573970..a47bb8eae 100644 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -1,43 +1,44 @@ <div id="main-slider" class="slider" > <input id="main-range" type="text" name="cminmax" value="{{$val}}" /> - <div id="profile-jot-text-loading" class="spinner-wrapper"> - <div class="spinner m"></div> - </div> </div> <script> $(document).ready(function() { - var old_cmin = 0; - var old_cmax = 99; + let old_cmin = 0; + let old_cmax = 99; - $("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { - var carr = v.split(","); - if(carr[0] != bParam_cmin) { - old_cmin = bParam_cmin; - bParam_cmin = carr[0]; - } - if(carr[1] != bParam_cmax) { - old_cmax = bParam_cmax; - bParam_cmax = carr[1]; - } - networkRefresh(); - } }); - - var slideTimer = null; - function networkRefresh() { + $("#main-range").jRange({ + isRange: true, + from: 0, + to: 99, + step: 1, + scale: [{{$labels}}], + width:'100%', + showLabels: false, + onstatechange: function(v) { + let carr = v.split(","); - $("#profile-jot-text-loading").show(); + if(carr[0] != bParam_cmin) { + old_cmin = bParam_cmin; + bParam_cmin = carr[0]; + } - if((document.readyState !== "complete") || (slideTimer !== null)) - return; - if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) - return; + if(carr[1] != bParam_cmax) { + old_cmax = bParam_cmax; + bParam_cmax = carr[1]; + } - slideTimer = setTimeout(networkTimerRefresh,2000); - } + }, + onbarclicked: function() { + affinity_network_refresh(); + }, + ondragend: function() { + affinity_network_refresh(); + } + }); - function networkTimerRefresh() { - slideTimer = null; + function affinity_network_refresh() { page_load = true; + next_page = 1; liveUpdate(); } }); diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index ddb21beb5..ee933b392 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -22,7 +22,7 @@ </a> </li> </ul> -<div id="messages-widget" class="border border-top-0 overflow-auto mb-3 clearfix" style="height: 70vh;"> +<div id="messages-widget" class="border-start border-end border-bottom overflow-auto mb-3 clearfix" style="height: 70vh;"> <div id="messages-template" rel="template" class="d-none"> <a href="{6}" class="list-group-item list-group-item-action message" data-b64mid="{0}"> <div class="d-flex w-100 justify-content-between"> @@ -36,6 +36,7 @@ <div class="text-break">{2}</div> </div> <small>{3}</small> + {8} </a> </div> <div id="dm-container" class="list-group list-group-flush" data-offset="10"> @@ -52,6 +53,9 @@ <div class="text-break">{{$e.summary}}</div> </div> <small>{{$e.info}}</small> + {{if $e.unseen_count}} + <span class="badge bg-transparent border border-{{$e.unseen_class}} text-{{$e.unseen_class}} rounded-pill position-absolute bottom-0 end-0 m-2" title="{{$strings.unseen_count}}">{{$e.unseen_count}}</span> + {{/if}} </a> {{/foreach}} <div id="messages-empty" class="list-group-item border-0"{{if $entries}} style="display: none;"{{/if}}> @@ -124,7 +128,8 @@ e.author_name, e.author_addr, e.href, - e.icon + e.icon, + e.unseen_count ? '<span class="badge bg-transparent border border-' + e.unseen_class + ' text-' + e.unseen_class + ' rounded-pill position-absolute bottom-0 end-0 m-2" title="{{$strings.unseen_count}}">' + e.unseen_count + '</span>' : '' ); $('#messages-loading').before(html); }); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 82b3665c3..7a4e909c7 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -306,12 +306,18 @@ if(typeof obj[type] === typeof undefined) return true; + var count = Number(obj[type].count); + + if(obj[type].count) { $('.' + type + '-button').fadeIn(); - if(replace || followup) - $('.' + type + '-update').html(Number(obj[type].count)); - else - $('.' + type + '-update').html(Number(obj[type].count) + Number($('.' + type + '-update').html())); + if(replace || followup) { + $('.' + type + '-update').html(count >= 100 ? '99+' : count); + } + else { + count = count + Number($('.' + type + '-update').html().replace(/\++$/, '')); + $('.' + type + '-update').html(count >= 100 ? '99+' : count); + } } else { $('.' + type + '-update').html('0'); diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index c81f1abbb..2b942d694 100644 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -8,6 +8,9 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="section-content-tools-wrapper"> {{include file="field_input.tpl" field=$email}} + {{if $email_hidden}} + <input type='hidden' name='email' value='{{$email_hidden}}'> + {{/if}} {{include file="field_password.tpl" field=$origpass}} {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} |