[checkmk-commits] 6368 FIX Custom color sets are only used by classic theme

Module: check_mk Branch: master Commit: 8eddf44b03451b20c616e458eccf5f9f65cf0ff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eddf44b03451b… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Jul 26 08:52:40 2018 +0200 6368 FIX Custom color sets are only used by classic theme The configurable color set which can be configured in the global settings of the CME are only used for the classic GUI theme and does not apply to the new facelift theme. Change-Id: Ib8ae736d77fc80b9ba66d405b31f1e3d8d77abc6 --- .werks/6368 | 13 +++++++++++++ cmk/gui/htmllib.py | 9 ++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/6368 b/.werks/6368 new file mode 100644 index 0000000..d7fd862 --- /dev/null +++ b/.werks/6368 @@ -0,0 +1,13 @@ +Title: Custom color sets are only used by classic theme +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cme +State: unknown +Version: 1.6.0i1 +Date: 1532585864 + +The configurable color set which can be configured in the +global settings of the CME are only used for the classic +GUI theme and does not apply to the new facelift theme. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 2b8df33..7f13844 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1786,15 +1786,14 @@ class html(HTMLGenerator): if config.custom_style_sheet: self.write('<link rel="stylesheet" type="text/css" href="%s">\n' % config.custom_style_sheet) - if cmk.is_managed_edition(): - import cmk.gui.cme.gui_colors as gui_colors - gui_colors.GUIColors().render_html() - - if self._theme and self._theme != "classic": fname = self._css_filename_for_browser("themes/%s/theme" % self._theme) self.stylesheet(fname) + elif cmk.is_managed_edition(): + import cmk.gui.cme.gui_colors as gui_colors + gui_colors.GUIColors().render_html() + def _plugin_stylesheets(self): plugin_stylesheets = set([])