X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fsettings.tpl;h=b79fbfe43c3e8df72ae7bba903b95aa00d75d211;hb=44d7c6aac3548e94e35aed87ba7c06b04f374fc2;hp=84fc3892689bc8ae9871462751e2d1f24164bef3;hpb=a50947a4bc3f779df8fa4e6777bc025fcefc8d21;p=friendica.git

diff --git a/view/settings.tpl b/view/settings.tpl
index 84fc389268..b79fbfe43c 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,54 +1,64 @@
-<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" >
 
-<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" />
-</div>
-<div id="settings-username-end" ></div>
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
 
-<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" />
-</div>
-<div id="settings-email-end" ></div>
 
+<h3 class="settings-heading">$h_pass</h3>
 
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
 
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
-<div id="settings-defloc-end" ></div>
 
 
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
-$theme
+<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-theme-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" onClick="openClose('settings-default-perms-select');" >$permissions</div>
+	<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-default-perms-select" style="display: none;" >
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
 	
 		$aclselect
 
@@ -56,51 +66,63 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send me a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">I receive an introduction</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">My introductions are confirmed</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on my profile wall</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">I receive a private message</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-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="npassword" ></input>
-</div>
-<div id="settings-password-end" ></div>
+{{inc field_checkbox.tpl with $field=$blockwall }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire }}{{endinc}}
+
+
 
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
-<input type="password" id="settings-confirm" name="confirm" ></input>
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
-<div id="settings-confirm-end" ></div>
 
 
 
+<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-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>
+
+