Themes: allow multiple active at once; default site theme is opt-in (checkbox) - #312
Merged
Merged
Conversation
Activating a theme no longer deactivates the others. A theme's "active" state is now the same module flag every module uses (multiple can be active, their layouts/assets available); which one is the DEFAULT site theme is the separate `tiger.theme` config, changed only on request. This replaces the "one active theme per scope" behavior (activating one silently replaced the previous), and supersedes the Flag 3 "multiple active is unpredictable" notice (#311) — multiple active is now the normal, supported case. - library/Tiger/Theme.php: `activate($slug, $makeDefault = true)` — always links assets; sets `tiger.theme` only when $makeDefault (default true keeps the headless installer's behavior). - modules/system/services/Modules.php: `_toggleTheme` maintains the module active flag (setActive) and passes `make_default` through to `Tiger_Theme::activate`; `_isModuleActive` (delete guard) reads the flag like any module. - modules/system/controllers/ModulesController.php: theme "active" = the flag; exposes `is_default` (the theme whose key == tiger.theme). - modules/system/views/scripts/modules/index.phtml: on theme Activate, a confirm with a "Make <name> the default site theme" CHECKBOX (pre-checked only when nothing is default yet); only sends make_default=1 when ticked. A "Default" badge marks the current default theme. - themes/puma/assets/js/tiger.modal.js: TigerModal.confirm gains an optional `checkbox: {label, checked}` — with it, confirm resolves { confirmed, checked } (backward-compatible; without it, a bare boolean as before). Proven: the shipped handleToggle sends make_default only when the box is ticked (JS harness), and the server keeps every theme active while moving the default only on request (dev: activate B without the box → A and B both active, default stays A; deactivating the default clears it). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ASauLLscjqdsNqBNsx2Typ
The theme-activation semantics changed (Themes: allow multiple active): activating a theme sets the module active FLAG (multiple can be active) and writes tiger.theme only when make_default is set; Tiger_Theme::activate() returns a 'default' flag. Bring the integration tests to the new contract. - ModulesServiceThemeTest: activating sets the flag and does NOT change the default unless make_default is passed; deactivating the default clears the flag + tiger.theme. - ThemeActivateTest: activate() return array now carries 'default' => true. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ASauLLscjqdsNqBNsx2Typ
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Activating a theme no longer deactivates the others. Multiple themes can be active at once (their layouts/assets stay available for pages to use); which one is the default site theme is a separate, opt-in choice.
This is the fix for: "You cannot have two default themes. Keep both active. Add a checkbox: Make [name] the default theme. Only switch if checked." It also supersedes the Flag-3 "multiple active is unpredictable" notice (#311) — multiple active is now the normal, supported case.
Root cause
A theme's "active" state was the single
tiger.themeconfig value, so activating theme B (tiger.theme = B) structurally made A stop matching — an implicit, unavoidable deactivation. Now:tiger.theme(one), the chrome for/and any page that doesn't pick its own layout.Changes
Tiger_Theme::activate($slug, $makeDefault = true)— always links assets; setstiger.themeonly when$makeDefault(defaulttruepreserves the headless installer's behavior).System_Service_Modules::_toggleTheme— maintains the module flag (setActive) and passesmake_defaultthrough;_isModuleActive(delete guard) reads the flag.ModulesController— theme "active" = the flag; exposesis_default.make_default=1sent only when ticked. A "Default" badge marks the current default theme.tiger.modal.js—TigerModal.confirmgains an optionalcheckbox: { label, checked }; with it, confirm resolves{ confirmed, checked }(backward-compatible — a bare boolean without it).Proof
handleTogglesendsmake_defaultonly when the box is ticked (JS harness, 3/3).Follow-up (not in this PR)
Phase 2: per-page layout selection so a page can render in any active theme's layout (today
themeContentAction/PageControllerresolve only the default theme). This PR makes multiple themes active; picking a non-default theme's layout per page is the next step.🤖 Generated with Claude Code
https://claude.ai/code/session_01ASauLLscjqdsNqBNsx2Typ