Merge branch 'ac'

[friendica.git] / view / settings.tpl

diff --git a/view/settings.tpl b/view/settings.tpl
index b79fbfe43c3e8df72ae7bba903b95aa00d75d211..cec3c6f6455ba2cbc24588ca684d4224e72523c3 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,14 +1,9 @@
-$tabs
-
 <h1>$ptitle</h1>
 
 $nickname_block
 
-<div id="uexport-link"><a href="uexport" >$uexport</a></div>
-
-
 <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>
 
@@ -31,7 +26,6 @@ $nickname_block
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_select.tpl with $field=$theme }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -54,23 +48,48 @@ $hide_friends
 
 $hide_wall
 
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+<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>
+                       {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+               </div>
+       </div>
+
+</div>
+
+
 <div id="settings-default-perms" class="settings-default-perms" >
-       <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions $permdesc</div>
+       <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
        <div id="settings-default-perms-menu-end"></div>
 
        <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
        
-               $aclselect
+       <div style="display: none;">
+               <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                       $aclselect
+               </div>
+       </div>
 
        </div>
 </div>
+<br/>
 <div id="settings-default-perms-end"></div>
 
-{{inc field_checkbox.tpl with $field=$blockwall }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire }}{{endinc}}
-
-
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
@@ -80,7 +99,14 @@ $hide_wall
 
 <h3 class="settings-heading">$h_not</h3>
 
-<div id="settings-notify-desc">$lbl_not </div>
+<strong>$activity_options</strong>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -88,6 +114,8 @@ $hide_wall
 {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
 
@@ -95,27 +123,6 @@ $hide_wall
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-{{ if $mail_disabled }}
-
-{{ else }}
-       <h3 class="settings-heading">$h_imap</h3>
-       <p>$imap_desc</p>
-       {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
-       {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
-       {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
-       {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
-       {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
-       {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
-       {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
-       {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
-
-       <div class="settings-submit-wrapper" >
-               <input type="submit" name="submit" class="settings-submit" value="$submit" />
-       </div>
-{{ endif }}
-
-
-
 
 <h3 class="settings-heading">$h_advn</h3>