Merge pull request #7540 from vinzv/patch-1

[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 7228b9022bd878ea3bdd78d6f9fa119d25fef434..12ea0b83a4e4f50affcf9c1b33591d037b8e5f81 100644 (file)
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -1,43 +1,5 @@
 
 <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;
-                                       });
-
-                               }
-                       });
-                       return false;
-               });
-       });
        $(function(){
                $(".collapse").on('show.bs.collapse', function(e) {
                        var id = $(e.target).attr('id');
@@ -49,6 +11,11 @@
                                $(element).addClass('in');
                        window.scroll(0, $(element).offset().top - 120);
                }
+
+               $("#cnftheme").click(function(){
+                       document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
+                       return false;
+               });
        });
 </script>
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>
@@ -72,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}}
@@ -134,7 +99,11 @@
                                        </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}}
@@ -169,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}}
@@ -221,7 +189,6 @@
                                        {{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}}