diff --git a/emhttp/plugins/dynamix/include/.login.php b/emhttp/plugins/dynamix/include/.login.php index dc789afbe..26ae52678 100644 --- a/emhttp/plugins/dynamix/include/.login.php +++ b/emhttp/plugins/dynamix/include/.login.php @@ -243,7 +243,7 @@ $isDarkTheme = $themeHelper->isDarkTheme(); ?> - +
diff --git a/emhttp/plugins/dynamix/include/.set-password.php b/emhttp/plugins/dynamix/include/.set-password.php index 67c8a1a1d..7359f10e6 100644 --- a/emhttp/plugins/dynamix/include/.set-password.php +++ b/emhttp/plugins/dynamix/include/.set-password.php @@ -45,7 +45,7 @@ $themeHelper = new ThemeHelper($display['theme']); $isDarkTheme = $themeHelper->isDarkTheme(); ?> - + diff --git a/emhttp/plugins/dynamix/include/Boot.php b/emhttp/plugins/dynamix/include/Boot.php index 9d1423c1a..aed12e972 100644 --- a/emhttp/plugins/dynamix/include/Boot.php +++ b/emhttp/plugins/dynamix/include/Boot.php @@ -27,10 +27,9 @@ $var = parse_ini_file("/var/local/emhttp/var.ini"); require_once "$docroot/plugins/dynamix/include/ThemeHelper.php"; $themeHelper = new ThemeHelper($display['theme']); $themeName = $themeHelper->getThemeName(); -$themeHtmlClass = $themeHelper->getThemeHtmlClass(); ?> -lang="=strtok($locale,'_')?:'en'?>" class="= $themeHtmlClass ?>"> +lang="=strtok($locale,'_')?:'en'?>" class="= $themeHelper->getThemeHtmlClass() ?>"> diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index 681d12566..db6964eeb 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -16,7 +16,6 @@ $themeHelper = new ThemeHelper($display['theme'], $display['width']); $theme = $themeHelper->getThemeName(); // keep $theme, $themes1, $themes2 vars for plugin backwards compatibility for the time being $themes1 = $themeHelper->isTopNavTheme(); $themes2 = $themeHelper->isSidebarTheme(); -$themeHtmlClass = $themeHelper->getThemeHtmlClass(); $themeHelper->updateDockerLogColor($docroot); $display['font'] = filter_var($_COOKIE['fontSize'] ?? $display['font'] ?? '',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); @@ -43,7 +42,7 @@ $buttonPages = find_pages('Buttons'); function annotate($text) {echo "\n\n";} ?> -lang="=strtok($locale,'_')?:'en'?>" class="= $themeHtmlClass ?>"> +lang="=strtok($locale,'_')?:'en'?>" class="= $themeHelper->getThemeHtmlClass() ?>">