X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fsettings.tpl;h=ca30f5856b200d7e7708fedfcb3a900f251ec8be;hb=ab7f209fe3986ad751bd3a8ec2e155fcf1f9f130;hp=162299f5d5aae22b0fffd8381606345a724efe85;hpb=e35a5bac55e0e259c7c587adfaf546484b032c92;p=friendica.git

diff --git a/view/settings.tpl b/view/settings.tpl
index 162299f5d5..ca30f5856b 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,15 +1,44 @@
 <h1>$ptitle</h1>
 
+$nickname_block
+
 <div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
 
 $uexport
 
-$nickname_block
-
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 
 
+<h3 class="settings-heading">$lbl_pass1</h3>
+
+
+<div id="settings-password-wrapper" >
+<p id="settings-password-desc" >
+$lbl_pass2
+</p>
+<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
+<input type="password" id="settings-password" name="npassword" />
+</div>
+<div id="settings-password-end" ></div>
+
+<div id="settings-confirm-wrapper" >
+<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
+<input type="password" id="settings-confirm" name="confirm" />
+</div>
+<div id="settings-confirm-end" ></div>
+
+<div id="settings-openid-wrapper" >
+	$oidhtml
+</div>
+<div id="settings-openid-end" ></div>
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
 <h3 class="settings-heading">$lbl_basic</h3>
 
 <div id="settings-username-wrapper" >
@@ -71,15 +100,16 @@ $theme
 <div id="settings-maxreq-end"></div>
 
 
-
-
 $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</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;" >
@@ -96,8 +126,6 @@ $profile_in_net_dir
 </div>
 <div id="settings-blockw-end" ></div>
 
-
-
 <div id="settings-expire-desc">$lbl_exp1 <input type="text" size="3" name="expire" value="$expire" /> $lbl_exp2</div>
 <div id="settings-expire-end"></div>
 
@@ -135,30 +163,35 @@ $profile_in_net_dir
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-
-<h3 class="settings-heading">$lbl_pass1</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-$lbl_pass2
+<h3 class="settings-imap">$lbl_imap0</h3>
+<p>
+$imap_desc
+$mail_disabled
 </p>
-<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
+<p>
+$lbl_imap8 $lbl_imap9
+</p>
+<label for="imap-server" id="settings-label-imap1">$lbl_imap1</label>
+<input type="text" id="imap-server" name="mail_server" value="$imap_server" $imap_disabled />
+<div id="imap-server-end"></div>
+<label for="imap-port" id="settings-label-imap2">$lbl_imap2</label>
+<input type="text" id="imap-port" name="mail_port" value="$imap_port" $imap_disabled />
+<div id="imap-port-end"></div>
+<label for="imap-ssl" id="settings-label-imap3">$lbl_imap3</label>
+<input type="text" id="imap-ssl" name="mail_ssl" value="$imap_ssl" $imap_disabled />
+<div id="imap-ssl-end"></div>
+<label for="imap-user" id="settings-label-imap4">$lbl_imap4</label>
+<input type="text" id="imap-user" name="mail_user" value="$imap_user" $imap_disabled />
+<div id="imap-user-end"></div>
+<label for="imap-pass" id="settings-label-imap5">$lbl_imap5</label>
+<input type="password" id="imap-pass" name="mail_pass" value="" $imap_disabled />
+<div id="imap-pass-end"></div>
+<label for="imap-replyto" id="settings-label-imap6">$lbl_imap6</label>
+<input type="text" id="imap-replyto" name="mail_replyto" value="$imap_replyto" $imap_disabled />
+<div id="imap-replyto-end"></div>
+<label for="imap-pubmail" id="settings-label-imap7">$lbl_imap7</label>
+<input type="checkbox" name="mail_pubmail" id="imap-pubmail" $pubmail_checked value="1" $imap_disabled />
+<div id="imap-pubmail-end"></div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />