X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fadmin%2Fsite.tpl;h=9ccda33eeb34bf54e1ccbd31f3ef40c133b31587;hb=7fb913eb86e9897de3551811ba4adc9d7caf8c14;hp=11a51649def3c43de3a5e4eac6a3b7324d10059e;hpb=17a6cb18b8fa305a538e079d0e8d5a7403930885;p=friendica.git

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 11a51649de..9ccda33eeb 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -1,56 +1,24 @@
 <script>
 	$(function(){
-
 		$("#cnftheme").click(function(){
-			$.colorbox({
-				width: 800,
-				height: '90%',
-				/*onOpen: function(){
-					var theme = $("#id_theme :selected").val();
-					$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
-				},*/
-				href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
-				onComplete: function(){
-					$("div#fancybox-content form").submit(function(e){
-						var url = $(this).attr('action');
-						// can't get .serialize() to work...
-						var data={};
-						$(this).find("input").each(function(){
-							data[$(this).attr('name')] = $(this).val();
-						});
-						$(this).find("select").each(function(){
-							data[$(this).attr('name')] = $(this).children(":selected").val();
-						});
-						console.log(":)", url, data);
-
-						$.post(url, data, function(data) {
-							if(timer) clearTimeout(timer);
-							NavUpdate();
-							$.colorbox.close();
-						})
-
-						return false;
-					});
-
-				}
-			});
+			document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
 			return false;
 		});
 	});
 </script>
-<div id='adminpage'>
+<div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<form action="{{$baseurl}}/admin/site" method="post">
     <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_input.tpl" field=$email_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 +26,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 +35,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}}
@@ -86,7 +60,6 @@
 	{{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_checkbox.tpl" field=$ostatus_full_threads}}
 
 	{{if $diaspora_able}}
 		{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -98,13 +71,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}}
@@ -117,11 +91,10 @@
 	{{include file="field_input.tpl" field=$optimize_fragmentation}}
 	{{include file="field_input.tpl" field=$abandon_days}}
 	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_input.tpl" field=$basepath}}
 	{{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 +102,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}}
@@ -137,7 +110,11 @@
 	{{include file="field_input.tpl" field=$itemcache_duration}}
 	{{include file="field_input.tpl" field=$max_comments}}
 	{{include file="field_checkbox.tpl" field=$proxy_disabled}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+	{{include file="field_checkbox.tpl" field=$dbclean}}
+	{{include file="field_input.tpl" field=$dbclean_expire_days}}
+	{{include file="field_input.tpl" field=$dbclean_unclaimed}}
+	{{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}}
@@ -147,6 +124,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}}
@@ -155,7 +134,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>
 
@@ -163,9 +142,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>