Remove relocation form from Admin Site settings

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 57e574725d94593c43f92435903136e5ce2a7677..f23cc521e7498243c8cda0c6d26d836575088402 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -12,8 +12,10 @@
        <form action="{{$baseurl}}/admin/site" method="post">
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
+               <h2>{{$general_info}}</h2>
                {{include file="field_input.tpl" field=$sitename}}
                {{include file="field_input.tpl" field=$sender_email}}
+               {{include file="field_input.tpl" field=$system_actor_name}}
                {{include file="field_textarea.tpl" field=$banner}}
                {{include file="field_input.tpl" field=$email_banner}}
                {{include file="field_input.tpl" field=$shortcut_icon}}
@@ -24,7 +26,7 @@
                {{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=$show_help}}
                {{include file="field_select.tpl" field=$singleuser}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
@@ -32,17 +34,12 @@
                {{include file="field_input.tpl" field=$register_text}}
                {{include file="field_select.tpl" field=$register_policy}}
                {{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}}
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$upload}}</h2>
-               {{include file="field_select.tpl" field=$storagebackend}}
-               {{foreach from=$storageform item=$field}}
-                       {{include file=$field.field field=$field}}
-               {{/foreach}}
-               <hr>
                {{include file="field_input.tpl" field=$maximagesize}}
                {{include file="field_input.tpl" field=$maximagelength}}
                {{include file="field_input.tpl" field=$jpegimagequality}}
@@ -59,17 +56,25 @@
                {{include file="field_select.tpl" field=$community_page_style}}
                {{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
-               {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+               {{if $mail_able}}
+                       {{include file="field_checkbox.tpl" field=$mail_enabled}}
+               {{else}}
+                       <div class='field checkbox' id='div_id_{{$mail_enabled.0}}'>
+                               <label for='id_{{$mail_enabled.0}}'>{{$mail_enabled.1}}</label>
+                               <span class="field_help" role="tooltip" id="id_{{$mail_enabled.0}}">{{$mail_not_able}}</span>
+                       </div>
+               {{/if}}
+
+               {{include file="field_checkbox.tpl" field=$ostatus_enabled}}
 
                {{if $diaspora_able}}
                        {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
                {{else}}
                        <div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
                                <label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-                               <span 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_checkbox.tpl" field=$dfrn_only}}
                {{include file="field_input.tpl" field=$global_directory}}
                <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}"/></div>
                {{include file="field_checkbox.tpl" field=$newuser_private}}
@@ -78,17 +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=$optimize_max_tablesize}}
-               {{include file="field_input.tpl" field=$optimize_fragmentation}}
                {{include file="field_input.tpl" field=$abandon_days}}
                {{include file="field_input.tpl" field=$temppath}}
                {{include file="field_checkbox.tpl" field=$suppress_tags}}
@@ -99,56 +101,57 @@
                <h2>{{$portable_contacts}}</h2>
                {{include file="field_select.tpl" field=$contact_discovery}}
                {{include file="field_checkbox.tpl" field=$synchronize_directory}}
-               {{include file="field_checkbox.tpl" field=$poco_completion}}
                {{include file="field_input.tpl" field=$poco_requery_days}}
-               {{include file="field_select.tpl" field=$poco_discovery}}
-               {{include file="field_select.tpl" field=$poco_discovery_since}}
+               {{include file="field_checkbox.tpl" field=$poco_discovery}}
                {{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=$only_tag_search}}
-               {{include file="field_input.tpl" field=$itemcache}}
-               {{include file="field_input.tpl" field=$itemcache_duration}}
                {{include file="field_input.tpl" field=$max_comments}}
                {{include file="field_input.tpl" field=$max_display_comments}}
-               {{include file="field_checkbox.tpl" field=$proxy_disabled}}
                {{include file="field_checkbox.tpl" field=$dbclean}}
                {{include file="field_input.tpl" field=$dbclean_expire_days}}
                {{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>
                {{include file="field_input.tpl" field=$maxloadavg}}
                {{include file="field_input.tpl" field=$min_memory}}
                {{include file="field_input.tpl" field=$worker_queues}}
-               {{include file="field_checkbox.tpl" field=$worker_dont_fork}}
                {{include file="field_checkbox.tpl" field=$worker_fastlane}}
-               {{include file="field_checkbox.tpl" field=$worker_frontend}}
 
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$relay_title}}</h2>
-               {{include file="field_checkbox.tpl" field=$relay_subscribe}}
-               {{include file="field_input.tpl" field=$relay_server}}
-               {{include file="field_checkbox.tpl" field=$relay_directly}}
+               {{if $relay_list}}
+                       <p>{{$relay_list_title}}</p>
+                       <ul id="relay-list">
+                               {{foreach $relay_list as $relay}}
+                               <li>{{$relay.url}}</li>
+                               {{/foreach}}
+                       </ul>
+               {{else}}
+                       <p>{{$no_relay_list}}</p>
+               {{/if}}
+               <p>{{$relay_description}}</p>
                {{include file="field_select.tpl" field=$relay_scope}}
                {{include file="field_input.tpl" field=$relay_server_tags}}
+               {{include file="field_input.tpl" field=$relay_deny_tags}}
                {{include file="field_checkbox.tpl" field=$relay_user_tags}}
+               {{include file="field_checkbox.tpl" field=$relay_directly}}
 
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
        </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>