Merge pull request #8388 from annando/fetch

[friendica.git] / view / templates / settings / settings.tpl

diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index 511dfdcb3d53399a46434fb5c1d662cfbe1883a4..fd0de22da42a7fe1823678dae621c217556081b9 100644 (file)
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -53,35 +53,18 @@
 
 {{$hide_wall nofilter}}
 
+{{$unlisted nofilter}}
+
+{{$accessiblephotos nofilter}}
+
 {{$blockwall nofilter}}
 
 {{$blocktags nofilter}}
 
-{{$suggestme nofilter}}
-
 {{$unkmail nofilter}}
 
-
 {{include file="field_input.tpl" field=$cntunkmail}}
 
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<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>
-                       {{include file="field_checkbox.tpl" field=$expire.items}}
-                       {{include file="field_checkbox.tpl" field=$expire.notes}}
-                       {{include file="field_checkbox.tpl" field=$expire.starred}}
-                       {{include file="field_checkbox.tpl" field=$expire.network_only}}
-               </div>
-       </div>
-
-</div>
-
-
 <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>
@@ -100,15 +83,25 @@
 <div id="settings-default-perms-end"></div>
 
 {{$group_select nofilter}}
-
-
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
+<h3 class="settings-heading"><a href="javascript:;">{{$expire.label}}</a></h3>
+<div class="settings-content-block">
+<div id="settings-expiry">
+{{include file="field_input.tpl" field=$expire.days}}
+{{include file="field_checkbox.tpl" field=$expire.items}}
+{{include file="field_checkbox.tpl" field=$expire.notes}}
+{{include file="field_checkbox.tpl" field=$expire.starred}}
+{{include file="field_checkbox.tpl" field=$expire.network_only}}
 
-
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+</div>
+</div>
 
 <h3 class="settings-heading"><a href="javascript:;">{{$h_not}}</a></h3>
 <div class="settings-content-block">
@@ -171,7 +164,6 @@
 </div>
 </div>
 
-
 <h3 class="settings-heading"><a href="javascript:;">{{$h_advn}}</a></h3>
 <div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
@@ -202,6 +194,3 @@
 <input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
 </div>
-
-
-