Set link around id too

Use locations_link and locations_title instead of translation and path

diff --git a/Resources/views/default/_location.html.twig b/Resources/views/default/_location.html.twig
index 4f1be81e0ec83d0763fe4f1a248355187bb310af..beca449aeddc9d287135cd11ac71087ab282b0b0 100644 (file)
--- a/Resources/views/default/_location.html.twig
+++ b/Resources/views/default/_location.html.twig
@@ -2,7 +2,7 @@
 {% if locations is defined and locations %}
        <article class="location">
                <header>
 {% if locations is defined and locations %}
        <article class="location">
                <header>

-                       <h2><a href="{{ path('rapsys_air_location') }}">{% trans %}Locations{% endtrans %}</a></h2>
+                       <h2><a href="{{ locations_link }}">{{ locations_title }}</a></h2>

                        {% if locations_description is defined %}
                                <p>{{ locations_description }}</p>
                        {% elseif forms.snippets is defined %}
                        {% if locations_description is defined %}
                                <p>{{ locations_description }}</p>
                        {% elseif forms.snippets is defined %}


@@ -28,7 +28,7 @@
                                                <article class="cell{% if l.count is defined and l.count or location.id is defined and location.id == l.id or session.location.id is defined and session.location.id == l.id %} highlight{% endif %}">
                                                        <header>
                                                                {# TODO XXX virer le if l.link id defined when user view is fixed !!! #}
                                                <article class="cell{% if l.count is defined and l.count or location.id is defined and location.id == l.id or session.location.id is defined and session.location.id == l.id %} highlight{% endif %}">
                                                        <header>
                                                                {# TODO XXX virer le if l.link id defined when user view is fixed !!! #}

-                                                               <h3>{% if multimap is defined and multimap %}{{ i }} {% endif %}<a href="{{ l.link }}">{{ l.title }}</a></h3>
+                                                               <h3><a href="{{ l.link }}">{% if multimap is defined and multimap %}{{ i }} {% endif %}{{ l.title }}</a></h3>

                                                        </header>
                                                        {% if forms.snippets[i] is defined and forms.snippets[i] %}
                                                                {{ form_start(forms.snippets[i]) }}
                                                        </header>
                                                        {% if forms.snippets[i] is defined and forms.snippets[i] %}
                                                                {{ form_start(forms.snippets[i]) }}


@@ -111,7 +111,7 @@
                                <ul class="grid{% if locations|length > 1 %} two{% endif %}">
                                        {% for i, l in locations %}
                                                {# TODO XXX virer le if l.link id defined when user view is fixed !!! #}
                                <ul class="grid{% if locations|length > 1 %} two{% endif %}">
                                        {% for i, l in locations %}
                                                {# TODO XXX virer le if l.link id defined when user view is fixed !!! #}

-                                               <li>{% if multimap is defined and multimap %}{{ i }} {% endif %}<a href="{{ l.link }}">{{ l.title }}</a></li>
+                                               <li><a href="{{ l.link }}">{% if multimap is defined and multimap %}{{ i }} {% endif %}{{ l.title }}</a></li>

                                        {% endfor %}
                                </ul>
                        {% endif %}
                                        {% endfor %}
                                </ul>
                        {% endif %}