Skip to content

Commit

Permalink
feat: CMS managed footer (#1144, #1166)
Browse files Browse the repository at this point in the history
BREAKING CHANGES: The `footer.content` localization key was replaced for most of its content by a CMS manageable content include.
  • Loading branch information
suschneider authored Jul 19, 2022
1 parent 2e8f7e4 commit 562c56a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
2 changes: 2 additions & 0 deletions docs/guides/migrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ With the method `encodeResourceID` we provide a central place that implements th
In the PWA this was applied to all user logins in REST API calls.
For project customizations the usage of the native `encodeURIComponent` functionality should be replaced with `encodeResourceID` for user logins in REST calls as well.

The `footer.content` localization key was replaced for most of its content by a CMS manageable content include `include.footer.content.pagelet2-Include` that is available from ICM 7.10.38.9-LTS.

## 2.3 to 2.4

The PWA 2.4 contains an Angular update to version 13.3.10 and many other dependencies updates.
Expand Down
4 changes: 2 additions & 2 deletions e2e/cypress/integration/pages/footer.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export class FooterModule {
gotoErrorPage() {
cy.get('ish-footer a[title="Error Page"]').click();
cy.get('ish-footer').contains('Error').click();
}

manageCookies() {
cy.get('ish-footer a[title="Manage Cookies"]').click();
cy.get('ish-footer').contains('Cookie').click();
}
}
8 changes: 7 additions & 1 deletion src/app/shell/footer/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<ng-container *ishHasNotRole="['APP_B2B_CXML_USER', 'APP_B2B_OCI_USER']">
<ish-lazy-store-locator-footer></ish-lazy-store-locator-footer>
<div [ishServerHtml]="'footer.content' | translate: { appVersion: appVersion }" class="clearfix"></div>
<div class="footer">
<div class="container">
<div [ishServerHtml]="'footer.disclaimer' | translate" class="clearfix"></div>
<ish-lazy-content-include includeId="include.footer.content.pagelet2-Include"></ish-lazy-content-include>
<div [ishServerHtml]="'footer.copyright' | translate: { appVersion: appVersion }" class="clearfix"></div>
</div>
</div>
</ng-container>
3 changes: 2 additions & 1 deletion src/assets/i18n/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,8 @@
"email.recommended_product.text": "Sieh mal, was ich für dich gefunden habe. {{0}}\n{{1}}",
"error.page.text": "<h3>Es tut uns leid ...</h3><p>Die gesuchte Seite ist derzeit nicht verfügbar. Mögliche Fehler sind veraltete Links, Tippfehler oder Verschieben, Umbenennen oder Löschen einer Datei. Der Webmaster wurde über das Problem informiert.</p><h4>Versuchen Sie bitte folgendes:</h4><ul><li>Kontrollieren Sie die Adresse der Seite im Adressfeld des Browsers auf Tippfehler</li><li>Gehen Sie zurück zur <a href=\"javascript:history.back()\">vorherigen Seite</a></li><li>Gehen Sie zurück zur <a href=\"route://home\" target=\"_self\">Startseite</a></li><li>Oder nutzen Sie unsere Suchfunktion:</li></ul>",
"error.page.title": "Seite nicht gefunden!",
"footer.content": "<div class=\"footer\"><div class=\"container\"><div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>Wir weisen daraufhin, dass dieser inSPIRED Demo Shop ein reiner Demonstrationsshop ist und s&auml;mtliche Inhalte lediglich beispielhaften Charakter zum Zwecke der Demonstration und Illustration haben. F&uuml;r die Richtigkeit, Vollst&auml;ndigkeit und Aktualit&auml;t der enthaltenen Inhalte &uuml;bernimmt Intershop Communications AG keine Haftung. Die Inhalte des Demo-Shops d&uuml;rfen nicht in Ihren Shop &uuml;bernommen oder anderweitig von Ihnen genutzt werden.</p></div><div class=\"row\"><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[0] = !collapsed[0]\"><span style=\"text-transform: none;\">in</span> SPIRED<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\"><span style=\"text-transform: none;\">in</span>SPIRED</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[0]\"><ul><li><a href=\"page://page.aboutus\">&Uuml;ber uns</a></li><li><a href=\"page://page.termsAndConditions.pagelet2-Page\">Allgemeine Gesch&auml;ftsbedingungen</a></li><li><a href=\"page://page.privacyPolicy.pagelet2-Page\">Datenschutzhinweise</a></li><li><a href=\"route://cookies\" title=\"Cookies verwalten\">Cookies verwalten</a></li><li><a href=\"page://page.helpdesk.pagelet2-Page\">Hilfe</a></li><li><a href=\"route://contact\">Kontakt</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[1] = !collapsed[1]\">SERVICE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">SERVICE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[1]\"><ul><li><a href=\"page://page.helpdesk.faq\">H&auml;ufige Fragen</a></li><li><a href=\"page://page.helpdesk.orderingShippingPayment\">Bestellung, Versand und Bezahlung</a></li><li><a href=\"page://page.returnpolicy\">R&uuml;ckgaberegelung</a></li><li><a href=\"page://page.helpdesk.giftServices\">Geschenk-Services</a></li><li><a href=\"page://page.helpdesk.safetySecurityPrivacy\">Sicherheit, Schutz &amp; Privatsph&auml;re</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[2] = !collapsed[2]\">MEIN KONTO<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">MEIN KONTO</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[2]\"><ul><li><a rel=\"nofollow\" href=\"route://account/orders\">Bestellhistorie</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten und -gutscheine</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten-Guthaben</a></li><li><a rel=\"nofollow\" href=\"\">Gespeicherte Zahlungsdaten</a></li><li><a rel=\"nofollow\" href=\"route://account/addresses\">Gespeicherte Adressen</a></li><li><a rel=\"nofollow\" href=\"route://account/profile\">Profileinstellungen</a></li><li><a rel=\"nofollow\" href=\"\">Produktbenachrichtigungen</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[3] = !collapsed[3]\">BELIEBTE KATEGORIEN<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE KATEGORIEN</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[3]\"><ul><li><a href=\"route://Action-Kameras-catCameras-Camcorders.832\">Action-Kameras</a></li><li><a href=\"route://TVs-Projektoren-catHome-Entertainment.220\">TVs &amp; Projektoren</a></li><li><a href=\"route://Monitors-catComputers.3001\">Monitore</a></li><li><a href=\"route://Heimkino-Systeme-catHome-Entertainment.1058.1082\">Heimkino-Systeme</a></li><li><a href=\"route://Tablets-catComputers.897\">Tablets</a></li><li><a href=\"route://Notebooks-catComputers.1835.151\">Notebooks</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[4] = !collapsed[4]\">BELIEBTE PRODUKTE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE PRODUKTE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[4]\"><ul><li><a href=\"product://8182790134362\">GoPro Hero 4 Silver</a></li><li><a href=\"product://8806086011815\">Samsung Full HD 3D Smart TV</a></li><li><a href=\"product://3953312\">Canon LEGRIA HF R16</a></li><li><a href=\"product://8806086070188\">Samsung Galaxy NotePRO 4G </a></li><li><a href=\"product://689796\">Wrist Rest Fellowes</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[5] = !collapsed[5]\">DEMO CONTENT<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">DEMO CONTENT</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[5]\"><ul><li><a href=\"https://icecat.biz/\"target=\"_blank\"title=\"Demo Content provided by Icecat\"class=\"cms-footer-longLinks\">Icecat Content</a></li><li><a href=\"page://page.democontent\" title=\"Demo Content Disclaimer\">Demo Disclaimer</a></li><li><a href=\"route://error\" title=\"Error Page\">Fehler</a></li><li><a href=\"route://home\" title=\"Root Route\">Hauptseite</a></li><li><a href=\"route://basket\"title=\"Basket Page\">Warenkorb</a></li></ul></div></div></div><div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />&copy; 2022 INTERSHOP Communications AG. Alle Rechte vorbehalten.</p></div></div></div>",
"footer.copyright": "<div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />&copy; 2022 INTERSHOP Communications AG. Alle Rechte vorbehalten.</p></div>",
"footer.disclaimer": "<div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>Wir weisen daraufhin, dass dieser inSPIRED Demo Shop ein reiner Demonstrationsshop ist und s&auml;mtliche Inhalte lediglich beispielhaften Charakter zum Zwecke der Demonstration und Illustration haben. F&uuml;r die Richtigkeit, Vollst&auml;ndigkeit und Aktualit&auml;t der enthaltenen Inhalte &uuml;bernimmt Intershop Communications AG keine Haftung. Die Inhalte des Demo-Shops d&uuml;rfen nicht in Ihren Shop &uuml;bernommen oder anderweitig von Ihnen genutzt werden.</p></div>",
"forgot_password.form.send.button.label": "Senden",
"form.email.error.invalid": "Bitte geben Sie eine gültige E-Mail-Adresse an.",
"form.email.error.required": "Bitte geben Sie Ihre E-Mail-Adresse an.",
Expand Down
3 changes: 2 additions & 1 deletion src/assets/i18n/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,8 @@
"email.recommended_product.text": "Take a look at what I found for you. {{0}}\n{{1}}",
"error.page.text": "<h3>We are sorry ...</h3><p>The page you are looking for is currently not available. This could be caused by out-of-date links, a typing error, or moving, renaming or deleting a file. We've informed our webmaster about this problem.</p><h4>Please try one of the following:</h4><ul><li>Check the page address in the Address Bar for typing errors</li><li>Go back to the <a href=\"javascript:history.back()\">Previous Page</a></li><li>Go back to the <a href=\"route://home\" target=\"_self\">Home Page</a></li><li>Or use our site search:</li></ul>",
"error.page.title": "Page Not Found!",
"footer.content": "<div class=\"footer\"><div class=\"container\"><div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>We advise you that this inSPIRED demo shop is a shop for demonstration only and all contents are of exemplary nature for demonstration and illustration purposes solely. Intershop Communications AG does not guarantee and accepts no liability for correctness, completeness and up-to-dateness of the contents provided. The contents of the demo shop must not be adopted or copied to your shop or otherwise being used by you.</p></div><div class=\"row\"><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[0] = !collapsed[0]\"><span style=\"text-transform: none;\">in</span> SPIRED<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\"><span style=\"text-transform: none;\">in</span>SPIRED</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[0]\"><ul><li><a href=\"page://page.aboutus\">About Us</a></li><li><a href=\"page://page.termsAndConditions.pagelet2-Page\">Terms &amp; Conditions</a></li><li><a href=\"page://page.privacyPolicy.pagelet2-Page\">Privacy Policy</a></li><li><a href=\"route://cookies\" title=\"Manage Cookies\">Manage Cookies</a></li><li><a href=\"page://page.helpdesk.pagelet2-Page\">Help</a></li><li><a href=\"route://contact\">Contact Us</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[1] = !collapsed[1]\">SERVICE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">SERVICE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[1]\"><ul><li><a href=\"page://page.helpdesk.faq\">Frequently Asked Questions</a></li><li><a href=\"page://page.helpdesk.orderingShippingPayment\">Ordering, Shipping and Payment</a></li><li><a href=\"page://page.returnpolicy\">Return Policy</a></li><li><a href=\"page://page.helpdesk.giftServices\">Gift Services</a></li><li><a href=\"page://page.helpdesk.safetySecurityPrivacy\">Safety, Security &amp; Privacy</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[2] = !collapsed[2]\">MY ACCOUNT<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">MY ACCOUNT</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[2]\"><ul><li><a rel=\"nofollow\" href=\"route://account/orders\">Order History</a></li><li><a rel=\"nofollow\" href=\"\">Gift Cards &amp; Certificates</a></li><li><a rel=\"nofollow\" href=\"\">Gift Card Balance Lookup</a></li><li><a rel=\"nofollow\" href=\"\">Saved Payment Information</a></li><li><a rel=\"nofollow\" href=\"route://account/addresses\">Saved Addresses</a></li><li><a rel=\"nofollow\" href=\"route://account/profile\">Profile Settings</a></li><li><a rel=\"nofollow\" href=\"\">Product Notifications</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[3] = !collapsed[3]\">TOP CATEGORIES<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">TOP CATEGORIES</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[3]\"><ul><li><a href=\"route://Action-Cameras-catCameras-Camcorders.832\">Action Cameras</a></li><li><a href=\"route://TVs-and-Projectors-catHome-Entertainment.220\">TVs and Projectors</a></li><li><a href=\"route://Monitors-catComputers.3001\">Monitors</a></li><li><a href=\"route://Home-Cinema-Systems-catHome-Entertainment.1058.1082\">Home Cinema Systems</a></li><li><a href=\"route://Tablets-catComputers.897\">Tablets</a></li><li><a href=\"route://Notebooks-catComputers.1835.151\">Notebooks</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[4] = !collapsed[4]\">TOP PRODUCTS<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">TOP PRODUCTS</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[4]\"><ul><li><a href=\"product://8182790134362\">GoPro Hero 4 Silver</a></li><li><a href=\"product://8806086011815\">Samsung Full HD 3D Smart TV</a></li><li><a href=\"product://3953312\">Canon LEGRIA HF R16</a></li><li><a href=\"product://8806086070188\">Samsung Galaxy NotePRO 4G </a></li><li><a href=\"product://689796\">Wrist Rest Fellowes</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[5] = !collapsed[5]\">DEMO CONTENT<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">DEMO CONTENT</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[5]\"><ul><li><a href=\"https://icecat.biz/\" target=\"_blank\" title=\"Demo Content provided by Icecat\" class=\"cms-footer-longLinks\">Icecat Content</a></li><li><a href=\"page://page.democontent\" title=\"Demo Content Disclaimer\">Demo Disclaimer</a></li><li><a href=\"route://error\" title=\"Error Page\">Error</a></li><li><a href=\"route://home\" title=\"Root Route\">Root</a></li><li><a href=\"route://basket\" title=\"Cart Page\">Shopping Cart</a></li></ul></div></div></div><div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />© 2022 INTERSHOP Communications AG. All rights reserved.</p></div></div></div>",
"footer.copyright": "<div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />© 2022 INTERSHOP Communications AG. All rights reserved.</p></div>",
"footer.disclaimer": "<div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>We advise you that this inSPIRED demo shop is a shop for demonstration only and all contents are of exemplary nature for demonstration and illustration purposes solely. Intershop Communications AG does not guarantee and accepts no liability for correctness, completeness and up-to-dateness of the contents provided. The contents of the demo shop must not be adopted or copied to your shop or otherwise being used by you.</p></div>",
"forgot_password.form.send.button.label": "Send",
"form.email.error.invalid": "Please enter a valid e-mail address.",
"form.email.error.required": "Please enter your e-mail address.",
Expand Down
Loading

0 comments on commit 562c56a

Please sign in to comment.