From 24ac5000484b2f30d970c9ac96f60e71411d9c53 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 6 Jun 2025 16:15:24 -0400 Subject: [PATCH] Minor updates --- wire/config.php | 4 ++-- .../AdminTheme/AdminThemeUikit/AdminThemeUikit.module | 2 +- .../AdminTheme/AdminThemeUikit/themes/default/config.php | 2 +- .../ProcessPagesExportImport.module | 9 ++++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wire/config.php b/wire/config.php index 5dc7d3bf..8ef761a5 100644 --- a/wire/config.php +++ b/wire/config.php @@ -1648,8 +1648,8 @@ $config->adminEmail = ''; * #property bool compress Compress compiled CSS? * #property array customLessFiles Custom .less files to include, relative to PW installation root. * #property string customCssFile Target custom .css file to compile custom .less file(s) to. - * #proeprty bool noDarkMode If theme supports a dark mode, specify true to disable it as an option. - * #proeprty bool noTogcbx If theme supports toggle style checkboxes, disable them. + * #property bool noDarkMode If theme supports a dark mode, specify true to disable it as an option. + * #property bool noTogcbx If theme supports toggle style checkboxes, disable them. * */ $config->AdminThemeUikit = array( diff --git a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module index 21d157ec..875598a7 100644 --- a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module +++ b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module @@ -136,7 +136,7 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl // settings specific to default theme/style $this->setArray([ - 'defaultStyleName' => 'auto', + 'defaultStyleName' => 'light', 'defaultMainColor' => 'red', 'defaultMainColorCustom' => '#eb1d61', 'defaultMainColorCustomDark' => '', diff --git a/wire/modules/AdminTheme/AdminThemeUikit/themes/default/config.php b/wire/modules/AdminTheme/AdminThemeUikit/themes/default/config.php index 02202a21..690fe77e 100644 --- a/wire/modules/AdminTheme/AdminThemeUikit/themes/default/config.php +++ b/wire/modules/AdminTheme/AdminThemeUikit/themes/default/config.php @@ -24,7 +24,7 @@ if(empty($value)) $value = 'auto'; if(!empty($settings['noDarkMode'])) { $darkAttr = [ 'disabled' => 'disabled' ]; $value = 'light'; - $f->notes = __('Dark mode disabled has been disabled by `$config->AdminThemeUikit("noDarkMode")`'); + $f->notes = __('Dark mode has been disabled by `$config->AdminThemeUikit("noDarkMode")`'); } else { $f->notes = __('Individual users can also choose light/dark/auto mode from the user tools menu.'); } diff --git a/wire/modules/Process/ProcessPagesExportImport/ProcessPagesExportImport.module b/wire/modules/Process/ProcessPagesExportImport/ProcessPagesExportImport.module index 1dd448b9..88713937 100644 --- a/wire/modules/Process/ProcessPagesExportImport/ProcessPagesExportImport.module +++ b/wire/modules/Process/ProcessPagesExportImport/ProcessPagesExportImport.module @@ -636,6 +636,7 @@ class ProcessPagesExportImport extends Process { $modules = $this->wire()->modules; $input = $this->wire()->input; + $adminTheme = $this->wire()->adminTheme; /** @var InputfieldForm $form */ $form = $modules->get('InputfieldForm'); @@ -700,16 +701,17 @@ class ProcessPagesExportImport extends Process { $f->startLabel = $this->_('Choose parent'); $checkedDirect = $input->post('import_parent_type') == 'direct' ? "checked='checked'" : ''; $checkedBelow = $checkedDirect ? '' : "checked='checked'"; + $radioClass = $adminTheme->getClass('input-radio'); $f->appendMarkup = "

" . "" . "