X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Fsettings.tpl;h=bebd0c12a85df299645ec07f007a6d0cbb5cd86f;hb=30a9db78f5d5ad6388edf9b57131ef0158347bef;hp=8753474afa00174bb27ad3809c9f9635947ad5b9;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git

diff --git a/view/settings.tpl b/view/settings.tpl
index 8753474afa..bebd0c12a8 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$ptitle</h1>
 
 $nickname_block
@@ -58,9 +56,12 @@ $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;">
@@ -69,6 +70,7 @@ $unkmail
 			{{ 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>
 
@@ -92,16 +94,26 @@ $unkmail
 <br/>
 <div id="settings-default-perms-end"></div>
 
+$group_select
+
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
 
 <h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<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}}
 
-<div id="settings-notify-desc">$lbl_not </div>
+
+<div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -111,8 +123,10 @@ $unkmail
 {{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>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -120,6 +134,7 @@ $unkmail
 
 
 <h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype