X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fsettings.tpl;h=bebd0c12a85df299645ec07f007a6d0cbb5cd86f;hb=399e8cd8e41fd62c317f9da610ceadf12c7bf343;hp=8d0b9dfb9a30d04759b53d207d43a8ae98c7c0fd;hpb=39b19cd0890754c947414ed9eb6d688e12702e0d;p=friendica.git

diff --git a/view/settings.tpl b/view/settings.tpl
index 8d0b9dfb9a..bebd0c12a8 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,148 +1,145 @@
-<h1>Account Settings</h1>
+<h1>$ptitle</h1>
 
 $nickname_block
 
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
-<form action="settings" id="settings-form" method="post" >
+<h3 class="settings-heading">$h_pass</h3>
 
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
-<h3 class="settings-heading">Basic Settings</h3>
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
 
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
+<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" />
-</div>
-<div id="settings-email-end" ></div>
 
+<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}}
 
-<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-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-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
 
+<h3 class="settings-heading">$h_prv</h3>
 
 
+<input type="hidden" name="visibility" value="$visibility" />
 
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
-</div>
+$profile_in_dir
 
+$profile_in_net_dir
 
-<h3 class="settings-heading">Privacy Settings</h3>
+$hide_friends
 
+$hide_wall
 
-<input type="hidden" name="visibility" value="$visibility" />
+$blockwall
 
-$profile_in_dir
+$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}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
 
-$profile_in_net_dir
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</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;" >
+	<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>
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
-</div>
+$group_select
 
 
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
 
-<h3 class="settings-heading">Notification Settings</h3>
 
 
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You 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">Your 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 your 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">You 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>
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
-</div>
+<div id="settings-activity-desc">$activity_options</div>
 
+{{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}}
 
-<h3 class="settings-heading">Password Settings</h3>
 
+<div id="settings-notify-desc">$lbl_not</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 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}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </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>
 </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>
 
 
-<h3 class="settings-heading">Advanced Page Settings</h3>
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype
 
-<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>
-
-
-