Commit cd0f9183 by Yvon Kerdoncuff

Merge branch '4423-change-prestataire-term' into 'develop'

in public pages, change Prestataire term to Points de vente in tav env

See merge request cooperatic/kohinos-tav!43
parents 6d713b53 450c762d
...@@ -67,7 +67,11 @@ ...@@ -67,7 +67,11 @@
{# Affichage de la carte des prestataires pour les adhérents #} {# Affichage de la carte des prestataires pour les adhérents #}
{% if KOH_USE_WORDPRESS is defined and KOH_USE_WORDPRESS == 'false' and ((app.user and is_granted('ROLE_ADHERENT')) or not app.user) %} {% if KOH_USE_WORDPRESS is defined and KOH_USE_WORDPRESS == 'false' and ((app.user and is_granted('ROLE_ADHERENT')) or not app.user) %}
<div class='d-none d-md-block'> <div class='d-none d-md-block'>
{% include '@kohinos/presta/block/carte.html.twig' with {'title': 'Situer les Prestataires'|trans}%} {% if tav_env == 1 %}
{% include '@kohinos/presta/block/carte.html.twig' with {'title': 'Situer les points de vente'|trans}%}
{% else %}
{% include '@kohinos/presta/block/carte.html.twig' with {'title': 'Situer les Prestataires'|trans}%}
{% endif %}
</div> </div>
{% endif %} {% endif %}
{% if app.user and is_granted('ROLE_ADMIN') %} {% if app.user and is_granted('ROLE_ADMIN') %}
......
...@@ -33,6 +33,13 @@ ...@@ -33,6 +33,13 @@
{% import _self as self %} {% import _self as self %}
{% for menuItem in items %} {% for menuItem in items %}
{% set url = menuItem.url %} {% set url = menuItem.url %}
<a href="{{ url }}" class="dropdown-item {% if currentPath == url %}current{% endif %}" {% if menuItem.target %} target="_blank"{% endif %}>{{ menuItem.name }}</a> {% if tav_env == 1 and menuItem.name == "Carte des prestataires" %}
{% set name = "Carte des points de vente" %}
{% elseif tav_env == 1 and menuItem.name == "Liste des prestataires" %}
{% set name = "Liste des points de vente" %}
{% else %}
{% set name = menuItem.name %}
{% endif %}
<a href="{{ url }}" class="dropdown-item {% if currentPath == url %}current{% endif %}" {% if menuItem.target %} target="_blank"{% endif %}>{{ name }}</a>
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}
\ No newline at end of file
...@@ -2,9 +2,14 @@ ...@@ -2,9 +2,14 @@
{% block content %} {% block content %}
<div class='container prestalist mt-2'> <div class='container prestalist mt-2'>
{% include '@kohinos/block/breadcrumb.html.twig' with {'label' : 'Carte des prestataires'} %} {% if tav_env == 1 %}
{% set name = "Carte des points de vente" %}
{% else %}
{% set name = "Carte des prestataires" %}
{% endif %}
{% include '@kohinos/block/breadcrumb.html.twig' with {'label' : name} %}
<div class='card'> <div class='card'>
<div class="card-header"><h3>{{ 'Carte des prestataires :'|trans }}</h3></div> <div class="card-header"><h3>{{ name|trans }}</h3></div>
<div class="card-body"> <div class="card-body">
<div class="card-text"> <div class="card-text">
{% include '@kohinos/presta/block/carte.html.twig' with {style:"height: 400px;"} %} {% include '@kohinos/presta/block/carte.html.twig' with {style:"height: 400px;"} %}
......
...@@ -24,7 +24,11 @@ ...@@ -24,7 +24,11 @@
{% endif %} {% endif %}
<div class="card-text mx-auto text-center mt-2"> <div class="card-text mx-auto text-center mt-2">
<h5 class='btn btn-secondary'><a href="#" class="card-text mt-3" style='cursor:pointer;' data-toggle="collapse" data-target="#collapsepresta{{rubrique.id}}" aria-expanded="false" aria-controls="collapsepresta{{rubrique.id}}"> <h5 class='btn btn-secondary'><a href="#" class="card-text mt-3" style='cursor:pointer;' data-toggle="collapse" data-target="#collapsepresta{{rubrique.id}}" aria-expanded="false" aria-controls="collapsepresta{{rubrique.id}}">
{{ 'Voir le(s)'|trans }} {{rubrique.prestataires|length}} {{'prestataire(s)'|trans}} {% if tav_env == 1 %}
{{ 'Voir le(s)'|trans }} {{rubrique.prestataires|length}} {{'point(s) de vente'|trans}}
{% else %}
{{ 'Voir le(s)'|trans }} {{rubrique.prestataires|length}} {{'prestataire(s)'|trans}}
{% endif %}
</a></h5> </a></h5>
</div> </div>
<ul class="list-group list-group-flush collapse mx-2 my-2" id="collapsepresta{{rubrique.id}}"> <ul class="list-group list-group-flush collapse mx-2 my-2" id="collapsepresta{{rubrique.id}}">
......
...@@ -10,7 +10,11 @@ ...@@ -10,7 +10,11 @@
</h1> </h1>
<div class="my-3 p-3 bg-white rounded box-shadow"> <div class="my-3 p-3 bg-white rounded box-shadow">
<p>{{rubrique.content|raw}}</p> <p>{{rubrique.content|raw}}</p>
<h3>{{ 'Prestataires'|trans }} : </h3> {% if tav_env == 1 %}
<h3>{{ 'Points de vente'|trans }} : </h3>
{% else %}
<h3>{{ 'Prestataires'|trans }} : </h3>
{% endif %}
{% for presta in prestataires %} {% for presta in prestataires %}
<div class='my-2'> <div class='my-2'>
{% include '@kohinos/presta/onepresta.html.twig' with { 'withrubrique': false} %} {% include '@kohinos/presta/onepresta.html.twig' with { 'withrubrique': false} %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment