X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fsettings.tpl;h=2b739c968a62973bdbe0ff5638e61ef302ea491b;hb=b23ad806ec8cedbc94d721279fd5615f79c4a4c6;hp=d73e45a413e6ca6856e70a308affd5c18ab73596;hpb=6348e70daa113e8b3203de8fbc919d08c90d972e;p=friendica.git

diff --git a/view/settings.tpl b/view/settings.tpl
old mode 100644
new mode 100755
index d73e45a413..2b739c968a
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,49 +1,129 @@
-<h1>Account Settings</h1>
+$tabs
 
-<form action="settings" id="settings-form" method="post" >
+<h1>$ptitle</h1>
 
-<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" />
+$nickname_block
+
+<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>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ 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}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
-<div id="settings-email-end" ></div>
 
-$nickname_block
 
+<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
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+{{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 id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
-$zoneselect
 </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" 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>
+
+	<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
+		</div>
+	</div>
+
+	</div>
 </div>
-<div id="settings-password-end" ></div>
+<br/>
+<div id="settings-default-perms-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>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
-<div id="settings-confirm-end" ></div>
 
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+
+<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}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+</div>
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-</form>
 
+<h3 class="settings-heading">$h_advn</h3>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>