installer fixes
This commit is contained in:
@@ -753,4 +753,9 @@ class Installer
|
|||||||
'scheduledJobId' => $scheduledJob->getId(),
|
'scheduledJobId' => $scheduledJob->getId(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getLogoSrc(string $theme): string
|
||||||
|
{
|
||||||
|
return $this->getMetadata()->get(['themes', $theme, 'logo']) ?? 'client/img/logo.svg';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,4 +55,4 @@ foreach ($installer->getThemeList() as $item) {
|
|||||||
|
|
||||||
$smarty->assign('themeLabel', $language->translate('theme', 'fields', 'Settings'));
|
$smarty->assign('themeLabel', $language->translate('theme', 'fields', 'Settings'));
|
||||||
$smarty->assign('fields', $fields);
|
$smarty->assign('fields', $fields);
|
||||||
$smarty->assign("themes", $themes);
|
$smarty->assign("themes", $themes);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<div class="panel-heading main-header">
|
<div class="panel-heading main-header">
|
||||||
<img src="../client/img/logo.svg" style="height: 43px;">
|
<img src="../{$logoSrc}" style="height: 43px;">
|
||||||
</div>
|
</div>
|
||||||
<header class="step-header">
|
<header class="step-header">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|||||||
@@ -204,6 +204,10 @@ if (Utils::checkActionExists($action)) {
|
|||||||
include $actionFile;
|
include $actionFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$theme = $_SESSION['install']['theme'] ?? $config->get('theme');
|
||||||
|
|
||||||
|
$smarty->assign('logoSrc', $installer->getLogoSrc($theme));
|
||||||
|
|
||||||
$loaderParamsProvider = $installer->getInjectableFactory()->create(LoaderParamsProvider::class);
|
$loaderParamsProvider = $installer->getInjectableFactory()->create(LoaderParamsProvider::class);
|
||||||
|
|
||||||
if (!empty($actionFile) && file_exists('install/core/tpl/' . $tplName)) {
|
if (!empty($actionFile) && file_exists('install/core/tpl/' . $tplName)) {
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ header.step-header h4 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.panel .modal-footer {
|
.panel .modal-footer {
|
||||||
background-color: var(--panel-bg) !important;
|
background-color: transparent;
|
||||||
|
|
||||||
border-bottom-left-radius: var(--panel-border-radius);
|
border-bottom-left-radius: var(--panel-border-radius);
|
||||||
border-bottom-right-radius: var(--panel-border-radius);
|
border-bottom-right-radius: var(--panel-border-radius);
|
||||||
|
|||||||
Reference in New Issue
Block a user