X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fadmin%2Fsite.tpl;h=12ea0b83a4e4f50affcf9c1b33591d037b8e5f81;hb=0a82fe4211f73cf10107feb69fe38eaa85eb61f8;hp=6a6deb1e09fc9585b4033cecf4c0095b40412df4;hpb=62f09fdd574842b7453e0897d7e835faae2c6f6e;p=friendica.git

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index 6a6deb1e09..12ea0b83a4 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -1,54 +1,22 @@
 
 <script>
 	$(function(){
+		$(".collapse").on('show.bs.collapse', function(e) {
+			var id = $(e.target).attr('id');
+			$("input[name=active_panel]").val(id);
+		});
+		var url = document.location.toString();
+		if ( url.match('#') ) {
+			var element = '#'+url.split('#')[1];
+				$(element).addClass('in');
+			window.scroll(0, $(element).offset().top - 120);
+		}
 
 		$("#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;
 		});
 	});
-	$(function(){
-		$(".collapse").on('show.bs.collapse', function(e) {
-			localStorage.setItem('activeTab', $(e.target).attr('id'));
-		});
-		var activeTab = localStorage.getItem('activeTab');
-		if (activeTab) {
-			$("#" + activeTab).collapse('show');
-			window.scroll(0, $("#" + activeTab).offset().top - 120);
-			localStorage.removeItem('activeTab');
-		}
-	});
 </script>
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>
 
@@ -56,6 +24,7 @@
 	<h1>{{$title}} - {{$page}}</h1>
 	<form action="{{$baseurl}}/admin/site" method="post">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<input type='hidden' name='active_panel' value=''>
 		<div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
 			<!--
 			/*
@@ -70,14 +39,12 @@
 					</h4>
 				</div>
 				<div id="admin-settings-general-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-general">
-
 					{{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=$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}}
@@ -86,7 +53,7 @@
 					{{include file="field_checkbox.tpl" field=$hide_help}}
 					{{include file="field_select.tpl" field=$singleuser}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -112,7 +79,7 @@
 					{{include file="field_checkbox.tpl" field=$no_openid}}
 					{{include file="field_checkbox.tpl" field=$no_regfullname}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -132,12 +99,16 @@
 					</h4>
 				</div>
 				<div id="admin-settings-upload-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-upload">
-
+					{{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="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -167,7 +138,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}}
@@ -180,7 +150,7 @@
 					{{include file="field_checkbox.tpl" field=$dfrn_only}}
 					{{include file="field_input.tpl" field=$global_directory}}
 					<div class="panel-footer">
-						<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish|escape:'html'}}"/>
+						<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
 					</div>
 					{{include file="field_checkbox.tpl" field=$newuser_private}}
 					{{include file="field_checkbox.tpl" field=$enotify_no_content}}
@@ -190,7 +160,7 @@
 					{{include file="field_checkbox.tpl" field=$explicit_content}}
 
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -219,12 +189,11 @@
 					{{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="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -249,7 +218,7 @@
 					{{include file="field_select.tpl" field=$poco_discovery_since}}
 					{{include file="field_checkbox.tpl" field=$poco_local_search}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -278,7 +247,7 @@
 					{{include file="field_input.tpl" field=$dbclean_unclaimed}}
 					{{include file="field_input.tpl" field=$dbclean_expire_conv}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -304,7 +273,7 @@
 					{{include file="field_checkbox.tpl" field=$worker_fastlane}}
 					{{include file="field_checkbox.tpl" field=$worker_frontend}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -330,7 +299,7 @@
 					{{include file="field_input.tpl" field=$relay_server_tags}}
 					{{include file="field_checkbox.tpl" field=$relay_user_tags}}
 					<div class="panel-footer">
-						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
@@ -349,14 +318,18 @@
 			</h4>
 		</div>
 		<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
-
+			<div class="alert alert-danger alert-dismissible">
+				<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+				<strong>{{$relocate_warning}}</strong>
+			</div>
 			{{* separate form for relocate... *}}
 			<form action="{{$baseurl}}/admin/site" method="post">
 				<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 				{{include file="field_input.tpl" field=$relocate_url}}
-				<input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
+				<input type="hidden" name="page_site" value="{{$submit}}">
+				<input type='hidden' name='active_panel' value='admin-settings-relocate-collapse'>
 				<div class="panel-footer">
-					<input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}"/>
+					<input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/>
 				</div>
 			</form>
 		</div>