Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / settings.tpl

diff --git a/view/settings.tpl b/view/settings.tpl
index baf1178447f8c028f82d345c59a417bc4057d19e..b79fbfe43c3e8df72ae7bba903b95aa00d75d211 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,51 +1,128 @@
-<h1>Account Settings</h1>
+$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" >
+
+
+<h3 class="settings-heading">$h_pass</h3>
 
-<form action="settings" id="settings-form" method="post" >
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Username: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
-<div id="settings-username-end" ></div>
 
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{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" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
-<div id="settings-email-end" ></div>
 
 
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+<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>
+       <div id="settings-default-perms-menu-end"></div>
 
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
-$zoneselect
+       <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+       
+               $aclselect
+
+       </div>
 </div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Leave password fields blank unless changing
-</p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
-<input type="password" id="settings-password" name="password" ></input>
+<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" />
 </div>
-<div id="settings-password-end" ></div>
 
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
-<input type="password" id="settings-confirm" name="confirm" ></input>
+
+
+<h3 class="settings-heading">$h_not</h3>
+
+<div id="settings-notify-desc">$lbl_not </div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 </div>
-<div id="settings-confirm-end" ></div>
 
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-</form>
+{{ 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>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+