X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fsettings.tpl;h=099014f135139d7841bd442033bb7df5a9eb3813;hb=f988ed5d15e3697daa41e9a4ee3ac9951ef4c7cc;hp=5a964ae7a3f72285f20882ec232048b43225b80d;hpb=757cef0f113c81680911bc67983f26be9759b3f2;p=friendica.git

diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
index 5a964ae7a3..099014f135 100644
--- a/view/templates/settings.tpl
+++ b/view/templates/settings.tpl
@@ -5,8 +5,8 @@
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<h3 class="settings-heading">{{$h_pass}}</h3>
-
+<h3 class="settings-heading"><a href="javascript:;">{{$h_pass}}</a></h3>
+<div class="settings-content-block">
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
 {{include file="field_password.tpl" field=$password3}}
@@ -16,27 +16,30 @@
 {{/if}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+</div>
 </div>
 
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
+<h3 class="settings-heading"><a href="javascript:;">{{$h_basic}}</a></h3>
+<div class="settings-content-block">
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
 {{include file="field_password.tpl" field=$password4}}
 {{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_select.tpl" field=$language}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+</div>
 </div>
 
 
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
+<h3 class="settings-heading"><a href="javascript:;">{{$h_prv}}</a></h3>
+<div class="settings-content-block">
 
 <input type="hidden" name="visibility" value="{{$visibility}}" />
 
@@ -84,7 +87,7 @@
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
+
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
 			{{$aclselect}}
@@ -100,12 +103,15 @@
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
 </div>
+</div>
+
 
 
 
-<h3 class="settings-heading">{{$h_not}}</h3>
+<h3 class="settings-heading"><a href="javascript:;">{{$h_not}}</a></h3>
+<div class="settings-content-block">
 <div id="settings-notifications">
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
@@ -128,27 +134,89 @@
 {{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
+{{include file="field_checkbox.tpl" field=$email_textonly}}
+{{include file="field_checkbox.tpl" field=$detailed_notif}}
+
+
+<!--
+<div class="field">
+ <button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
+ <span class="field_help">{{$desktop_notifications_note}}</span>
+</div>
+-->
+{{include file="field_yesno.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");
+    }
+	if (getNotificationPermission() === null) {
+		elm.parent(".field.yesno").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());
+
+
+    })
+})();
+</script>
+
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+</div>
 </div>
 
 
-<h3 class="settings-heading">{{$h_advn}}</h3>
+<h3 class="settings-heading"><a href="javascript:;">{{$h_advn}}</a></h3>
+<div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
 {{$pagetype}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+</div>
 </div>
 
-<h3 class="settings-heading">{{$relocate}}</h3>
+<h3 class="settings-heading"><a href="javascript:;">{{$relocate}}</a></h3>
+<div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
+<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button|escape:'html'}}" />
+</div>
 </div>