opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix system style setting (#10820)

This commit is contained in:
Tony Murray 2019-11-17 05:13:48 +00:00 committed by GitHub
parent 8784459927
commit 138dc24f64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LibreNMS/Config.php
View File

@ -419,7 +419,8 @@ class Config
self::set('email_from', '"' . self::get('project_name') . '" <' . self::get('email_user') . '@' . php_uname('n') . '>');
}
// Define some variables if they aren't set by user definition in config_definitions.json
// Define some variables if they aren't set by user definition in config_definitions.json
self::set('applied_site_style', self::get('site_style'));
self::setDefault('html_dir', '%s/html', ['install_dir']);
self::setDefault('rrd_dir', '%s/rrd', ['install_dir']);
self::setDefault('mib_dir', '%s/mibs', ['install_dir']);

2
app/Http/Controllers/UserPreferencesController.php
View File

@ -59,7 +59,7 @@ class UserPreferencesController extends Controller
$locales = $this->getValidLocales();
$styles = $this->getValidStyles();
$default_locale = \config('app.locale');
$default_style = Config::get('site_style_default', Config::get('site_style'));
$default_style = Config::get('site_style');
$data = [
'user' => $user,

3
app/Http/Middleware/LoadUserPreferences.php
View File

@ -25,8 +25,7 @@ class LoadUserPreferences
});
$this->setPreference($request, 'site_style', function ($style) {
Config::set('site_style_default', Config::get('site_style'));
Config::set('site_style', $style);
Config::set('applied_site_style', $style);
});
return $next($request);

2
app/Http/ViewComposers/MenuComposer.php
View File

@ -54,7 +54,7 @@ class MenuComposer
$vars = [];
/** @var User $user */
$user = Auth::user();
$site_style = Config::get('site_style');
$site_style = Config::get('applied_site_style');
//TODO: should be handled via CSS Themes
$vars['navbar'] = in_array($site_style, ['mono', 'dark']) ? 'navbar-inverse' : '';

2
resources/views/layouts/librenmsv1.blade.php
View File

@ -41,7 +41,7 @@
<link href="{{ asset('css/select2-bootstrap.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/query-builder.default.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset(LibreNMS\Config::get('stylesheet', 'css/styles.css')) }}?ver=20190912" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/' . LibreNMS\Config::get('site_style', 'light') . '.css?ver=632417642') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/' . LibreNMS\Config::get('applied_site_style', 'light') . '.css?ver=632417642') }}" rel="stylesheet" type="text/css" />
@foreach(LibreNMS\Config::get('webui.custom_css', []) as $custom_css)
<link href="{{ $custom_css }}" rel="stylesheet" type="text/css" />
@endforeach