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.

Sign up for GitHub

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

Jump to bottom

Fix html encoded urls in symfony layout #34395

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Fix html encoded urls in symfony layout #34395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
{% endif %}
{% endfor %}

<a class="dropdown-item employee-link text-center" id="header_logout" href="{{ legacy_path('AdminLogin', {'logout' : 1})|escape('html_attr') }}">
<a class="dropdown-item employee-link text-center" id="header_logout" href="{{ legacy_path('AdminLogin', {'logout' : 1}) }}">
<i class="material-icons d-lg-none">power_settings_new</i>
<span>
{{ 'Sign out'|trans({}, 'Admin.Navigation.Header') }}
Expand Down
16 changes: 8 additions & 8 deletions src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<p class="component-search-title">{{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}</p>
{% for quickAccess in this.quickAccesses %}
<a class="dropdown-item quick-row-link{% if quickAccess.active %} active{% endif %}"
href="{{ quickAccess.link|escape('html_attr') }}"
href="{{ quickAccess.link }}"
{% if quickAccess.new_window %} target="_blank"{% endif %}
data-item="{{ quickAccess.name }}"
>
{{ quickAccess.name|escape('html_attr') }}
{{ quickAccess.name }}
</a>
{% endfor %}
<div class="dropdown-divider"></div>
Expand All @@ -41,10 +41,10 @@
data-method="remove"
data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
data-rand="{{ random(1, 200) }}"
data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
data-url="{{ this.cleanCurrentUrl }}"
data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header') }}"
data-link="{{ this.currentQuickAccess.name }}"
>
<i class="material-icons">remove_circle_outline</i>
{{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
Expand All @@ -55,10 +55,10 @@
href="#"
data-rand="{{ random(1, 200) }}"
data-method="add"
data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
data-url="{{ this.cleanCurrentUrl }}"
data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')}}"
data-link="{{ this.currentUrlTitle }}"
>
<i class="material-icons">add_circle</i>
{{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
Expand Down
2 changes: 1 addition & 1 deletion src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="nav-bar-overflow">
<div class="logo-container">
<div class="d-flex align-items-center">
<a id="header_logo" class="logo float-left" href="{{ legacy_path(this.defaultTab)|escape('html_attr') }}"></a>
<a id="header_logo" class="logo float-left" href="{{ legacy_path(this.defaultTab) }}"></a>
<span id="shop_version" class="header-version">{{ this.psVersion }}</span>
</div>
<div class="logo-container__close js-mobile-menu">
Expand Down
18 changes: 9 additions & 9 deletions src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<div class="dropdown-menu">
{% for quickAccess in this.quickAccesses %}
<a class="dropdown-item quick-row-link
{% if quickAccess.class is defined %}{{ quickAccess.class|escape('html_attr') }}{% endif %}
{% if quickAccess.class is defined %}{{ quickAccess.class }}{% endif %}
{% if quickAccess.active %}active{% endif %}"
href="{{ quickAccess.link|escape('html_attr') }}"
href="{{ quickAccess.link }}"
{% if quickAccess.new_window %} target="_blank"{% endif %}
data-item="{{ quickAccess.name }}"
>{{ quickAccess.name|escape('html_attr') }}</a>
>{{ quickAccess.name }}</a>
{% endfor %}
<div class="dropdown-divider"></div>
{% if this.currentQuickAccess %}
Expand All @@ -45,10 +45,10 @@
data-method="remove"
data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
data-rand="{{ random(1, 200) }}"
data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
data-url="{{ this.cleanCurrentUrl }}"
data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header') }}"
data-link="{{ this.currentQuickAccess.name }}"
>
<i class="material-icons">remove_circle_outline</i>
{{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
Expand All @@ -59,10 +59,10 @@
href="#"
data-rand="{{ random(1, 200) }}"
data-method="add"
data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
data-url="{{ this.cleanCurrentUrl }}"
data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')}}"
data-link="{{ this.currentUrlTitle }}"
>
<i class="material-icons">add_circle</i>
{{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
Expand Down
2 changes: 1 addition & 1 deletion src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ and (
</div>
{% else %}
<div class="shop-list">
<a class="link" id="header_shopname" href="{{ baseUrl|escape('html_attr') }}" target= "_blank">
<a class="link" id="header_shopname" href="{{ baseUrl }}" target= "_blank">
<i class="material-icons">visibility</i>
<span>{{ 'View my store'|trans({}, 'Admin.Navigation.Header') }}</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/PrestaShopBundle/Resources/views/Admin/Layout/default_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

<div class="header-right">
<div class="shop-list">
<a class="link" id="header_shopname" href="{{ ps.baseUrl|escape('html_attr') }}" target= "_blank">
<a class="link" id="header_shopname" href="{{ ps.baseUrl }}" target= "_blank">
<i class="material-icons">visibility</i>
<span>{{ 'View my store'|trans({}, 'Admin.Navigation.Header') }}</span>
</a>
Expand Down