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

OEL-455 [oe_whitelabel] footer #10

Merged
merged 24 commits into from
Sep 15, 2021
Merged

OEL-455 [oe_whitelabel] footer #10

merged 24 commits into from
Sep 15, 2021

Conversation

escuriola
Copy link
Contributor

Manage oe_whitelabel footer blocks for EU and EC.

composer.json Outdated
@@ -10,6 +10,7 @@
"drupal/core": "^8.9 || ^9.1",
"drupal/ui_patterns": "^1.0",
"drupal/ui_patterns_settings": "^1.0",
"openeuropa/oe_corporate_blocks": "^4.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's move this to require dev as it's not needed by the theme, but by the module

package: OpenEuropa Whitelabel Theme
core_version_requirement: ^8.9 || ^9.1
dependencies:
- openeuropa:oe_corporate_blocks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Francesco asked to use a helper module, and now we have it, lets move the dependency in there, we can remove this then

runner.yml.dist Outdated
post_install:
# Prepare the instance.
- "./vendor/bin/drush en ui_patterns ui_patterns_library ui_patterns_settings components -y"
- "./vendor/bin/drush en oe_whitelabel_footer -y"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now that its a dependency on helper, we can remove this

/**
* {@inheritdoc}
*/
public function getFilters(): array {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this, its not used


return $ecl_links;
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a block renderer, we will use it for the corporate logo in the block

{
'section_id': 'eu_footer_left',
'logo': 'logo',
'path': url('<front>')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'description': site_owner ? 'This site is managed by the @name'|t({'@name': site_owner}),

'logo': 'logo',
'path': url('<front>')
},{
'section_id': 'eu_footer_middle',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move all this to a new bottom_section

},
{
'section_id': 'eu_footer_right',
'eu_institutions_title': corporate_footer.institution_links_title,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move all this to a new bottom_section



] %}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add bottom section

] %}

{{ pattern('footer', {
'top_sections': _top_sections
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add bottom sections

@@ -0,0 +1,39 @@
<footer>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the container from page does the job, this footer tag is redundant and so is below container

'block',
'components',
'oe_whitelabel_helper',
'oe_whitelabel_footer',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we wont have this anymore

* {@inheritdoc}
*/
protected static $modules = [
'block',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are missing the oe_corporate_blocks and its dependencies

/**
* Tests the EU and the EC corporate Footer blocks rendering.
*/
class FooterBlockTest extends KernelTestBase {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be SparqlKernelTestBase

drishu
drishu previously approved these changes Sep 15, 2021
Copy link
Contributor

@abel-santos-corral abel-santos-corral left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@drishu drishu merged commit f7f97b5 into 1.x Sep 15, 2021
@drishu drishu deleted the OEL-455 branch September 15, 2021 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants