Merge branch '2020.03-rc' of https://github.com/friendica/friendica into 2020.03-rc

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 823753768eba3291c96ae961dc004259ba644175..9e601b078c42855fc4c159b1435d201494071d2d 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -15,6 +15,7 @@
        {{include file="field_input.tpl" field=$sitename}}
        {{include file="field_input.tpl" field=$sender_email}}
        {{include file="field_textarea.tpl" field=$banner}}
+       {{include file="field_input.tpl" field=$email_banner}}
        {{include file="field_input.tpl" field=$shortcut_icon}}
        {{include file="field_input.tpl" field=$touch_icon}}
        {{include file="field_textarea.tpl" field=$additional_info}}
@@ -59,7 +60,6 @@
        {{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
        {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-       {{include file="field_checkbox.tpl" field=$ostatus_full_threads}}
 
        {{if $diaspora_able}}
                {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -98,6 +98,7 @@
 
        <h3>{{$portable_contacts}}</h3>
        {{include file="field_checkbox.tpl" field=$poco_completion}}
+       {{include file="field_checkbox.tpl" field=$gcontact_discovery}}
        {{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}}