Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / settings.tpl

diff --git a/view/settings.tpl b/view/settings.tpl
index e25d67463d9c518a49a532f1b172ef811cbb653f..bebd0c12a85df299645ec07f007a6d0cbb5cd86f 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -70,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>
 
@@ -93,26 +94,26 @@ $unkmail
 <br/>
 <div id="settings-default-perms-end"></div>
 
-<label name="group-selection-lbl" for="group-selection">$group_lbl_select</label>
 $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">
 
-<strong>$activity_options</strong>
+<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"><strong>$lbl_not </strong></div>
+<div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -122,8 +123,10 @@ $group_select
 {{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" />
@@ -131,6 +134,7 @@ $group_select
 
 
 <h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype