bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Refactor admin site settings templates

Browse source 
- Fix header hierarchy in admin/site.tpl
- Fix panel display in frio/templates/admin/site.tpl
This commit is contained in:
Hypolite Petovan 2020-04-01 17:22:46 -04:00
parent 5ce404f517
commit fd89572606
3 changed files with 291 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Admin/Site.php
View file

@ -613,7 +613,7 @@ class Site extends BaseAdmin
'$worker_title' => DI::l10n()->t('Worker'), '$worker_title' => DI::l10n()->t('Worker'),
'$relay_title' => DI::l10n()->t('Message Relay'), '$relay_title' => DI::l10n()->t('Message Relay'),
'$relocate' => DI::l10n()->t('Relocate Instance'), '$relocate' => DI::l10n()->t('Relocate Instance'),
'$relocate_warning' => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'), '$relocate_warning' => DI::l10n()->t('<strong>Warning!</strong> Advanced function. Could make this server unreachable.'),
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
// name, label, value, help string, extra data... // name, label, value, help string, extra data...

242
view/templates/admin/site.tpl
View file

@ -1,6 +1,6 @@
<script> <script>
$(function(){ $(function () {
$("#cnftheme").click(function(){ $("#cnftheme").click(function () {
document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val()); document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
return false; return false;
}); });
@ -10,143 +10,143 @@
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$sitename}} {{include file="field_input.tpl" field=$sitename}}
{{include file="field_input.tpl" field=$sender_email}} {{include file="field_input.tpl" field=$sender_email}}
{{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$banner}}
{{include file="field_input.tpl" field=$email_banner}} {{include file="field_input.tpl" field=$email_banner}}
{{include file="field_input.tpl" field=$shortcut_icon}} {{include file="field_input.tpl" field=$shortcut_icon}}
{{include file="field_input.tpl" field=$touch_icon}} {{include file="field_input.tpl" field=$touch_icon}}
{{include file="field_textarea.tpl" field=$additional_info}} {{include file="field_textarea.tpl" field=$additional_info}}
{{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme}}
{{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_mobile}}
{{include file="field_select.tpl" field=$ssl_policy}} {{include file="field_select.tpl" field=$ssl_policy}}
{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} {{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=$hide_help}}
{{include file="field_select.tpl" field=$singleuser}} {{include file="field_select.tpl" field=$singleuser}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$registration}}</h3> <h2>{{$registration}}</h2>
{{include file="field_input.tpl" field=$register_text}} {{include file="field_input.tpl" field=$register_text}}
{{include file="field_select.tpl" field=$register_policy}} {{include file="field_select.tpl" field=$register_policy}}
{{include file="field_input.tpl" field=$daily_registrations}} {{include file="field_input.tpl" field=$daily_registrations}}
{{include file="field_checkbox.tpl" field=$no_multi_reg}} {{include file="field_checkbox.tpl" field=$no_multi_reg}}
{{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_openid}}
{{include file="field_checkbox.tpl" field=$no_regfullname}} {{include file="field_checkbox.tpl" field=$no_regfullname}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$upload}}</h3> <h2>{{$upload}}</h2>
{{include file="field_select.tpl" field=$storagebackend}} {{include file="field_select.tpl" field=$storagebackend}}
{{foreach from=$storageform item=$field}} {{foreach from=$storageform item=$field}}
{{include file=$field.field field=$field}} {{include file=$field.field field=$field}}
{{/foreach}} {{/foreach}}
<hr> <hr>
{{include file="field_input.tpl" field=$maximagesize}} {{include file="field_input.tpl" field=$maximagesize}}
{{include file="field_input.tpl" field=$maximagelength}} {{include file="field_input.tpl" field=$maximagelength}}
{{include file="field_input.tpl" field=$jpegimagequality}} {{include file="field_input.tpl" field=$jpegimagequality}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$corporate}}</h3> <h2>{{$corporate}}</h2>
{{include file="field_input.tpl" field=$allowed_sites}} {{include file="field_input.tpl" field=$allowed_sites}}
{{include file="field_input.tpl" field=$allowed_email}} {{include file="field_input.tpl" field=$allowed_email}}
{{include file="field_input.tpl" field=$forbidden_nicknames}} {{include file="field_input.tpl" field=$forbidden_nicknames}}
{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}} {{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
{{include file="field_input.tpl" field=$allowed_oembed}} {{include file="field_input.tpl" field=$allowed_oembed}}
{{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$block_public}}
{{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$force_publish}}
{{include file="field_select.tpl" field=$community_page_style}} {{include file="field_select.tpl" field=$community_page_style}}
{{include file="field_input.tpl" field=$max_author_posts_community_page}} {{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_disabled}}
{{if $diaspora_able}} {{if $diaspora_able}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
{{else}} {{else}}
<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'> <div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label> <label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span> <span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
</div> </div>
{{/if}} {{/if}}
{{include file="field_checkbox.tpl" field=$dfrn_only}} {{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="field_input.tpl" field=$global_directory}} {{include file="field_input.tpl" field=$global_directory}}
<div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}" /></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=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}} {{include file="field_checkbox.tpl" field=$enotify_no_content}}
{{include file="field_checkbox.tpl" field=$private_addons}} {{include file="field_checkbox.tpl" field=$private_addons}}
{{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$disable_embedded}}
{{include file="field_checkbox.tpl" field=$allow_users_remote_self}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
{{include file="field_checkbox.tpl" field=$explicit_content}} {{include file="field_checkbox.tpl" field=$explicit_content}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$advanced}}</h3> <h2>{{$advanced}}</h2>
{{include file="field_select.tpl" field=$rino}} {{include file="field_select.tpl" field=$rino}}
{{include file="field_checkbox.tpl" field=$verifyssl}} {{include file="field_checkbox.tpl" field=$verifyssl}}
{{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxy}}
{{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$proxyuser}}
{{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$timeout}}
{{include file="field_input.tpl" field=$maxloadavg_frontend}} {{include file="field_input.tpl" field=$maxloadavg_frontend}}
{{include file="field_input.tpl" field=$optimize_max_tablesize}} {{include file="field_input.tpl" field=$optimize_max_tablesize}}
{{include file="field_input.tpl" field=$optimize_fragmentation}} {{include file="field_input.tpl" field=$optimize_fragmentation}}
{{include file="field_input.tpl" field=$abandon_days}} {{include file="field_input.tpl" field=$abandon_days}}
{{include file="field_input.tpl" field=$temppath}} {{include file="field_input.tpl" field=$temppath}}
{{include file="field_checkbox.tpl" field=$suppress_tags}} {{include file="field_checkbox.tpl" field=$suppress_tags}}
{{include file="field_checkbox.tpl" field=$nodeinfo}} {{include file="field_checkbox.tpl" field=$nodeinfo}}
{{include file="field_select.tpl" field=$check_new_version_url}} {{include file="field_select.tpl" field=$check_new_version_url}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$portable_contacts}}</h3> <h2>{{$portable_contacts}}</h2>
{{include file="field_checkbox.tpl" field=$poco_completion}} {{include file="field_checkbox.tpl" field=$poco_completion}}
{{include file="field_select.tpl" field=$gcontact_discovery}} {{include file="field_select.tpl" field=$gcontact_discovery}}
{{include file="field_input.tpl" field=$poco_requery_days}} {{include file="field_input.tpl" field=$poco_requery_days}}
{{include file="field_select.tpl" field=$poco_discovery}} {{include file="field_select.tpl" field=$poco_discovery}}
{{include file="field_select.tpl" field=$poco_discovery_since}} {{include file="field_select.tpl" field=$poco_discovery_since}}
{{include file="field_checkbox.tpl" field=$poco_local_search}} {{include file="field_checkbox.tpl" field=$poco_local_search}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$performance}}</h3> <h2>{{$performance}}</h2>
{{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_checkbox.tpl" field=$only_tag_search}}
{{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}} {{include file="field_input.tpl" field=$itemcache_duration}}
{{include file="field_input.tpl" field=$max_comments}} {{include file="field_input.tpl" field=$max_comments}}
{{include file="field_checkbox.tpl" field=$proxy_disabled}} {{include file="field_checkbox.tpl" field=$proxy_disabled}}
{{include file="field_checkbox.tpl" field=$dbclean}} {{include file="field_checkbox.tpl" field=$dbclean}}
{{include file="field_input.tpl" field=$dbclean_expire_days}} {{include file="field_input.tpl" field=$dbclean_expire_days}}
{{include file="field_input.tpl" field=$dbclean_unclaimed}} {{include file="field_input.tpl" field=$dbclean_unclaimed}}
{{include file="field_input.tpl" field=$dbclean_expire_conv}} {{include file="field_input.tpl" field=$dbclean_expire_conv}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$worker_title}}</h3> <h2>{{$worker_title}}</h2>
{{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$maxloadavg}}
{{include file="field_input.tpl" field=$min_memory}} {{include file="field_input.tpl" field=$min_memory}}
{{include file="field_input.tpl" field=$worker_queues}} {{include file="field_input.tpl" field=$worker_queues}}
{{include file="field_checkbox.tpl" field=$worker_dont_fork}} {{include file="field_checkbox.tpl" field=$worker_dont_fork}}
{{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_fastlane}}
{{include file="field_checkbox.tpl" field=$worker_frontend}} {{include file="field_checkbox.tpl" field=$worker_frontend}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
<h3>{{$relay_title}}</h3> <h2>{{$relay_title}}</h2>
{{include file="field_checkbox.tpl" field=$relay_subscribe}} {{include file="field_checkbox.tpl" field=$relay_subscribe}}
{{include file="field_input.tpl" field=$relay_server}} {{include file="field_input.tpl" field=$relay_server}}
{{include file="field_checkbox.tpl" field=$relay_directly}} {{include file="field_checkbox.tpl" field=$relay_directly}}
{{include file="field_select.tpl" field=$relay_scope}} {{include file="field_select.tpl" field=$relay_scope}}
{{include file="field_input.tpl" field=$relay_server_tags}} {{include file="field_input.tpl" field=$relay_server_tags}}
{{include file="field_checkbox.tpl" field=$relay_user_tags}} {{include file="field_checkbox.tpl" field=$relay_user_tags}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
</form> </form>
{{* separate form for relocate... *}} {{* separate form for relocate... *}}
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<h3>{{$relocate}}</h3> <h2>{{$relocate}}</h2>
<strong>{{$relocate_warning}}</strong> <p>{{$relocate_warning}}</p>
{{include file="field_input.tpl" field=$relocate_url}} {{include file="field_input.tpl" field=$relocate_url}}
<input type="hidden" name="page_site" value="{{$submit}}"> <input type="hidden" name="page_site" value="{{$submit}}">
<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div> <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div>
</form> </form>
</div> </div>

329
view/theme/frio/templates/admin/site.tpl
View file

@ -1,4 +1,3 @@
<script> <script>
$(function(){ $(function(){
$(".collapse").on('show.bs.collapse', function(e) { $(".collapse").on('show.bs.collapse', function(e) {
@ -20,38 +19,40 @@
</script> </script>
<link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/> <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
<div id='adminpage' class="adminpage generic-page-wrapper"> <div id="adminpage" class="adminpage generic-page-wrapper">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/site" method="post"> <div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='active_panel' value=''> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true"> <input type="hidden" name="active_panel" value="">
<!-- <!--
/* /*
* General Information * General Information
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-general"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-general">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-general-collapse" aria-expanded="false" aria-controls="admin-settings-general-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-general-collapse" aria-expanded="false" aria-controls="admin-settings-general-collapse">
General Information General Information
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-general-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-general"> <div id="admin-settings-general-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-general">
{{include file="field_input.tpl" field=$sitename}} <div class="panel-body">
{{include file="field_input.tpl" field=$sender_email}} {{include file="field_input.tpl" field=$sitename}}
{{include file="field_textarea.tpl" field=$banner}} {{include file="field_input.tpl" field=$sender_email}}
{{include file="field_input.tpl" field=$shortcut_icon}} {{include file="field_textarea.tpl" field=$banner}}
{{include file="field_input.tpl" field=$touch_icon}} {{include file="field_input.tpl" field=$shortcut_icon}}
{{include file="field_textarea.tpl" field=$additional_info}} {{include file="field_input.tpl" field=$touch_icon}}
{{include file="field_select.tpl" field=$language}} {{include file="field_textarea.tpl" field=$additional_info}}
{{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme}}
{{include file="field_select.tpl" field=$ssl_policy}} {{include file="field_select.tpl" field=$theme_mobile}}
{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} {{include file="field_select.tpl" field=$ssl_policy}}
{{include file="field_checkbox.tpl" field=$hide_help}} {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
{{include file="field_select.tpl" field=$singleuser}} {{include file="field_checkbox.tpl" field=$hide_help}}
{{include file="field_select.tpl" field=$singleuser}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -63,21 +64,22 @@
* Registration * Registration
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-registration"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-registration">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-registration-collapse" aria-expanded="false" aria-controls="admin-settings-registration-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-registration-collapse" aria-expanded="false" aria-controls="admin-settings-registration-collapse">
{{$registration}} {{$registration}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-registration-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-registration"> <div id="admin-settings-registration-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-registration">
<div class="panel-body">
{{include file="field_input.tpl" field=$register_text}} {{include file="field_input.tpl" field=$register_text}}
{{include file="field_select.tpl" field=$register_policy}} {{include file="field_select.tpl" field=$register_policy}}
{{include file="field_input.tpl" field=$daily_registrations}} {{include file="field_input.tpl" field=$daily_registrations}}
{{include file="field_checkbox.tpl" field=$no_multi_reg}} {{include file="field_checkbox.tpl" field=$no_multi_reg}}
{{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_openid}}
{{include file="field_checkbox.tpl" field=$no_regfullname}} {{include file="field_checkbox.tpl" field=$no_regfullname}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -91,22 +93,24 @@
* File upload * File upload
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-upload"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-upload">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-upload-collapse" aria-expanded="false" aria-controls="admin-settings-upload-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-upload-collapse" aria-expanded="false" aria-controls="admin-settings-upload-collapse">
{{$upload}} {{$upload}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-upload-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-upload"> <div id="admin-settings-upload-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-upload">
{{include file="field_select.tpl" field=$storagebackend}} <div class="panel-body">
{{foreach from=$storageform item=$field}} {{include file="field_select.tpl" field=$storagebackend}}
{{include file=$field.field field=$field}} {{foreach from=$storageform item=$field}}
{{/foreach}} {{include file=$field.field field=$field}}
<hr> {{/foreach}}
{{include file="field_input.tpl" field=$maximagesize}} <hr>
{{include file="field_input.tpl" field=$maximagelength}} {{include file="field_input.tpl" field=$maximagesize}}
{{include file="field_input.tpl" field=$jpegimagequality}} {{include file="field_input.tpl" field=$maximagelength}}
{{include file="field_input.tpl" field=$jpegimagequality}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -119,46 +123,47 @@
* Corporate * Corporate
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-corporate"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-corporate">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-corporate-collapse" aria-expanded="false" aria-controls="admin-settings-corporate-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-corporate-collapse" aria-expanded="false" aria-controls="admin-settings-corporate-collapse">
{{$corporate}} {{$corporate}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-corporate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-corporate"> <div id="admin-settings-corporate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-corporate">
{{include file="field_input.tpl" field=$allowed_sites}} <div class="panel-body">
{{include file="field_input.tpl" field=$allowed_email}} {{include file="field_input.tpl" field=$allowed_sites}}
{{include file="field_input.tpl" field=$forbidden_nicknames}} {{include file="field_input.tpl" field=$allowed_email}}
{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}} {{include file="field_input.tpl" field=$forbidden_nicknames}}
{{include file="field_input.tpl" field=$allowed_oembed}} {{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
{{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_input.tpl" field=$allowed_oembed}}
{{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$block_public}}
{{include file="field_select.tpl" field=$community_page_style}} {{include file="field_checkbox.tpl" field=$force_publish}}
{{include file="field_input.tpl" field=$max_author_posts_community_page}} {{include file="field_select.tpl" field=$community_page_style}}
{{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_disabled}}
{{if $diaspora_able}} {{if $diaspora_able}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
{{else}} {{else}}
<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'> <div class="field checkbox" id="div_id_{{$diaspora_enabled.0}}">
<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label> <label for="id_{{$diaspora_enabled.0}}">{{$diaspora_enabled.1}}</label>
<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span> <span id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="field_input.tpl" field=$global_directory}}
<p>
<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
</p>
{{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}}
{{include file="field_checkbox.tpl" field=$explicit_content}}
</div> </div>
{{/if}}
{{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}}"/>
</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}}
{{include file="field_checkbox.tpl" field=$explicit_content}}
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -170,28 +175,29 @@
* Corporate * Corporate
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-$dvanced"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-$dvanced">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-advanced-collapse" aria-expanded="false" aria-controls="admin-settings-advanced-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-advanced-collapse" aria-expanded="false" aria-controls="admin-settings-advanced-collapse">
{{$advanced}} {{$advanced}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-advanced-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-advanced"> <div id="admin-settings-advanced-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-advanced">
<div class="panel-body">
{{include file="field_select.tpl" field=$rino}} {{include file="field_select.tpl" field=$rino}}
{{include file="field_checkbox.tpl" field=$verifyssl}} {{include file="field_checkbox.tpl" field=$verifyssl}}
{{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxy}}
{{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$proxyuser}}
{{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$timeout}}
{{include file="field_input.tpl" field=$maxloadavg_frontend}} {{include file="field_input.tpl" field=$maxloadavg_frontend}}
{{include file="field_input.tpl" field=$optimize_max_tablesize}} {{include file="field_input.tpl" field=$optimize_max_tablesize}}
{{include file="field_input.tpl" field=$optimize_fragmentation}} {{include file="field_input.tpl" field=$optimize_fragmentation}}
{{include file="field_input.tpl" field=$abandon_days}} {{include file="field_input.tpl" field=$abandon_days}}
{{include file="field_input.tpl" field=$temppath}} {{include file="field_input.tpl" field=$temppath}}
{{include file="field_checkbox.tpl" field=$suppress_tags}} {{include file="field_checkbox.tpl" field=$suppress_tags}}
{{include file="field_checkbox.tpl" field=$nodeinfo}} {{include file="field_checkbox.tpl" field=$nodeinfo}}
{{include file="field_select.tpl" field=$check_new_version_url}} {{include file="field_select.tpl" field=$check_new_version_url}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -203,21 +209,22 @@
* Contact Directory * Contact Directory
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-contacts"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-contacts">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contacts-collapse" aria-expanded="false" aria-controls="admin-settings-contacts-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contacts-collapse" aria-expanded="false" aria-controls="admin-settings-contacts-collapse">
{{$portable_contacts}} {{$portable_contacts}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-contacts-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-cocontactsrporate"> <div id="admin-settings-contacts-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-cocontactsrporate">
<div class="panel-body">
{{include file="field_checkbox.tpl" field=$poco_completion}} {{include file="field_checkbox.tpl" field=$poco_completion}}
{{include file="field_select.tpl" field=$gcontact_discovery}} {{include file="field_select.tpl" field=$gcontact_discovery}}
{{include file="field_input.tpl" field=$poco_requery_days}} {{include file="field_input.tpl" field=$poco_requery_days}}
{{include file="field_select.tpl" field=$poco_discovery}} {{include file="field_select.tpl" field=$poco_discovery}}
{{include file="field_select.tpl" field=$poco_discovery_since}} {{include file="field_select.tpl" field=$poco_discovery_since}}
{{include file="field_checkbox.tpl" field=$poco_local_search}} {{include file="field_checkbox.tpl" field=$poco_local_search}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -229,24 +236,25 @@
* Performance * Performance
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-performance"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-performance">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-performance-collapse" aria-expanded="false" aria-controls="admin-settings-performance-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-performance-collapse" aria-expanded="false" aria-controls="admin-settings-performance-collapse">
{{$performance}} {{$performance}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-performance-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-performance"> <div id="admin-settings-performance-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-performance">
<div class="panel-body">
{{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_checkbox.tpl" field=$only_tag_search}}
{{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}} {{include file="field_input.tpl" field=$itemcache_duration}}
{{include file="field_input.tpl" field=$max_comments}} {{include file="field_input.tpl" field=$max_comments}}
{{include file="field_checkbox.tpl" field=$proxy_disabled}} {{include file="field_checkbox.tpl" field=$proxy_disabled}}
{{include file="field_checkbox.tpl" field=$dbclean}} {{include file="field_checkbox.tpl" field=$dbclean}}
{{include file="field_input.tpl" field=$dbclean_expire_days}} {{include file="field_input.tpl" field=$dbclean_expire_days}}
{{include file="field_input.tpl" field=$dbclean_unclaimed}} {{include file="field_input.tpl" field=$dbclean_unclaimed}}
{{include file="field_input.tpl" field=$dbclean_expire_conv}} {{include file="field_input.tpl" field=$dbclean_expire_conv}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -258,21 +266,22 @@
* Worker * Worker
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-worker"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-worker">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse">
{{$worker_title}} {{$worker_title}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-worker-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-worker"> <div id="admin-settings-worker-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-worker">
<div class="panel-body">
{{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$maxloadavg}}
{{include file="field_input.tpl" field=$min_memory}} {{include file="field_input.tpl" field=$min_memory}}
{{include file="field_input.tpl" field=$worker_queues}} {{include file="field_input.tpl" field=$worker_queues}}
{{include file="field_checkbox.tpl" field=$worker_dont_fork}} {{include file="field_checkbox.tpl" field=$worker_dont_fork}}
{{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_fastlane}}
{{include file="field_checkbox.tpl" field=$worker_frontend}} {{include file="field_checkbox.tpl" field=$worker_frontend}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
@ -284,55 +293,55 @@
* Relay * Relay
*/ --> */ -->
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="admin-relay-corporate"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-relay-corporate">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse">
{{$relay_title}} {{$relay_title}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="admin-settings-relay-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relay"> <div id="admin-settings-relay-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relay">
<div class="panel-body">
{{include file="field_checkbox.tpl" field=$relay_subscribe}} {{include file="field_checkbox.tpl" field=$relay_subscribe}}
{{include file="field_input.tpl" field=$relay_server}} {{include file="field_input.tpl" field=$relay_server}}
{{include file="field_checkbox.tpl" field=$relay_directly}} {{include file="field_checkbox.tpl" field=$relay_directly}}
{{include file="field_select.tpl" field=$relay_scope}} {{include file="field_select.tpl" field=$relay_scope}}
{{include file="field_input.tpl" field=$relay_server_tags}} {{include file="field_input.tpl" field=$relay_server_tags}}
{{include file="field_checkbox.tpl" field=$relay_user_tags}} {{include file="field_checkbox.tpl" field=$relay_user_tags}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<!-- <!--
/* /*
* Relocate * Relocate
*/ --> */ -->
<div class="panel"> <form class="panel" action="{{$baseurl}}/admin/site" method="post">
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-relocate"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<h4> <input type="hidden" name="page_site" value="{{$submit}}">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relocate-collapse" aria-expanded="false" aria-controls="admin-settings-relocate-collapse"> <input type="hidden" name="active_panel" value="admin-settings-relocate-collapse">
{{$relocate}} <div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-relocate">
</a> <h2>
</h4> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relocate-collapse" aria-expanded="false" aria-controls="admin-settings-relocate-collapse">
</div> {{$relocate}}
<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate"> </a>
<div class="alert alert-danger alert-dismissible"> </h2>
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>{{$relocate_warning}}</strong>
</div> </div>
{{* separate form for relocate... *}} <div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
<form action="{{$baseurl}}/admin/site" method="post"> <div class="panel-body">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="alert alert-danger alert-dismissible">
{{include file="field_input.tpl" field=$relocate_url}} {{$relocate_warning}}
<input type="hidden" name="page_site" value="{{$submit}}"> </div>
<input type='hidden' name='active_panel' value='admin-settings-relocate-collapse'> {{include file="field_input.tpl" field=$relocate_url}}
</div>
<div class="panel-footer"> <div class="panel-footer">
<input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/> <input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/>
</div> </div>
</form> </div>
</div> </form>
</div> </div>
</div> </div>