diff --git a/mod/admin.php b/mod/admin.php index 5bf55423e..3a361b7b4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1167,6 +1167,7 @@ function admin_page_site_post(App $a) $relay_scope = ((x($_POST,'relay_scope')) ? Strings::escapeTags(trim($_POST['relay_scope'])) : ''); $relay_server_tags = ((x($_POST,'relay_server_tags')) ? Strings::escapeTags(trim($_POST['relay_server_tags'])) : ''); $relay_user_tags = ((x($_POST,'relay_user_tags')) ? True : False); + $active_panel = (defaults($_POST, 'active_panel', '') ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : ''); // Has the directory url changed? If yes, then resubmit the existing profiles there if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) { @@ -1348,7 +1349,8 @@ function admin_page_site_post(App $a) Config::set('system', 'rino_encrypt', $rino); info(L10n::t('Site settings updated.') . EOL); - $a->internalRedirect('admin/site'); + + $a->internalRedirect('admin/site' . $active_panel); return; // NOTREACHED } @@ -1494,7 +1496,8 @@ function admin_page_site(App $a) '$performance' => L10n::t('Performance'), '$worker_title' => L10n::t('Worker'), '$relay_title' => L10n::t('Message Relay'), - '$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'), + '$relocate' => L10n::t('Relocate Instance'), + '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'), '$baseurl' => System::baseUrl(true), // name, label, value, help string, extra data... '$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''], diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 2b03bb1d4..abf7835e0 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -171,6 +171,7 @@

{{$relocate}}

+ {{$relocate_warning}} {{include file="field_input.tpl" field=$relocate_url}}
diff --git a/view/theme/frio/css/mod_admin.css b/view/theme/frio/css/mod_admin.css index b690577d1..76056d4a1 100644 --- a/view/theme/frio/css/mod_admin.css +++ b/view/theme/frio/css/mod_admin.css @@ -2,6 +2,8 @@ #admin-users.adminpage > h1 { padding: 0 15px; } #admin-users.adminpage .panel-collapse { margin-left: -15px; margin-right: -15px; } +#adminpage.adminpage > h1 { padding: 0 15px; } + #admin-users #users th:first-of-type { width: 1em; } #admin-users #users th:nth-of-type(2) { width: 40px; } #admin-users #users th:last-of-type { width: 1em; } diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl new file mode 100644 index 000000000..0cb2f6252 --- /dev/null +++ b/view/theme/frio/templates/admin/site.tpl @@ -0,0 +1,370 @@ + + + + +
+

{{$title}} - {{$page}}

+ + + +
+ +
+ +
+ + {{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_select.tpl" field=$language}} + {{include file="field_select.tpl" field=$theme}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$ssl_policy}} + {{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}} +
+ +
+
+
+ + +
+ +
+ + {{include file="field_input.tpl" field=$register_text}} + {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_input.tpl" field=$daily_registrations}} + {{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}} +
+ +
+
+
+ + + + +
+ +
+ + {{include file="field_input.tpl" field=$maximagesize}} + {{include file="field_input.tpl" field=$maximagelength}} + {{include file="field_input.tpl" field=$jpegimagequality}} +
+ +
+
+
+ + + +
+ +
+ {{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}} + {{include file="field_checkbox.tpl" field=$force_publish}} + {{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_full_threads}} + + {{if $diaspora_able}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} + {{else}} +
+ + {{$diaspora_not_able}} +
+ {{/if}} + {{include file="field_checkbox.tpl" field=$dfrn_only}} + {{include file="field_input.tpl" field=$global_directory}} +
+ +
+ {{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}} + +
+ +
+
+
+ + +
+ +
+ + {{include file="field_select.tpl" field=$rino}} + {{include file="field_checkbox.tpl" field=$verifyssl}} + {{include file="field_input.tpl" field=$proxy}} + {{include file="field_input.tpl" field=$proxyuser}} + {{include file="field_input.tpl" field=$timeout}} + {{include file="field_input.tpl" field=$maxloadavg_frontend}} + {{include file="field_input.tpl" field=$optimize_max_tablesize}} + {{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}} +
+ +
+
+
+ + +
+ +
+ + {{include file="field_checkbox.tpl" field=$poco_completion}} + {{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_since}} + {{include file="field_checkbox.tpl" field=$poco_local_search}} +
+ +
+
+
+ + +
+ +
+ + {{include file="field_checkbox.tpl" field=$only_tag_search}} + {{include file="field_input.tpl" field=$itemcache}} + {{include file="field_input.tpl" field=$itemcache_duration}} + {{include file="field_input.tpl" field=$max_comments}} + {{include file="field_checkbox.tpl" field=$proxy_disabled}} + {{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}} +
+ +
+
+
+ + +
+ +
+ + {{include file="field_input.tpl" field=$maxloadavg}} + {{include file="field_input.tpl" field=$min_memory}} + {{include file="field_input.tpl" field=$worker_queues}} + {{include file="field_checkbox.tpl" field=$worker_dont_fork}} + {{include file="field_checkbox.tpl" field=$worker_fastlane}} + {{include file="field_checkbox.tpl" field=$worker_frontend}} +
+ +
+
+
+ + +
+ +
+ + {{include file="field_checkbox.tpl" field=$relay_subscribe}} + {{include file="field_input.tpl" field=$relay_server}} + {{include file="field_checkbox.tpl" field=$relay_directly}} + {{include file="field_select.tpl" field=$relay_scope}} + {{include file="field_input.tpl" field=$relay_server_tags}} + {{include file="field_checkbox.tpl" field=$relay_user_tags}} +
+ +
+
+
+ + + +
+ +
+
+ × + {{$relocate_warning}} +
+ {{* separate form for relocate... *}} +
+ + {{include file="field_input.tpl" field=$relocate_url}} + + +
+ +
+
+
+
+