Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
octomon
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
FUSS
octomon
Commits
8b300ca6
Unverified
Commit
8b300ca6
authored
6 years ago
by
Marco Marinello
Browse files
Options
Downloads
Patches
Plain Diff
Introduce red icon for probelamtic schools
parent
6b0bd179
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
octomon/static/js/images/marker-red.png
+0
-0
0 additions, 0 deletions
octomon/static/js/images/marker-red.png
octomon/templates/locationmap.html
+6
-0
6 additions, 0 deletions
octomon/templates/locationmap.html
with
6 additions
and
0 deletions
octomon/static/js/images/marker-red.png
0 → 100644
+
0
−
0
View file @
8b300ca6
5.86 KiB
This diff is collapsed.
Click to expand it.
octomon/templates/locationmap.html
+
6
−
0
View file @
8b300ca6
...
...
@@ -26,6 +26,8 @@
var
GeoIcon
=
L
.
Icon
.
extend
({});
var
icon
=
new
GeoIcon
({
iconUrl
:
'
/static/js/images/marker-on.png
'
,
iconAnchor
:
[
12
,
41
]});
var
redicon
=
new
GeoIcon
({
iconUrl
:
'
/static/js/images/marker-red.png
'
,
iconAnchor
:
[
12
,
41
]});
map
=
L
.
map
(
'
map
'
,
{
"
center
"
:
L
.
latLng
(
40
,
12
)});
var
tiles
=
L
.
tileLayer
(
'
//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
'
,
{
maxZoom
:
18
,
...
...
@@ -48,7 +50,11 @@
var
marker
=
L
.
marker
(
new
L
.
LatLng
(
a
[
0
],
a
[
1
]),
{
%
if
s
.
get_non_acked_alarms
%
}
{
icon
:
redicon
,
url
:
a
[
2
]});
{
%
else
%
}
{
icon
:
icon
,
url
:
a
[
2
]});
{
%
endif
%
}
marker
.
on
(
'
click
'
,
markerClick
)
markers
.
addLayer
(
marker
)
}
...
...
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