Merge remote-tracking branch 'upstream/develop' into fetch-usage

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index dfa8e21a95c155a58b4fc0caf6f514ec93d033de..6e2958b97894454028e097b2d6c6ec7c516e9e5f 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -72,7 +72,7 @@
                {{else}}
                        <div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
                                <label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-                               <span class="field_help" role="tooltip" id="id_{{diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
+                               <span class="field_help" role="tooltip" id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
                        </div>
                {{/if}}
                {{include file="field_input.tpl" field=$global_directory}}
@@ -83,15 +83,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}}
@@ -116,6 +115,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>
@@ -152,7 +152,7 @@
        <form action="{{$baseurl}}/admin/site" method="post">
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                <h2>{{$relocate}}</h2>
-               <p>{{$relocate_warning}}</p>
+               <p>{{$relocate_warning nofilter}}</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>