X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fsettings%2Fsettings.tpl;h=3a847651dcb576bb58bf8ebfee271b64d228d3ab;hb=101251668cd45dfd0eb2f355959a1a356c64fbdd;hp=d017367fef43b81d57f7b6108837e80c9c4ea707;hpb=69300291f03fe85502df9907014f0ad68ee07c9c;p=friendica.git

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index d017367fef..3a847651dc 100644
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -1,8 +1,8 @@
 <h1>{{$ptitle}}</h1>
 
-{{$nickname_block}}
+{{$nickname_block nofilter}}
 
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<form action="settings" id="settings-form" method="post" autocomplete="off" enctype="multipart/form-data" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <h3 class="settings-heading"><a href="javascript:;">{{$h_pass}}</a></h3>
@@ -16,7 +16,7 @@
 {{/if}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
@@ -33,7 +33,7 @@
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
@@ -45,43 +45,24 @@
 
 {{include file="field_input.tpl" field=$maxreq}}
 
-{{$profile_in_dir}}
+{{$profile_in_dir nofilter}}
 
-{{$profile_in_net_dir}}
+{{$profile_in_net_dir nofilter}}
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
-{{$hide_wall}}
+{{$hide_wall nofilter}}
 
-{{$blockwall}}
+{{$blockwall nofilter}}
 
-{{$blocktags}}
+{{$blocktags nofilter}}
 
-{{$suggestme}}
-
-{{$unkmail}}
+{{$suggestme nofilter}}
 
+{{$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_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.notes}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.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>
@@ -90,7 +71,7 @@
 
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			{{$aclselect}}
+			{{$aclselect nofilter}}
 		</div>
 	</div>
 
@@ -99,22 +80,32 @@
 <br/>
 <div id="settings-default-perms-end"></div>
 
-{{$group_select}}
-
-
+{{$group_select nofilter}}
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<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">
 <div id="settings-notifications">
 
-<div id="settings-notify-desc">{{$lbl_not}}</div>
+<div id="settings-notification-desc">{{$lbl_not}}</div>
 
 <div class="group">
 {{include file="field_intcheckbox.tpl" field=$notify1}}
@@ -130,87 +121,74 @@
 {{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}}
+{{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>
 
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </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>
 
-{{$pagetype}}
+{{$pagetype nofilter}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
-<h3 class="settings-heading"><a href="javascript:;">{{$relocate}}</a></h3>
+<h3 class="settings-heading"><a href="javascript:;">{{$importcontact}}</a></h3>
 <div class="settings-content-block">
-<div id="settings-pagetype-desc">{{$relocate_text}}</div>
+<input type="hidden" name="MAX_FILE_SIZE" value="{{$importcontact_maxsize}}" />
+<div id="settings-pagetype-desc">{{$importcontact_text}}</div>
+<input type="file" name="importcontact-filename" />
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button|escape:'html'}}" />
+<input type="submit" name="importcontact-submit" class="importcontact-submit" value="{{$importcontact_button}}" />
 </div>
 </div>
 
+<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}}" />
+</div>
+</div>