Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 1c8d64c5 authored by NINASSI Benjamin's avatar NINASSI Benjamin
Browse files

correction copy/past people/meeting

parent 05e42726
No related branches found
No related tags found
No related merge requests found
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
'meeting.owner' : 'Organisateur' 'meeting.owner' : 'Organisateur'
'meeting.state' : 'Region' 'meeting.state' : 'Region'
'meeting.noloc' : 'Aucune localisation définie' 'meeting.noloc' : 'Aucune localisation définie'
'meeting.list' : 'Liste des rencontres'
"attribute.add" : "Ajouter" "attribute.add" : "Ajouter"
"attribute.edit" : "Modifier" "attribute.edit" : "Modifier"
'DataTable.FirstPage' : 'Première Page' 'DataTable.FirstPage' : 'Première Page'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
{% block body_title %} {% block body_title %}
{{ 'people.list' | trans }} {{ 'meeting.list' | trans }}
{% endblock body_title %} {% endblock body_title %}
{% block toplinklist %} {% block toplinklist %}
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
<div id="classcodeadmin_content" class="col-md-12" style="display:none;"> <div id="classcodeadmin_content" class="col-md-12" style="display:none;">
<div class="col-sm-12"> <div class="col-sm-12">
<div id="peopleMap" style="height:400px;"> <div id="meetingsMap" style="height:400px;">
</div> </div>
<div id='people_list_div'> <div id='meetings_list_div'>
{% include '@ClassCode/Meeting/ajax_list.html.twig' %} {% include '@ClassCode/Meeting/ajax_list.html.twig' %}
</div> </div>
</div> </div>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
$('#loader').hide(); $('#loader').hide();
$('#classcodeadmin_content').show(); $('#classcodeadmin_content').show();
//map //map
var peopleMap = L.map('peopleMap',{maxZoom: 18}).setView([46.52863469527167, 2.43896484375], 5), var meetingsMap = L.map('meetingsMap',{maxZoom: 18}).setView([46.52863469527167, 2.43896484375], 5),
markers = L.markerClusterGroup({ markers = L.markerClusterGroup({
spiderfyOnMaxZoom: true, spiderfyOnMaxZoom: true,
showCoverageOnHover: false, showCoverageOnHover: false,
...@@ -87,14 +87,14 @@ ...@@ -87,14 +87,14 @@
markerDetail += "<p class='h5'><b> " + "{{ m.getTime }} " + "</b></p>"; markerDetail += "<p class='h5'><b> " + "{{ m.getTime }} " + "</b></p>";
markers.addLayer(L.marker(L.latLng(lat, lon)).bindPopup(markerDetail) markers.addLayer(L.marker(L.latLng(lat, lon)).bindPopup(markerDetail)
.openPopup()); .openPopup());
peopleMap.addLayer(markers); meetingsMap.addLayer(markers);
} }
{% endif %} {% endif %}
{% endfor %} {% endfor %}
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 18, maxZoom: 18,
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors' attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(peopleMap); }).addTo(meetingsMap);
}); });
function loadDataTable(){ function loadDataTable(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment