Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion languages/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@
<string name="SYS_ADDITIONAL_CSS_FILE_DESC">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)</string>
<string name="SYS_ADDITIONAL_FILES">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.</string>
<string name="SYS_ADDRESS">Address</string>
<string name="SYS_ADMIDIO">Admidio</string>
<string name="SYS_ADMIDIO_DOWNLOAD_PAGE">Go to the Admidio download page</string>
<string name="SYS_ADMIDIO_HEADLINE_DESC">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)</string>
<string name="SYS_ADMIDIO_SHORT_DESC">The online management system for associations, groups and organizations</string>
<string name="SYS_ADMIDIO_VERSION">Admidio version</string>
<string name="SYS_ADMIDIO_VERSION_BACKUP">Admidio version and backup</string>
<string name="SYS_ADMINISTRATION">Administration</string>
<string name="SYS_ADMINISTRATOR">Administrator</string>
<string name="SYS_ADMINISTRATORS">Administrators</string>
Expand Down
2 changes: 1 addition & 1 deletion modules/preferences.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 2 additions & 2 deletions src/UI/Presenter/PreferencesPresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),

Expand Down Expand Up @@ -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'),
);
Expand Down
5 changes: 5 additions & 0 deletions themes/simple/css/admidio.css
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,11 @@ label {
}
}

.admidio-form-custom-content > div {
padding-top: calc(0.375rem + 1px);
padding-bottom: calc(0.375rem + 1px);
}

/***********************************/
/* Cards */
/***********************************/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="col-sm-9">
<div>
<a id="donate" href="{$admidioHomepage}donate.php" target="_blank">
<i class="bi bi-heart-fill"></i>{$l10n->get('SYS_DONATE')}</a>
<i class="bi bi-heart-fill admidio-icon-chain"></i>{$l10n->get('SYS_DONATE')}</a>
<div class="form-text">{$l10n->get('INS_SUPPORT_FURTHER_DEVELOPMENT')}</div>
</div>
</div>
Expand Down