X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fadmin%2Fsite.tpl;h=3861b9b7f4a4e6861ee25a7e7daac7dc4af0bc53;hb=c7811576ccb07d760197bc31ee8b49aedcdb62ca;hp=a35d1d97ad77c2408e732d1b2606c9cfd8e6cf5e;hpb=3944e5d38e4a24a19a252048af4f6f170567a7e8;p=friendica.git

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index a35d1d97ad..3861b9b7f4 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -26,7 +26,7 @@
 		{{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=$hide_help}}
+		{{include file="field_checkbox.tpl" field=$show_help}}
 		{{include file="field_select.tpl" field=$singleuser}}
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
@@ -34,9 +34,10 @@
 		{{include file="field_input.tpl" field=$register_text}}
 		{{include file="field_select.tpl" field=$register_policy}}
 		{{include file="field_input.tpl" field=$daily_registrations}}
-		{{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}}
+		{{include file="field_checkbox.tpl" field=$enable_multi_reg}}
+		{{include file="field_checkbox.tpl" field=$enable_openid}}
+		{{include file="field_checkbox.tpl" field=$enable_regfullname}}
+		{{include file="field_checkbox.tpl" field=$register_notification}}
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$upload}}</h2>
@@ -72,7 +73,7 @@
 		{{else}}
 			<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
 				<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-				<span class="field_help" role="tooltip" id="id_{{diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
+				<span class="field_help" role="tooltip" id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
 			</div>
 		{{/if}}
 		{{include file="field_input.tpl" field=$global_directory}}
@@ -83,15 +84,14 @@
 		{{include file="field_checkbox.tpl" field=$disable_embedded}}
 		{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
 		{{include file="field_checkbox.tpl" field=$explicit_content}}
+		{{include file="field_checkbox.tpl" field=$proxify_content}}
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$advanced}}</h2>
-		{{include file="field_select.tpl" field=$rino}}
 		{{include file="field_checkbox.tpl" field=$verifyssl}}
 		{{include file="field_input.tpl" field=$proxy}}
 		{{include file="field_input.tpl" field=$proxyuser}}
 		{{include file="field_input.tpl" field=$timeout}}
-		{{include file="field_input.tpl" field=$maxloadavg_frontend}}
 		{{include file="field_input.tpl" field=$abandon_days}}
 		{{include file="field_input.tpl" field=$temppath}}
 		{{include file="field_checkbox.tpl" field=$suppress_tags}}
@@ -108,6 +108,7 @@
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$performance}}</h2>
+		{{include file="field_checkbox.tpl" field=$compute_group_counts}}
 		{{include file="field_checkbox.tpl" field=$only_tag_search}}
 		{{include file="field_input.tpl" field=$max_comments}}
 		{{include file="field_input.tpl" field=$max_display_comments}}
@@ -116,6 +117,7 @@
 		{{include file="field_input.tpl" field=$dbclean_unclaimed}}
 		{{include file="field_input.tpl" field=$dbclean_expire_conv}}
 		{{include file="field_checkbox.tpl" field=$optimize_tables}}
+		{{include file="field_checkbox.tpl" field=$cache_contact_avatar}}
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$worker_title}}</h2>
@@ -148,14 +150,10 @@
 
 	</form>
 
-	{{* separate form for relocate... *}}
-	<form action="{{$baseurl}}/admin/site" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<div>
 		<h2>{{$relocate}}</h2>
-		<p>{{$relocate_warning}}</p>
-		{{include file="field_input.tpl" field=$relocate_url}}
-		<input type="hidden" name="page_site" value="{{$submit}}">
-		<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div>
-	</form>
+		<p>{{$relocate_msg}}</p>
+		<p><code>{{$relocate_cmd}}</code></p>
+	</div>
 
 </div>