Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.1] Add main region on error page #42719

Merged
merged 4 commits into from Feb 1, 2024

Conversation

Razzo1987
Copy link
Contributor

@Razzo1987 Razzo1987 commented Jan 27, 2024

Pull Request related to #42652 .
Read comment #42652 (comment)
Now whe are changing the semantic.

Summary of Changes

Add <main> on error.php template page.
Also when there is a module in the error-* position

Testing Instructions

Case 1: Go on page error and see the source
Case 2: Add module to error-403 or error-404 position. Go on page error and see the source

Actual result BEFORE applying this Pull Request

Case 1 and Case 2: There is no <main> element

Expected result AFTER applying this Pull Request

Case 1: Now the error message is inside the <main> element
Case 2: Now the module is inside the <main> element

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

Thanks to @brianteeman and @richard67 for the brainstorming ;)

@brianteeman
Copy link
Contributor

You should also add the main region for the regular use

@richard67
Copy link
Member

You should also add the main region for the regular use

@Razzo1987 Yes, Brian is right, it should also be added in the else branch like I wrote in my comment which you referred to:

I think the <main> should go to line 163 of the file changed by this PR, just after the <jdoc:include type="message" />, and it should be closed in line 177 (or 178 after adding the opening tag) just after the </blockquote> and before the </div>.

Here in 5.1-dev the line numbers stilll fit to my comment.

@richard67 richard67 added the Updates Requested Indicates that this pull request needs an update from the author and should not be tested. label Jan 27, 2024
@Razzo1987
Copy link
Contributor Author

Correct, thanks!

@richard67 richard67 removed the Updates Requested Indicates that this pull request needs an update from the author and should not be tested. label Jan 27, 2024
@richard67
Copy link
Member

@Razzo1987 Now it needs to adapt the testing instructions so that both cases are checked, with and without any module on an error-403 or error-404 position.

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on c6d4534


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42719.

1 similar comment
@viocassel
Copy link
Contributor

I have tested this item ✅ successfully on c6d4534


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42719.

@Quy Quy changed the title [5.1] Add <main> on error page when there is a module [5.1] Add on error page when there is a module Jan 27, 2024
@Quy Quy added the Updates Requested Indicates that this pull request needs an update from the author and should not be tested. label Jan 27, 2024
@Quy
Copy link
Contributor

Quy commented Jan 27, 2024

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42719.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jan 27, 2024
@Quy Quy added RTC This Pull Request is Ready To Commit and removed RTC This Pull Request is Ready To Commit Updates Requested Indicates that this pull request needs an update from the author and should not be tested. labels Jan 27, 2024
@Razzo1987 Razzo1987 changed the title [5.1] Add on error page when there is a module [5.1] Add on error page Jan 27, 2024
@Razzo1987 Razzo1987 changed the title [5.1] Add on error page [5.1] Add main region on error page Jan 27, 2024
@LadySolveig LadySolveig merged commit 65498e3 into joomla:5.1-dev Feb 1, 2024
3 checks passed
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Feb 1, 2024
@LadySolveig
Copy link
Contributor

Thank you @Razzo1987 and also for testing to @brianteeman and @viocassel

@Quy Quy added this to the Joomla! 5.1.0 milestone Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants