Rename conflicted variable $info in admin settings

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

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 0b46aa9919d83839be4471f7e2643370ec75df7d..bc5e34c3c87492559f7755fbc676976c34c1dd92 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -9,7 +9,8 @@
                                        var theme = $("#id_theme :selected").val();
                                        $("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
                                },*/
-                               href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
+                               iframe: true,
+                               href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val() + "?mode=minimal",
                                onComplete: function(){
                                        $("div#fancybox-content form").submit(function(e){
                                                var url = $(this).attr('action');
@@ -50,7 +51,7 @@
        {{include file="field_textarea.tpl" field=$banner}}
        {{include file="field_input.tpl" field=$shortcut_icon}}
        {{include file="field_input.tpl" field=$touch_icon}}
-       {{include file="field_textarea.tpl" field=$info}}
+       {{include file="field_textarea.tpl" field=$additional_info}}
        {{include file="field_select.tpl" field=$language}}
        {{include file="field_select.tpl" field=$theme}}
        {{include file="field_select.tpl" field=$theme_mobile}}
@@ -58,7 +59,7 @@
        {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
        {{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>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$registration}}</h3>
        {{include file="field_input.tpl" field=$register_text}}
@@ -67,17 +68,23 @@
        {{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>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
+       {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$corporate}}</h3>
        {{include file="field_input.tpl" field=$allowed_sites}}
        {{include file="field_input.tpl" field=$allowed_email}}
+       {{include file="field_input.tpl" field=$forbidden_nicknames}}
        {{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
        {{include file="field_input.tpl" field=$allowed_oembed}}
        {{include file="field_checkbox.tpl" field=$block_public}}
@@ -98,13 +105,14 @@
        {{/if}}
        {{include file="field_checkbox.tpl" field=$dfrn_only}}
        {{include file="field_input.tpl" field=$global_directory}}
-       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}" /></div>
        {{include file="field_checkbox.tpl" field=$newuser_private}}
        {{include file="field_checkbox.tpl" field=$enotify_no_content}}
        {{include file="field_checkbox.tpl" field=$private_addons}}
        {{include file="field_checkbox.tpl" field=$disable_embedded}}
        {{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       {{include file="field_checkbox.tpl" field=$explicit_content}}
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$advanced}}</h3>
        {{include file="field_select.tpl" field=$rino}}
@@ -121,7 +129,7 @@
        {{include file="field_checkbox.tpl" field=$suppress_tags}}
        {{include file="field_checkbox.tpl" field=$nodeinfo}}
        {{include file="field_select.tpl" field=$check_new_version_url}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$portable_contacts}}</h3>
        {{include file="field_checkbox.tpl" field=$poco_completion}}
@@ -129,7 +137,7 @@
        {{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>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$performance}}</h3>
        {{include file="field_checkbox.tpl" field=$only_tag_search}}
@@ -140,7 +148,8 @@
        {{include file="field_checkbox.tpl" field=$dbclean}}
        {{include file="field_input.tpl" field=$dbclean_expire_days}}
        {{include file="field_input.tpl" field=$dbclean_unclaimed}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       {{include file="field_input.tpl" field=$dbclean_expire_conv}}
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$worker_title}}</h3>
        {{include file="field_input.tpl" field=$maxloadavg}}
@@ -150,6 +159,8 @@
        {{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>
+
        <h3>{{$relay_title}}</h3>
        {{include file="field_checkbox.tpl" field=$relay_subscribe}}
        {{include file="field_input.tpl" field=$relay_server}}
@@ -158,7 +169,7 @@
        {{include file="field_input.tpl" field=$relay_server_tags}}
        {{include file="field_checkbox.tpl" field=$relay_user_tags}}
 
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        </form>
 
@@ -166,9 +177,10 @@
        <form action="{{$baseurl}}/admin/site" method="post">
        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
        <h3>{{$relocate}}</h3>
+       <strong>{{$relocate_warning}}</strong>
        {{include file="field_input.tpl" field=$relocate_url}}
-       <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-       <div class="submit"><input type="submit" name="relocate" value="{{$submit|escape:'html'}}" /></div>
+       <input type="hidden" name="page_site" value="{{$submit}}">
+       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div>
        </form>
 
 </div>