mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
Merge branch '2.0' into 2.0-docs
* 2.0: fix: typo fix: change action path with dynamics routes name revert meta description content nad translation revert meta description content nad translation performance, accessibility, best practices and seo improvements Update src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/footer/content/payment_methods.html.twig
This commit is contained in:
Grzegorz Sadowski
commit
f129cc3483
14 changed files with 31 additions and 28 deletions
|
|
@ -1,8 +1,12 @@
|
|||
{% set resource_id = hookable_metadata.context.resource.id %}
|
||||
{% set resource_name = hookable_metadata.context.metadata.name %}
|
||||
{% set url = 'sylius_admin_' ~ resource_name ~ '_update' %}
|
||||
{% set configuration = hookable_metadata.context.configuration %}
|
||||
{% set update_route_name = configuration.vars.update.route.name|default(configuration.getRouteName('update')) %}
|
||||
|
||||
<a class="btn" href="{{ path(url, {'id': resource_id}) }}" {{ sylius_test_html_attribute('edit-' ~ resource_name) }}>
|
||||
{{ ux_icon('tabler:pencil') }}
|
||||
{{ 'sylius.ui.edit'|trans }}
|
||||
</a>
|
||||
{% if sylius_route_exists(update_route_name) %}
|
||||
{% set resource_id = hookable_metadata.context.resource.id %}
|
||||
{% set resource_name = hookable_metadata.context.metadata.name %}
|
||||
|
||||
<a class="btn" href="{{ path(update_route_name, {'id': resource_id}) }}" {{ sylius_test_html_attribute('edit-' ~ resource_name) }}>
|
||||
{{ ux_icon('tabler:pencil') }}
|
||||
{{ 'sylius.ui.edit'|trans }}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
{% if sylius_route_exists(show_route_name) %}
|
||||
{% set resource_id = hookable_metadata.context.resource.id %}
|
||||
{% set resource_name = hookable_metadata.context.metadata.name %}
|
||||
{% set url = 'sylius_admin_' ~ resource_name ~ '_show' %}
|
||||
|
||||
<a class="btn" href="{{ path(url, {'id': resource_id}) }}" {{ sylius_test_html_attribute('show-' ~ resource_name) }}>
|
||||
<a class="btn" href="{{ path(show_route_name, {'id': resource_id}) }}" {{ sylius_test_html_attribute('show-' ~ resource_name) }}>
|
||||
{{ ux_icon('tabler:eye') }}
|
||||
{{ 'sylius.ui.show'|trans }}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<h4 class="mb-4">{{ 'sylius.ui.account_credentials'|trans }}</h4>
|
||||
<h2 class="h4 mb-4">{{ 'sylius.ui.account_credentials'|trans }}</h2>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<h4 class="mb-4">{{ 'sylius.ui.personal_information'|trans }}</h4>
|
||||
<h2 class="h4 mb-4">{{ 'sylius.ui.personal_information'|trans }}</h2>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div class="mb-6">
|
||||
<div class="overflow-hidden">
|
||||
<div class="d-flex justify-content-center align-items-center position-relative">
|
||||
<img src="{{ asset('build/shop/images/homepage-banner.webp', 'shop') }}" class="img-fluid" alt="Home">
|
||||
<img src="{{ asset('build/shop/images/homepage-banner.webp', 'shop') }}" width="1920" height="100%" class="img-fluid" alt="Home">
|
||||
<img src="{{ asset('build/shop/images/homepage-banner-logo.webp', 'shop') }}" class="position-absolute" style="max-width: 40vw" alt="New collection">
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<a class="btn btn btn-outline-secondary btn-sm" href="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" {{ sylius_test_html_attribute('clear') }}>
|
||||
<a class="btn btn btn-outline-secondary btn-sm" href="{{ path('sylius_shop_product_index', {'slug': app.request.attributes.get('slug')}) }}" {{ sylius_test_html_attribute('clear') }} aria-label="clear filters">
|
||||
{{ ux_icon('tabler:x') }}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<button class="btn btn btn-outline-secondary btn-sm" type="submit" {{ sylius_test_html_attribute('search') }}>
|
||||
<button class="btn btn btn-outline-secondary btn-sm" type="submit" {{ sylius_test_html_attribute('search') }} aria-label="search button">
|
||||
{{ ux_icon('tabler:search') }}
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
<div class="col-auto position-relative" {{ attributes }}>
|
||||
<div data-loading>
|
||||
<div class="sylius-shop-loader">
|
||||
<img src="{{ asset('build/shop/images/loader.gif', 'shop') }}" alt="{{ 'sylius.ui.loading'|trans }}"/>
|
||||
<img src="{{ asset('build/shop/images/loader.gif', 'shop') }}" alt="{{ 'sylius.ui.loading'|trans }}" loading="lazy"/>
|
||||
</div>
|
||||
</div>
|
||||
<div {{ sylius_test_html_attribute('cart-button') }}>
|
||||
<button class="btn btn-icon btn-transparent px-0 position-relative" data-bs-toggle="offcanvas" data-bs-target="#offcanvasCart">
|
||||
<button class="btn btn-icon btn-transparent px-0 position-relative" data-bs-toggle="offcanvas" data-bs-target="#offcanvasCart" aria-label="cart button">
|
||||
{{ ux_icon('tabler:shopping-bag') }}
|
||||
<span class="d-none d-lg-block ps-1" {{ sylius_test_html_attribute('cart-total') }}>
|
||||
{{- money.convertAndFormat(cart.itemsTotal) -}}
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
{% set path = asset('build/shop/images/200x200.png', 'shop') %}
|
||||
{% endif %}
|
||||
|
||||
<img {{ attributes.defaults({ class: 'img-fluid' }) }} src="{{ path }}" {{ sylius_test_html_attribute('main-image') }} alt="{{ product.name }}" />
|
||||
<img {{ attributes.defaults({ class: 'img-fluid' }) }} src="{{ path }}" {{ sylius_test_html_attribute('main-image') }} alt="{{ 'sylius.ui.product'|trans }} {{ product.name }} {{ 'sylius.ui.image'|trans }}" />
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<title>{% block title %}{{ sylius.channel.name }}{% endblock %}</title>
|
||||
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=5, user-scalable=yes" name="viewport">
|
||||
|
||||
{% block metatags %}
|
||||
{% hook '#metatags' with { _prefixes: prefixes } %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="col-12 text-center col-md-6 order-md-3 text-md-start col-lg-3 order-lg-1">
|
||||
<a href="{{ path('sylius_shop_homepage') }}" class="d-inline-block mb-4">
|
||||
<a href="{{ path('sylius_shop_homepage') }}" class="d-inline-block mb-4" aria-label="sylius logo">
|
||||
<div style="width: 10rem">
|
||||
{% include '@SyliusShop/shared/logo.html.twig'%}
|
||||
</div>
|
||||
|
|
@ -7,6 +7,6 @@
|
|||
|
||||
<div class="mb-3">
|
||||
© {{ 'sylius.ui.your_store'|trans }}, {{ 'sylius.ui.powered_by'|trans }}
|
||||
<a href="https://sylius.com" target="_blank" style="color: #1abb9c;">Sylius</a>.
|
||||
<a href="https://sylius.com" target="_blank">Sylius</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,24 +4,24 @@
|
|||
<div class="row g-2 mb-4">
|
||||
<div class="col-4">
|
||||
<a href="https://sylius.com/partner/paypal/" target="_blank" class="d-block border rounded p-2">
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/paypal-logo.svg', 'shop') }}" alt="PayPal" />
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/paypal-logo.svg', 'shop') }}" width="100%" height="100%" alt="PayPal" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<a href="https://sylius.com/partner/adyen/" target="_blank" class="d-block border rounded p-2">
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/adyen-logo.svg', 'shop') }}" alt="Adyen" />
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/adyen-logo.svg', 'shop') }}" width="100%" height="100%" alt="Adyen" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<a href="https://sylius.com/partner/mollie/" target="_blank" class="d-block border rounded p-2">
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/mollie-logo.svg', 'shop') }}" alt="Mollie" />
|
||||
<img class="img-fluid" src="{{ asset('build/shop/images/mollie-logo.svg', 'shop') }}" width="100%" height="100%" alt="Mollie" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-center justify-content-md-start justify-content-lg-center gap-3 mb-5">
|
||||
<a class="link-reset" href="#">{{ ux_icon('tabler:brand-instagram', { class: 'icon icon-md' }) }}</a>
|
||||
<a class="link-reset" href="#">{{ ux_icon('tabler:brand-facebook', { class: 'icon icon-md' }) }}</a>
|
||||
<a class="link-reset" href="#">{{ ux_icon('tabler:brand-x', { class: 'icon icon-md' }) }}</a>
|
||||
<a class="link-reset" href="https://www.instagram.com/sylius.team/" target="_blank" aria-label="instagram logo">{{ ux_icon('tabler:brand-instagram', { class: 'icon icon-md' }) }}</a>
|
||||
<a class="link-reset" href="https://www.facebook.com/SyliusEcommerce/" target="_blank" aria-label="facebook logo">{{ ux_icon('tabler:brand-facebook', { class: 'icon icon-md' }) }}</a>
|
||||
<a class="link-reset" href="https://x.com/Sylius" target="_blank" aria-label="x logo">{{ ux_icon('tabler:brand-x', { class: 'icon icon-md' }) }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="col">
|
||||
<a href="{{ path('sylius_shop_homepage') }}" class="d-inline-block py-lg-2" style="width: 10rem">
|
||||
<a href="{{ path('sylius_shop_homepage') }}" class="d-inline-block py-lg-2" style="width: 10rem" aria-label="sylius logo">
|
||||
{% hook 'logo' %}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="d-lg-none">
|
||||
<a href="{{ path('sylius_shop_login') }}" class="btn btn-icon btn-transparent px-0">
|
||||
<a href="{{ path('sylius_shop_login') }}" class="btn btn-icon btn-transparent px-0" aria-label="account button">
|
||||
{{ ux_icon('tabler:user') }}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue