Add ability to add multiple sub-templates #8381
Merged
Conversation
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
dragomano
reviewed
Dec 29, 2024
| $before = array_slice(Utils::$context['template_layers'], 0, $position + 1); | ||
| $after = array_slice(Utils::$context['template_layers'], $position + 1); | ||
| Utils::$context['template_layers'] = array_merge($before, ['maint_warning'], $after); | ||
| array_splice(Utils::$context['template_layers'], $position + 1, 0, ['maint_warning']); |
Contributor
There was a problem hiding this comment.
By the way, what is maint_warning? Maybe main_warning, main, or warning?
dragomano
reviewed
Dec 29, 2024
Co-authored-by: Bugo <[email protected]>
Sesquipedalian
requested changes
Dec 30, 2024
Member
Sesquipedalian
left a comment
Sesquipedalian
left a comment
There was a problem hiding this comment.
Aside from indentation issue, LGTM.
Sources/Theme.php
Outdated
Comment on lines
2212
to
2220
| 'thumbnail' => file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : (file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') ? $theme_data['images_url'] . '/thumbnail.png' : ''), | ||
| ]; | ||
| } | ||
|
|
||
| Utils::$context['available_themes'][$id_theme]['selected_variant'] = $_GET['vrt'] ?? (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty(self::$current->settings['default_variant']) ? self::$current->settings['default_variant'] : self::$current->settings['theme_variants'][0])); | ||
| Utils::$context['available_themes'][$id_theme]['selected_variant'] = $_GET['vrt'] ?? (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty(self::$current->settings['default_variant']) ? self::$current->settings['default_variant'] : self::$current->settings['theme_variants'][0])); | ||
|
|
||
| if (!isset(Utils::$context['available_themes'][$id_theme]['variants'][Utils::$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) { | ||
| Utils::$context['available_themes'][$id_theme]['selected_variant'] = self::$current->settings['theme_variants'][0]; | ||
| } | ||
| if (!isset(Utils::$context['available_themes'][$id_theme]['variants'][Utils::$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) { | ||
| Utils::$context['available_themes'][$id_theme]['selected_variant'] = self::$current->settings['theme_variants'][0]; | ||
| } |
Member
There was a problem hiding this comment.
These indentation changes appear to be a mistake.
EDIT: for some reason GitHub isn't showing all the lines I commented on, but this comment was meant to include lines -2195 to +2220 (meaning, the indentation change before 'thumbnail' => ... and all following lines.)
Member
|
The latest commit brought back the weird indentation again |
Contributor
Author
|
right. GitKraken didn't show it. Will reverse that.
…On Tue, Dec 31, 2024 at 1:34 PM Jon Stovell ***@***.***> wrote:
The latest commit brought back the weird indentation again
—
Reply to this email directly, view it on GitHub
<#8381 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AADJNN2BTBRVXG7AVVRNBYL2IL5WTAVCNFSM6AAAAABUKV6KSWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKNRWG4YDANBWHE>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Sesquipedalian
approved these changes
Jan 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We have several templates (layers) that just call others. This commit introduces
Utils::$context['sub_templates']which is a simple list of templates to callBonus: If a template name is array, the second element shall be parametres to pass to the function. Similar structure to $post_errors in the Post action.