Merge branch 'friendica:2022.12-rc' into new_image_presentation

[friendica.git] / view / templates / admin / site.tpl

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index ff0640469795db851a475dcfb37183371ea6229d..3861b9b7f4a4e6861ee25a7e7daac7dc4af0bc53 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -37,6 +37,7 @@
                {{include file="field_checkbox.tpl" field=$enable_multi_reg}}
                {{include file="field_checkbox.tpl" field=$enable_openid}}
                {{include file="field_checkbox.tpl" field=$enable_regfullname}}
+               {{include file="field_checkbox.tpl" field=$register_notification}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$upload}}</h2>
@@ -83,15 +84,14 @@
                {{include file="field_checkbox.tpl" field=$disable_embedded}}
                {{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
                {{include file="field_checkbox.tpl" field=$explicit_content}}
+               {{include file="field_checkbox.tpl" field=$proxify_content}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$advanced}}</h2>
-               {{include file="field_select.tpl" field=$rino}}
                {{include file="field_checkbox.tpl" field=$verifyssl}}
                {{include file="field_input.tpl" field=$proxy}}
                {{include file="field_input.tpl" field=$proxyuser}}
                {{include file="field_input.tpl" field=$timeout}}
-               {{include file="field_input.tpl" field=$maxloadavg_frontend}}
                {{include file="field_input.tpl" field=$abandon_days}}
                {{include file="field_input.tpl" field=$temppath}}
                {{include file="field_checkbox.tpl" field=$suppress_tags}}
@@ -108,6 +108,7 @@
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$performance}}</h2>
+               {{include file="field_checkbox.tpl" field=$compute_group_counts}}
                {{include file="field_checkbox.tpl" field=$only_tag_search}}
                {{include file="field_input.tpl" field=$max_comments}}
                {{include file="field_input.tpl" field=$max_display_comments}}
@@ -116,6 +117,7 @@
                {{include file="field_input.tpl" field=$dbclean_unclaimed}}
                {{include file="field_input.tpl" field=$dbclean_expire_conv}}
                {{include file="field_checkbox.tpl" field=$optimize_tables}}
+               {{include file="field_checkbox.tpl" field=$cache_contact_avatar}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$worker_title}}</h2>
@@ -148,14 +150,10 @@
 
        </form>
 
-       {{* separate form for relocate... *}}
-       <form action="{{$baseurl}}/admin/site" method="post">
-               <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+       <div>
                <h2>{{$relocate}}</h2>
-               <p>{{$relocate_warning}}</p>
-               {{include file="field_input.tpl" field=$relocate_url}}
-               <input type="hidden" name="page_site" value="{{$submit}}">
-               <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div>
-       </form>
+               <p>{{$relocate_msg}}</p>
+               <p><code>{{$relocate_cmd}}</code></p>
+       </div>
 
 </div>