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

Replace #concept-info-before div element with more generic #content-top, adding #content-bottom div element #1287

Merged
merged 2 commits into from
Mar 10, 2022

Conversation

osma
Copy link
Member

@osma osma commented Mar 10, 2022

Reasons for creating this PR

In PR #1285, new empty DIV elements #concept-info-before and #concept-info-after were added as placeholders so that plugins can add widgets into these predefined slots. But these are specific to the concept page and not available on other page types such as the vocabulary home page. This PR replaces those DIVs with more generic ones #content-top and #content-bottom which can be used on all (?) page types.

Link to relevant issue(s), if any

Description of the changes in this PR

  • remove #concept-info-before and #concept-info-after DIV elements
  • add #content-top and #content-bottom DIV elements
  • some reindentation

Known problems or uncertainties in this PR

n/a

Checklist

  • phpUnit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if not, explain why below)
  • The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

Tests are not relevant since only Twig templates were changed.

@osma
Copy link
Member Author

osma commented Mar 10, 2022

Tests on PHP 7.x are failing for some reason that is clearly unrelated to the changes in this PR:

PHPUnit\Framework\Exception: Fatal error: Uncaught TypeError: Argument 3 passed to PHP_Token::__construct() must be an instance of PHP_Token_Stream, instance of PHPUnit\PHP_Token_Stream given, called in phar:///usr/local/bin/phpunit/php-token-stream/Token/Stream.php on line 131 and defined in /app/vendor/phpunit/php-token-stream/src/Token.php:37

@osma osma self-assigned this Mar 10, 2022
@osma osma requested a review from joelit March 10, 2022 09:48
@osma osma added this to the 2.14 milestone Mar 10, 2022
@sonarcloud
Copy link

sonarcloud bot commented Mar 10, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@joelit joelit merged commit 58b4b20 into master Mar 10, 2022
@joelit joelit changed the title Replace #concept-info-before div element with more generic #content-top Replace #concept-info-before div element with more generic #content-top, adding #content-bottom div element Mar 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants