Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
classcodeadmin
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ClassCode
classcodeadmin
Commits
1c8d64c5
Commit
1c8d64c5
authored
6 years ago
by
NINASSI Benjamin
Browse files
Options
Downloads
Patches
Plain Diff
correction copy/past people/meeting
parent
05e42726
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ClassCodeBundle/Resources/translations/messages.fr.yml
+1
-0
1 addition, 0 deletions
src/ClassCodeBundle/Resources/translations/messages.fr.yml
src/ClassCodeBundle/Resources/views/Meeting/list.html.twig
+6
-6
6 additions, 6 deletions
src/ClassCodeBundle/Resources/views/Meeting/list.html.twig
with
7 additions
and
6 deletions
src/ClassCodeBundle/Resources/translations/messages.fr.yml
+
1
−
0
View file @
1c8d64c5
...
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
src/ClassCodeBundle/Resources/views/Meeting/list.html.twig
+
6
−
6
View file @
1c8d64c5
...
...
@@ -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=
"
people
Map"
style=
"height:400px;"
>
<div
id=
"
meetings
Map"
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
people
Map
=
L
.
map
(
'
people
Map
'
,{
maxZoom
:
18
}).
setView
([
46.52863469527167
,
2.43896484375
],
5
),
var
meetings
Map
=
L
.
map
(
'
meetings
Map
'
,{
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
());
people
Map
.
addLayer
(
markers
);
meetings
Map
.
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
(
people
Map
);
}).
addTo
(
meetings
Map
);
});
function
loadDataTable
(){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment