Merge pull request #6377 from annando/ostatus-notice

[friendica.git] / view / theme / frio / templates / admin / site.tpl

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index e638a14c953f11a7c7577b306f524249f058e7b3..5d4fd2506eb1908d928556706138da4f4860e23a 100644 (file)
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -10,7 +10,8 @@
                                        var theme = $("#id_theme :selected").val();
                                        $("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
                                },*/
-                               href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
+                iframe: true,
+                href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val() + "?mode=minimal",
                                onComplete: function(){
                                        $("div#fancybox-content form").submit(function(e){
                                                var url = $(this).attr('action');
@@ -40,12 +41,14 @@
        });
        $(function(){
                $(".collapse").on('show.bs.collapse', function(e) {
-                       localStorage.setItem('activeTab', $(e.target).attr('id'));
+                       var id = $(e.target).attr('id');
+                       $("input[name=active_panel]").val(id);
                });
-               var activeTab = localStorage.getItem('activeTab');
-               if (activeTab) {
-                       $("#" + activeTab).collapse('show');
-                       window.scroll(0, $("#" + activeTab).offset().top - 120);
+               var url = document.location.toString();
+               if ( url.match('#') ) {
+                       var element = '#'+url.split('#')[1];
+                               $(element).addClass('in');
+                       window.scroll(0, $(element).offset().top - 120);
                }
        });
 </script>
@@ -55,6 +58,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">
                        <!--
                        /*
@@ -85,7 +89,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>
@@ -111,7 +115,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>
@@ -136,7 +140,7 @@
                                        {{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>
@@ -179,7 +183,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}}
@@ -189,7 +193,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>
@@ -223,7 +227,7 @@
                                        {{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>
@@ -248,7 +252,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>
@@ -277,7 +281,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>
@@ -303,7 +307,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>
@@ -329,7 +333,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>
@@ -348,14 +352,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>