Merge commit 'upstream/master'

[friendica.git] / view / admin_site.tpl

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
old mode 100644 (file)
new mode 100755 (executable)
index c531cbf..9a12298
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -30,6 +30,9 @@
        {{ 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 }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
@@ -40,6 +43,7 @@
        {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
        {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
        {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>