diff --git a/languages/en.xml b/languages/en.xml index 37be3f010f..bfe18f4395 100644 --- a/languages/en.xml +++ b/languages/en.xml @@ -220,11 +220,11 @@ The path to a .css file with additional style definitions. This file will be loaded last, even after the theme's admidio.css file. (default: empty) This list intends to provide an overview of files and folders not imported into the database yet. They can be added to the database. Access rights will be copied from selected folder. Address + Admidio Go to the Admidio download page The headline is displayed in the navigation bar of Admidio. Here you can also enter the name of a translation string. (default: SYS_ONLINE_MEMBERSHIP_ADMINISTRATION) The online management system for associations, groups and organizations Admidio version - Admidio version and backup Administration Administrator Administrators diff --git a/modules/preferences.php b/modules/preferences.php index ca3074f681..d51abe248a 100644 --- a/modules/preferences.php +++ b/modules/preferences.php @@ -37,7 +37,7 @@ 'defaultValue' => 'html', 'validValues' => array('html', 'html_form', 'save', 'htaccess', 'test_email', 'backup', 'update_check') )); - $getPanel = admFuncVariableIsValid($_GET, 'panel', 'string'); + $getPanel = admFuncVariableIsValid($_GET, 'panel', 'string', array('defaultValue' => 'system_information')); // only administrators are allowed to view, edit organization preferences or create new organizations if (!$gCurrentUser->isAdministrator()) { diff --git a/src/UI/Presenter/PreferencesPresenter.php b/src/UI/Presenter/PreferencesPresenter.php index e8d96feacb..f3b47ba4ac 100644 --- a/src/UI/Presenter/PreferencesPresenter.php +++ b/src/UI/Presenter/PreferencesPresenter.php @@ -79,11 +79,11 @@ private function initialize(): void 'key' => 'system', 'label' => $gL10n->get('SYS_SYSTEM'), 'panels' => array( + array('id'=>'system_information', 'title'=>$gL10n->get('SYS_INFORMATIONS'), 'icon'=>'bi-info-circle-fill', 'subcards'=>true), array('id'=>'common', 'title'=>$gL10n->get('SYS_COMMON'), 'icon'=>'bi-gear-fill', 'subcards'=>false), array('id'=>'design', 'title'=>$gL10n->get('SYS_DESIGN'), 'icon'=>'bi-palette', 'subcards'=>false), array('id'=>'regional_settings', 'title'=>$gL10n->get('ORG_REGIONAL_SETTINGS'), 'icon'=>'bi-globe2', 'subcards'=>false), array('id'=>'changelog', 'title'=>$gL10n->get('SYS_CHANGE_HISTORY'), 'icon'=>'bi-clock-history', 'subcards'=>false), - array('id'=>'system_information', 'title'=>$gL10n->get('SYS_INFORMATIONS'), 'icon'=>'bi-info-circle-fill', 'subcards'=>true), ), ), @@ -2489,7 +2489,7 @@ public function createSystemInformationForm(): string //assign card titles and corresponding template files $cards = array( - array('title'=>$gL10n->get('SYS_ADMIDIO_VERSION_BACKUP'), 'icon'=>'bi-cloud-arrow-down-fill', 'templateFile'=>'preferences/preferences.admidio-update.tpl'), + array('title'=>$gL10n->get('SYS_ADMIDIO'), 'icon'=>'bi-cloud-arrow-down-fill', 'templateFile'=>'preferences/preferences.admidio-update.tpl'), array('title'=>$gL10n->get('SYS_SYSTEM_INFORMATION'), 'icon'=>'bi-info-circle-fill', 'templateFile'=>'preferences/preferences.system-information.tpl'), array('title'=>$gL10n->get('SYS_PHP'), 'icon'=>'bi-filetype-php', 'templateFile'=>'preferences/preferences.php.tpl'), ); diff --git a/themes/simple/css/admidio.css b/themes/simple/css/admidio.css index c6eb64c0a1..0959809ed9 100644 --- a/themes/simple/css/admidio.css +++ b/themes/simple/css/admidio.css @@ -380,6 +380,11 @@ label { } } +.admidio-form-custom-content > div { + padding-top: calc(0.375rem + 1px); + padding-bottom: calc(0.375rem + 1px); +} + /***********************************/ /* Cards */ /***********************************/ diff --git a/themes/simple/templates/preferences/preferences.admidio-update.tpl b/themes/simple/templates/preferences/preferences.admidio-update.tpl index 92c3ca0fc2..db0519bf8d 100644 --- a/themes/simple/templates/preferences/preferences.admidio-update.tpl +++ b/themes/simple/templates/preferences/preferences.admidio-update.tpl @@ -41,7 +41,7 @@
+ {$l10n->get('SYS_DONATE')}
{$l10n->get('INS_SUPPORT_FURTHER_DEVELOPMENT')}