Reworked expiration settings

[friendica.git] / view / templates / settings / settings.tpl

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index 3811e4f25c4169e1c25f2f3cb45568b9db63256a..3a847651dcb576bb58bf8ebfee271b64d228d3ab 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -61,27 +61,8 @@
 
 {{$unkmail nofilter}}
 
-
 {{include file="field_input.tpl" field=$cntunkmail}}
 
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-       <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-       <div style="display: none;">
-               <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-                       <h3>{{$expire.advanced}}</h3>
-                       {{include file="field_checkbox.tpl" field=$expire.items}}
-                       {{include file="field_checkbox.tpl" field=$expire.notes}}
-                       {{include file="field_checkbox.tpl" field=$expire.starred}}
-                       {{include file="field_checkbox.tpl" field=$expire.network_only}}
-               </div>
-       </div>
-
-</div>
-
-
 <div id="settings-default-perms" class="settings-default-perms" >
        <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
        <div id="settings-default-perms-menu-end"></div>
@@ -100,15 +81,25 @@
 <div id="settings-default-perms-end"></div>
 
 {{$group_select nofilter}}
-
-
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
+<h3 class="settings-heading"><a href="javascript:;">{{$expire.label}}</a></h3>
+<div class="settings-content-block">
+<div id="settings-expiry">
+{{include file="field_input.tpl" field=$expire.days}}
+{{include file="field_checkbox.tpl" field=$expire.items}}
+{{include file="field_checkbox.tpl" field=$expire.notes}}
+{{include file="field_checkbox.tpl" field=$expire.starred}}
+{{include file="field_checkbox.tpl" field=$expire.network_only}}
 
-
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+</div>
+</div>
 
 <h3 class="settings-heading"><a href="javascript:;">{{$h_not}}</a></h3>
 <div class="settings-content-block">
@@ -133,47 +124,34 @@
 {{include file="field_checkbox.tpl" field=$desktop_notifications}}
 <script>
 (function(){
-    var elm = $("#id_{{$desktop_notifications.0}}_onoff");
-    var ckbox = $("#id_{{$desktop_notifications.0}}");
-
-    if (getNotificationPermission() === 'granted') {
-        ckbox.val(1);
-        elm.find(".off").addClass("hidden");
-        elm.find(".on").removeClass("hidden");
-    }
+       let $notificationField = $("#div_id_{{$desktop_notifications.0}}");
+       let $notificationCheckbox = $("#id_{{$desktop_notifications.0}}");
+
+       if (getNotificationPermission() === 'granted') {
+               $notificationCheckbox.prop('checked', true);
+       }
        if (getNotificationPermission() === null) {
-               elm.parent(".field.yesno").hide();
+               $notificationField.hide();
        }
 
-    $("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
-
-        if (Notification.permission === 'granted') {
-            localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
-        } else if (Notification.permission === 'denied') {
-            localStorage.setItem('notification-permissions', 'denied');
-
-            ckbox.val(0);
-            elm.find(".on").addClass("hidden");
-            elm.find(".off").removeClass("hidden");
-
-        } else if (Notification.permission === 'default') {
-            Notification.requestPermission(function(choice) {
-                if (choice === 'granted') {
-                    localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
-
-                } else {
-                    localStorage.setItem('notification-permissions', 'denied');
-                    ckbox.val(0);
-                    elm.find(".on").addClass("hidden");
-                    elm.find(".off").removeClass("hidden");
-                }
-            });
-        }
-
-               //console.log(getNotificationPermission());
-
-
-    })
+       $notificationCheckbox.on('change', function(e) {
+               if (Notification.permission === 'granted') {
+                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
+               } else if (Notification.permission === 'denied') {
+                       localStorage.setItem('notification-permissions', 'denied');
+
+                       $notificationCheckbox.prop('checked', false);
+               } else if (Notification.permission === 'default') {
+                       Notification.requestPermission(function(choice) {
+                               if (choice === 'granted') {
+                                       localStorage.setItem('notification-permissions', $notificationCheckbox.prop('checked') ? 'granted' : 'denied');
+                               } else {
+                                       localStorage.setItem('notification-permissions', 'denied');
+                                       $notificationCheckbox.prop('checked', false);
+                               }
+                       });
+               }
+       })
 })();
 </script>
 
@@ -184,7 +162,6 @@
 </div>
 </div>
 
-
 <h3 class="settings-heading"><a href="javascript:;">{{$h_advn}}</a></h3>
 <div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
@@ -215,6 +192,3 @@
 <input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
 </div>
-
-
-