Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default

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

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 6791fb87f339d02a3fe964cc7fe6a8089018d664..e1930bc5cb26517b88e9b6d0356706cee9699403 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -45,12 +45,15 @@
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
        {{include file="field_input.tpl" field=$sitename}}
+       {{include file="field_input.tpl" field=$hostname}}
+       {{include file="field_input.tpl" field=$sender_email}}
        {{include file="field_textarea.tpl" field=$banner}}
        {{include file="field_textarea.tpl" field=$info}}
        {{include file="field_select.tpl" field=$language}}
        {{include file="field_select.tpl" field=$theme}}
        {{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=$old_share}}
        {{include file="field_checkbox.tpl" field=$hide_help}}
        {{include file="field_select.tpl" field=$singleuser}}
@@ -111,6 +114,9 @@
        {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
        {{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_checkbox.tpl" field=$old_pager}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        </form>