diff --git a/src/ClassCodeBundle/Resources/translations/messages.fr.yml b/src/ClassCodeBundle/Resources/translations/messages.fr.yml index 8c71c904292ea8be94bc01c017a23de0d6c2962c..ba428b1adca28216bd594085c717cac54266a103 100644 --- a/src/ClassCodeBundle/Resources/translations/messages.fr.yml +++ b/src/ClassCodeBundle/Resources/translations/messages.fr.yml @@ -89,6 +89,7 @@ 'meeting.owner' : 'Organisateur' 'meeting.state' : 'Region' 'meeting.noloc' : 'Aucune localisation définie' +'meeting.list' : 'Liste des rencontres' "attribute.add" : "Ajouter" "attribute.edit" : "Modifier" 'DataTable.FirstPage' : 'Première Page' diff --git a/src/ClassCodeBundle/Resources/views/Meeting/list.html.twig b/src/ClassCodeBundle/Resources/views/Meeting/list.html.twig index bdd2f9897e317051095d89cf4a6a25d9907b716e..74e213bac5ba87138740ac08e45bc30d4b1e3390 100644 --- a/src/ClassCodeBundle/Resources/views/Meeting/list.html.twig +++ b/src/ClassCodeBundle/Resources/views/Meeting/list.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block body_title %} - {{ 'people.list' | trans }} + {{ 'meeting.list' | trans }} {% endblock body_title %} {% block toplinklist %} @@ -22,10 +22,10 @@ <div id="classcodeadmin_content" class="col-md-12" style="display:none;"> <div class="col-sm-12"> - <div id="peopleMap" style="height:400px;"> + <div id="meetingsMap" style="height:400px;"> </div> - <div id='people_list_div'> + <div id='meetings_list_div'> {% include '@ClassCode/Meeting/ajax_list.html.twig' %} </div> </div> @@ -48,7 +48,7 @@ $('#loader').hide(); $('#classcodeadmin_content').show(); //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({ spiderfyOnMaxZoom: true, showCoverageOnHover: false, @@ -87,14 +87,14 @@ markerDetail += "<p class='h5'><b> " + "{{ m.getTime }} " + "</b></p>"; markers.addLayer(L.marker(L.latLng(lat, lon)).bindPopup(markerDetail) .openPopup()); - peopleMap.addLayer(markers); + meetingsMap.addLayer(markers); } {% endif %} {% endfor %} L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 18, attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors' - }).addTo(peopleMap); + }).addTo(meetingsMap); }); function loadDataTable(){