first tiny fixes to get the installation running
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -16,7 +16,6 @@ img/
|
|||||||
|
|
||||||
!templates/Froxlor/
|
!templates/Froxlor/
|
||||||
!templates/Sparkle/
|
!templates/Sparkle/
|
||||||
!templates/Sparkl2/
|
|
||||||
!templates/misc/
|
!templates/misc/
|
||||||
templates/Sparkle/assets/css/custom.css
|
templates/Sparkle/assets/css/custom.css
|
||||||
vendor/
|
vendor/
|
||||||
|
|||||||
0
cache/.keep
vendored
Normal file
0
cache/.keep
vendored
Normal file
@@ -33,7 +33,7 @@ class UI
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private static $default_theme = 'Sparkle2';
|
private static $default_theme = 'Froxlor';
|
||||||
|
|
||||||
private static $install_mode = false;
|
private static $install_mode = false;
|
||||||
|
|
||||||
@@ -145,8 +145,8 @@ class UI
|
|||||||
$theme = self::$default_theme;
|
$theme = self::$default_theme;
|
||||||
if (!self::$install_mode) {
|
if (!self::$install_mode) {
|
||||||
// system default
|
// system default
|
||||||
if (\Froxlor\Froxlor::DBVERSION <= 201909150) {
|
if (\Froxlor\Froxlor::DBVERSION <= 202299999) {
|
||||||
\Froxlor\Settings::Set('panel.default_theme', 'Sparkle2');
|
\Froxlor\Settings::Set('panel.default_theme', 'Froxlor');
|
||||||
}
|
}
|
||||||
$theme = (\Froxlor\Settings::Get('panel.default_theme') !== null) ? \Froxlor\Settings::Get('panel.default_theme') : $theme;
|
$theme = (\Froxlor\Settings::Get('panel.default_theme') !== null) ? \Froxlor\Settings::Get('panel.default_theme') : $theme;
|
||||||
// customer theme
|
// customer theme
|
||||||
|
|||||||
BIN
templates/Froxlor/assets/img/logo.png
Normal file
BIN
templates/Froxlor/assets/img/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
templates/Froxlor/assets/img/logo_grey.png
Normal file
BIN
templates/Froxlor/assets/img/logo_grey.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
Reference in New Issue
Block a user