Improved control about the contact/server updates

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index a35d1d97ad77c2408e732d1b2606c9cfd8e6cf5e..0440343ba229ddfa49f41230d5ae11760d82e292 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -24,19 +24,20 @@
                {{include file="field_select.tpl" field=$language}}
                {{include file="field_select.tpl" field=$theme}}
                {{include file="field_select.tpl" field=$theme_mobile}}
-               {{include file="field_select.tpl" field=$ssl_policy}}
-               {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
-               {{include file="field_checkbox.tpl" field=$hide_help}}
+               {{include file="field_checkbox.tpl" field=$force_ssl}}
+               {{include file="field_checkbox.tpl" field=$show_help}}
                {{include file="field_select.tpl" field=$singleuser}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$registration}}</h2>
-               {{include file="field_input.tpl" field=$register_text}}
+               {{include file="field_textarea.tpl" field=$register_text}}
                {{include file="field_select.tpl" field=$register_policy}}
+               {{include file="field_input.tpl" field=$max_registered_users}}
                {{include file="field_input.tpl" field=$daily_registrations}}
-               {{include file="field_checkbox.tpl" field=$no_multi_reg}}
-               {{include file="field_checkbox.tpl" field=$no_openid}}
-               {{include file="field_checkbox.tpl" field=$no_regfullname}}
+               {{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>
@@ -72,7 +73,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 +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}}
@@ -101,13 +101,15 @@
 
                <h2>{{$portable_contacts}}</h2>
                {{include file="field_select.tpl" field=$contact_discovery}}
+               {{include file="field_checkbox.tpl" field=$update_active_contacts}}
                {{include file="field_checkbox.tpl" field=$synchronize_directory}}
-               {{include file="field_input.tpl" field=$poco_requery_days}}
                {{include file="field_checkbox.tpl" field=$poco_discovery}}
+               {{include file="field_input.tpl" field=$poco_requery_days}}
                {{include file="field_checkbox.tpl" field=$poco_local_search}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$performance}}</h2>
+               {{include file="field_checkbox.tpl" field=$compute_circle_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 +118,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 +151,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>