Merge pull request #10543 from annando/app-variables

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index cb948aabe67645e26b04e8e3fe17d5b44d1310a0..493abef61ec4150697a5016c13622e70b9f49de7 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}}
@@ -38,11 +40,6 @@
                <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}}
@@ -87,8 +84,6 @@
                {{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}}
@@ -97,43 +92,49 @@
                <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
                <h2>{{$portable_contacts}}</h2>
-               {{include file="field_checkbox.tpl" field=$poco_completion}}
-               {{include file="field_select.tpl" field=$gcontact_discovery}}
+               {{include file="field_select.tpl" field=$contact_discovery}}
+               {{include file="field_checkbox.tpl" field=$synchronize_directory}}
                {{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_checkbox.tpl" field=$proxy_disabled}}
+               {{include file="field_input.tpl" field=$max_display_comments}}
                {{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}}
                <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>