Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution

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

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index bcaed585c21216434d6bda92c22b50e3f8cd2cb7..13270e2ebae29607246f055f354cc939876b2e83 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -59,8 +59,6 @@
        {{include file="field_checkbox.tpl" field=$old_share}}
        {{include file="field_checkbox.tpl" field=$hide_help}}
        {{include file="field_select.tpl" field=$singleuser}}
-
-       
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
        
        <h3>{{$registration}}</h3>
@@ -70,13 +68,13 @@
        {{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}}
-       
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$upload}}</h3>
        {{include file="field_input.tpl" field=$maximagesize}}
        {{include file="field_input.tpl" field=$maximagelength}}
        {{include file="field_input.tpl" field=$jpegimagequality}}
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
        
        <h3>{{$corporate}}</h3>
        {{include file="field_input.tpl" field=$allowed_sites}}
@@ -85,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}}
@@ -99,6 +113,7 @@
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
        
        <h3>{{$advanced}}</h3>
+       {{include file="field_select.tpl" field=$rino}}
        {{include file="field_checkbox.tpl" field=$no_utf}}
        {{include file="field_checkbox.tpl" field=$verifyssl}}
        {{include file="field_input.tpl" field=$proxy}}
@@ -114,6 +129,17 @@
        {{include file="field_input.tpl" field=$basepath}}
        {{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}}
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$performance}}</h3>
        {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}