Merge pull request #1460 from FlxAlbroscheit/develop

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

diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
index 2ab4bd466ca9f46d7eca1beb37b6bc825bbf4c0f..95ee0f6fbc4cdc5ed18f81c88f0257509dd14872 100644 (file)
--- a/view/templates/settings.tpl
+++ b/view/templates/settings.tpl
@@ -1,8 +1,3 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
@@ -10,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}}
@@ -21,11 +16,12 @@
 {{/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}}
@@ -36,12 +32,13 @@
 
 
 <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}}" />
 
@@ -89,7 +86,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}}
@@ -105,12 +102,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>
@@ -133,20 +133,40 @@
 {{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
+<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_checkbox.tpl" field=$email_textonly}}
+
 </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"><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|escape:'html'}}" />
+</div>
+</div>
+
+