Merge branch 'master' into develop

[friendica.git] / view / templates / admin_site.tpl

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 1517b9f013a817c83f6afbc773a0dccb9bd35ba5..b08e5f935f6982ebd94a4bb358c06861d4a73f79 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -83,9 +83,25 @@
        {{include file="field_checkbox.tpl" field=$force_publish}}
        {{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}}
-       {{include file="field_select.tpl" field=$ostatus_poll_interval}}
-       {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+
+       {{if $thread_allow.2}}
+               {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+               {{include file="field_select.tpl" field=$ostatus_poll_interval}}
+       {{else}}
+               <div class='field checkbox' id='div_id_{{$ostatus_disabled.0}}'>
+                       <label for='id_{{$ostatus_disabled.0}}'>{{$ostatus_disabled.1}}</label>
+                       <span id='id_{{$ostatus_disabled.0}}'>{{$ostatus_not_able}}</span>
+               </div>
+       {{/if}}
+
+       {{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>
+               </div>
+       {{/if}}
        {{include file="field_checkbox.tpl" field=$dfrn_only}}
        {{include file="field_input.tpl" field=$global_directory}}
        {{include file="field_checkbox.tpl" field=$thread_allow}}
@@ -107,6 +123,8 @@
        {{include file="field_input.tpl" field=$poll_interval}}
        {{include file="field_input.tpl" field=$maxloadavg}}
        {{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=$lockpath}}
        {{include file="field_input.tpl" field=$temppath}}
@@ -114,10 +132,12 @@
        {{include file="field_checkbox.tpl" field=$suppress_language}}
        {{include file="field_checkbox.tpl" field=$suppress_tags}}
        {{include file="field_checkbox.tpl" field=$nodeinfo}}
+       {{include file="field_input.tpl" field=$embedly}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$portable_contacts}}</h3>
        {{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_local_search}}