[riasvdv]

Description

Redesigns the system messages utility a bit and opens them in slideouts instead of modals

• Changed the content field to a markdown editor
• Added text expander options to the subject and content fields

[github-actions]

📚 Storybook previews

@craftcms/ui — open Storybook

No changed components detected in this Storybook.

resources/js — open Storybook

No changed components detected in this Storybook.

[github-actions]

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the only conflict in the merge from 6.x and committed it as 91d21dc. It hasn't been pushed.

The conflict was in CHANGELOG.md, where both sides added a line at the same spot under "Unreleased":

• This branch added an entry for [6.x] Redesign the System Messages utility #19946 about the new variables attribute on system messages and SystemMessages::getTemplateVariables().
• 6.x added a fix entry for [6.x] Send the element editor's Save button back to the index #19970 about the element editor's "Save" button keeping the user on the edit page.

The two entries cover unrelated changes, so I kept both: the #19946 entry stays with the other "Added" lines, and the #19970 entry goes at the top of the "Fixed a bug…" lines. Nothing was ambiguous, so I didn't add any CONFLICT-REVIEW comments.

All other files merged cleanly and I didn't change them. I didn't run any tests or checks, since the only edit was to the changelog.

[github-actions]

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the merge conflict and committed the merge as 8eced13. Nothing has been pushed.

CHANGELOG.md was the only conflicted file:

• This branch: added a line about system messages' new variables attribute and SystemMessages::getTemplateVariables() ([6.x] Redesign the System Messages utility #19946).
• 6.x: added a set of bug-fix lines ([6.x] UI tweaks #19942).

Both sides only added lines, so I kept all of them. The branch's "Added" line stays with the other "Added" entries, and the #19942 fixes follow it, just before the existing "Fixed" lines.

None of the conflicts were ambiguous, so I left no CONFLICT-REVIEW comments. I didn't run composer ci or any tests, since this was a changelog-only conflict.

[github-actions]

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

The merge is finished and committed as 4fa0729. Nothing was pushed.

There was only one conflicted file, CHANGELOG.md. Both sides had added bullet points at the same spot in the changelog:

• This branch added two fixes for the System Messages utility ([6.x] Redesign the System Messages utility #19946): the empty language menu, and variables not being HTML-escaped in HTML bodies.
• 6.x added a fix for new nested elements being deleted by the owner element's autosave before they were saved ([6.x] Fix new nested elements being deleted by the owner's autosave #19943).

The entries don't overlap, so I kept all three, with this branch's two first and the 6.x entry after them. No # CONFLICT-REVIEW: comments were needed. I removed only the conflict markers and changed nothing else. All other files had already merged cleanly.

[github-actions]

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the merge conflict and committed the merge as 4a489fb. It hasn't been pushed.

CHANGELOG.md was the only conflicted file. Each side had added a different entry at the same spot:

• This branch: a line saying system messages can list their Twig variables through a variables attribute, and adding SystemMessages::getTemplateVariables() ([6.x] Redesign the System Messages utility #19946).
• 6.x: a fix for element query date params and date condition rules being off by the system time zone's UTC offset ([6.x] Compare date query params against UTC-stored values #19963).

The two entries don't overlap, so I kept both. The #19946 line stays with the other "Added" entries, and the #19963 line goes first in the "Fixed a bug…" entries that follow. Nothing was ambiguous, so I didn't leave any CONFLICT-REVIEW comments. No other files needed changes.

[github-actions]

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the merge conflict and committed the merge as c4e38d4. Nothing was pushed.

There was only one conflict, in CHANGELOG.md. Both sides had added a new line in the same spot of the changelog:

• This branch: the entry for the system message variables attribute and SystemMessages::getTemplateVariables() ([6.x] Redesign the System Messages utility #19946).
• 6.x: the entry for admin-table slideout widths and the new slideout/slideoutWidth arguments on Table::createAction() ([6.x] Admin table create slideouts and custom widths #19956).

The two entries cover separate features, so I kept both, with this branch's line first. Nothing about it was ambiguous, so I didn't add any CONFLICT-REVIEW comments. Git merged everything else in the merge from 6.x without conflicts.