Merge https://github.com/annando/friendica into annando

[friendica.git] / view / admin_site.tpl

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 7e442cdfb16630e58e41d174a4cd1cabd674f176..4892dc31455d6ef8379d63823512910bc51af812 100644 (file)
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -48,36 +48,37 @@
        {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
        {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-       {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}  
-       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+       {{ inc $field_input with $field=$register_text }}{{ endinc }}
+       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
+       {{ inc $field_input with $field=$daily_registrations }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
+       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
+       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
+       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
+       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
+       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
+       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
@@ -99,6 +100,7 @@
        {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
        {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
        {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>