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

EZP-31719: Verbatim HTML in end of life information on Dashboard #55

Merged
merged 1 commit into from
Jul 13, 2020
Merged

EZP-31719: Verbatim HTML in end of life information on Dashboard #55

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Resources/translations/dashboard.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<source><![CDATA[Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
<a target="_blank" href="%license_url%">A business friendly license</a>,
<a target="_blank" href="%ee_product_url%">several productivity features</a>,
<a target="_blank" href="%support_service_url%">professional Support</a> and
<a target="_blank" href="%service_life_url%">longer maintenance periode of your release</a>.]]></source>
<a target="_blank" href="%support_service_url%">professional support</a> and a
<a target="_blank" href="%service_life_url%">longer maintenance period of your release</a>.]]></source>
<target state="new"><![CDATA[Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
<a target="_blank" href="%license_url%">A business friendly license</a>,
<a target="_blank" href="%ee_product_url%">several productivity features</a>,
<a target="_blank" href="%support_service_url%">professional Support</a> and
<a target="_blank" href="%service_life_url%">longer maintenance periode of your release</a>.]]></target>
<a target="_blank" href="%support_service_url%">professional support</a> and a
<a target="_blank" href="%service_life_url%">longer maintenance period of your release</a>.]]></target>
<note>key: dashboard.ez_version.community_end_of_maintenance_upgrade</note>
</trans-unit>
<trans-unit id="7eb6ab2973439efa8ff820310952e02bc81209cb" resname="dashboard.ez_version.community_severity_non">
Expand Down
20 changes: 14 additions & 6 deletions Resources/views/themes/admin/dashboard/block/ez.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@
{% if not ez.release %}
{% set severity = 1 %}
<div class="alert alert-warning mb-0 mt-3" role="alert">
{{ 'dashboard.ez_version.release_not_determined'|trans|desc("The system could not find your <code>composer.lock</code> file. It's needed to determine information about
your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments.")}}
{{ 'dashboard.ez_version.release_not_determined'|trans
|desc("The system could not find your <code>composer.lock</code> file. It's needed to determine information about
your eZ installation. It is recommended to keep it during project development to make sure the same package versions are
used across all environments.")
|raw }}
</div>
{% elseif ez.stability != 'stable' %}
{% set severity = 1 %}
Expand Down Expand Up @@ -60,8 +63,13 @@
{# In the future with retrival of info from updates.ez.no we can detect missing (public) security fixes and then let this become an error #}
{% set severity = 1 %}
<div class="alert alert-warning mb-0 mt-3" role="alert">
{{ 'dashboard.ez_version.community_end_of_maintenance'|trans({'%release%': ez.release, '%update_url%': urls['update']})
|desc("Unfortunately %release% open source version has reached end of life, <a target=\"_blank\" href=\"%update_url%\">please upgrade</a>.")}}
{{ 'dashboard.ez_version.community_end_of_maintenance'|trans({
'%release%': ez.release,
'%update_url%': urls['update']
})
|desc("Unfortunately %release% open source version has reached end of life,
<a target=\"_blank\" href=\"%update_url%\">please upgrade</a>.")
|raw }}
<em>
{{ 'dashboard.ez_version.community_end_of_maintenance_upgrade'|trans({
'%license_url%': urls['license'],
Expand All @@ -72,8 +80,8 @@
|desc("Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
<a target=\"_blank\" href=\"%license_url%\">A business friendly license</a>,
<a target=\"_blank\" href=\"%ee_product_url%\">several productivity features</a>,
<a target=\"_blank\" href=\"%support_service_url%\">professional Support</a> and
<a target=\"_blank\" href=\"%service_life_url%\">longer maintenance periode of your release</a>.")
<a target=\"_blank\" href=\"%support_service_url%\">professional support</a> and a
<a target=\"_blank\" href=\"%service_life_url%\">longer maintenance period of your release</a>.")
|raw }}
</em>
</div>
Expand Down