Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
BeHub-web
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dominik Rosiek
BeHub-web
Commits
53ef33c1
Commit
53ef33c1
authored
Nov 22, 2015
by
Dominik Rosiek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jest ok, better loading :)
parent
014e26f4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
map.js
BeHub/Hub/static/js/map.js
+35
-2
maps.html
BeHub/Hub/templates/user_panel/content/maps.html
+2
-2
No files found.
BeHub/Hub/static/js/map.js
View file @
53ef33c1
...
...
@@ -34,7 +34,7 @@ Map.prototype.addMarker = function(data){
title
:
data
.
title
,
beacon
:
data
.
beacon
}).
addListener
(
'click'
,
function
()
{
self
.
showInfo
(
this
)
self
.
showInfo
(
this
.
beacon
)
})
self
.
markers
.
push
(
marker
)
...
...
@@ -55,7 +55,40 @@ Map.prototype.getAllBeacons = function(){
})
}
Map
.
prototype
.
showInfo
=
function
(
marker
){
Map
.
prototype
.
showInfo
=
function
(
beacon
){
$
(
"#myModalLabel"
).
text
([
beacon
.
name
,
" ("
,
beacon
.
uuid
,
")"
].
join
(
""
))
$
(
"#modal-content"
).
html
([
'<div class="col-md-6">'
,
'description:'
,
'</div>'
,
'<div class="col-md-6">'
,
beacon
.
description
,
'</div>'
,
'<div class="col-md-6">'
,
'name:'
,
'</div>'
,
'<div class="col-md-6">'
,
beacon
.
name
,
'</div>'
,
'<div class="col-md-6">'
,
'uuid:'
,
'</div>'
,
'<div class="col-md-6">'
,
beacon
.
uuid
,
'</div>'
,
'<div class="col-md-6">'
,
'longitude:'
,
'</div>'
,
'<div class="col-md-6">'
,
beacon
.
longitude
,
'</div>'
,
'<div class="col-md-6">'
,
'latitude:'
,
'</div>'
,
'<div class="col-md-6">'
,
beacon
.
latitude
,
'</div>'
,
'<div class="clearfix"></div>'
].
join
(
""
))
$
(
"#myModal"
).
modal
(
"show"
);
// alert('marker klikniety' + marker.beacon.uuid)
}
\ No newline at end of file
BeHub/Hub/templates/user_panel/content/maps.html
View file @
53ef33c1
...
...
@@ -24,8 +24,8 @@
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
><span
aria-hidden=
"true"
>
×
</span></button>
<h4
class=
"modal-title"
id=
"myModalLabel"
>
Modal title
</h4>
</div>
<div
class=
"modal-body"
>
hehe
<div
class=
"modal-body"
id=
"modal-content"
>
</div>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
Close
</button>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment