Correction des urls
This commit is contained in:
parent
a2121389bb
commit
e557174e96
|
@ -229,8 +229,8 @@ function UpdateRecherchesDetails(nom_connecte) {
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
// On récupère le nom de l'antenne dans l'url pour afficher les biens/services de celle-ci
|
// On récupère le nom de l'antenne dans l'url pour afficher les biens/services de celle-ci
|
||||||
var url = document.location.href;
|
var url = document.location.href;
|
||||||
var antenne_slug = url.split('/')[4];
|
var antenne_slug = url.split('/')[5];
|
||||||
var affichage_slug = url.split('/')[5];
|
var affichage_slug = url.split('/')[6];
|
||||||
var nom_connecte = $("#nom_connecte").text();
|
var nom_connecte = $("#nom_connecte").text();
|
||||||
|
|
||||||
if (affichage_slug == 'produits') {
|
if (affichage_slug == 'produits') {
|
||||||
|
|
|
@ -15,8 +15,6 @@
|
||||||
}
|
}
|
||||||
.main {
|
.main {
|
||||||
grid-area: main;
|
grid-area: main;
|
||||||
/*justify-self: start;
|
|
||||||
align-self: start;*/
|
|
||||||
grid-column: 1 / 2;
|
grid-column: 1 / 2;
|
||||||
}
|
}
|
||||||
.sidebar {
|
.sidebar {
|
||||||
|
@ -67,9 +65,6 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
<!-- if antennes
|
|
||||||
paginate(antennes, 'gmarche.antenne', {slug: slug})
|
|
||||||
endif -->
|
|
||||||
</footer>
|
</footer>
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
|
|
|
@ -18,13 +18,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- paginate(regions, 'gmarche.index') -->
|
|
||||||
<!-- "name" : "france_regions_2016",
|
|
||||||
"zoom": {
|
|
||||||
"enabled": true,
|
|
||||||
"maxLevel": 10-->
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(".container").mapael({
|
$(".container").mapael({
|
||||||
map: {
|
map: {
|
||||||
name: 'france_regions_2016',
|
name: 'france_regions_2016',
|
||||||
|
|
|
@ -16,14 +16,11 @@ class ProductModule extends Module
|
||||||
|
|
||||||
public function __construct(ContainerInterface $container)
|
public function __construct(ContainerInterface $container)
|
||||||
{
|
{
|
||||||
$gmarchePrefix = $container->get('gmarche.prefix');
|
$gmarchePrefix = $container->get('gmarche.prefix').'france/';
|
||||||
|
|
||||||
$container->get(RendererInterface::class)->addPath('product', __DIR__ . '/views');
|
$container->get(RendererInterface::class)->addPath('product', __DIR__ . '/views');
|
||||||
$router = $container->get(Router::class);
|
$router = $container->get(Router::class);
|
||||||
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
|
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
|
||||||
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
|
$router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
|
||||||
|
|
||||||
// $router->crud("$gmarchePrefix/{region:[a-z\-]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}",[LoggedInMiddleware::class, ProductCrudAction::class],'product.admin');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// $router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}", ProductIndexAction::class, 'product.index');
|
|
||||||
|
|
|
@ -55,7 +55,6 @@
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
.toggle_radio label{
|
.toggle_radio label{
|
||||||
/* font: 90%/1.618 "Source Sans Pro";*/
|
|
||||||
color: rgba(0,0,0,.9);
|
color: rgba(0,0,0,.9);
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -93,7 +92,7 @@
|
||||||
<nav aria-label="breadcrumb">
|
<nav aria-label="breadcrumb">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
|
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
|
||||||
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
|
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}france/{{ region_slug }}">{{ region_name }}</a></li>
|
||||||
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
|
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
|
||||||
|
|
||||||
<div class="toggle_radio">
|
<div class="toggle_radio">
|
||||||
|
@ -102,7 +101,7 @@
|
||||||
<label for="first_toggle"><p>PRODUITS</p></label>
|
<label for="first_toggle"><p>PRODUITS</p></label>
|
||||||
<label for="second_toggle">
|
<label for="second_toggle">
|
||||||
<p>
|
<p>
|
||||||
<a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
|
<a style="color:black;" href="{{ gmarchePrefix }}france/{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
|
||||||
</p>
|
</p>
|
||||||
</label>
|
</label>
|
||||||
<div class="toggle_option_slider">
|
<div class="toggle_option_slider">
|
||||||
|
@ -241,10 +240,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!--
|
<!--
|
||||||
crochet% set token_input = csrf_input %crochet
|
crochet% set token_input = csrf_input %crochet-->
|
||||||
|
|
||||||
paginate(items, routePrefix ~ '.index', {id: item.id, region: explodeUrl()[2],
|
|
||||||
slug: explodeUrl()[3], antenne: explodeUrl()[4]}) -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -93,14 +93,14 @@
|
||||||
<nav aria-label="breadcrumb">
|
<nav aria-label="breadcrumb">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
|
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
|
||||||
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
|
<li class="breadcrumb-item"><a href="{{ gmarchePrefix }}france/{{ region_slug }}">{{ region_name }}</a></li>
|
||||||
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
|
<li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
|
||||||
|
|
||||||
<div class="toggle_radio">
|
<div class="toggle_radio">
|
||||||
<input type="radio" class="toggle_option" id="first_toggle" name="toggle_option">
|
<input type="radio" class="toggle_option" id="first_toggle" name="toggle_option">
|
||||||
<input style="color:black;" type="radio" checked class="toggle_option" id="second_toggle" name="toggle_option">
|
<input style="color:black;" type="radio" checked class="toggle_option" id="second_toggle" name="toggle_option">
|
||||||
<label for="first_toggle">
|
<label for="first_toggle">
|
||||||
<a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
|
<a style="color:black;" href="{{ gmarchePrefix }}france/{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
|
||||||
</label>
|
</label>
|
||||||
<label for="second_toggle">
|
<label for="second_toggle">
|
||||||
<p>RECHERCHES</p>
|
<p>RECHERCHES</p>
|
||||||
|
|
Loading…
Reference in New Issue