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
675749a5
Commit
675749a5
authored
Nov 22, 2015
by
Dominik Rosiek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jest ok, better loading :)
parent
2e21528d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
5 deletions
+30
-5
map.js
BeHub/Hub/static/js/map.js
+2
-1
maps.html
BeHub/Hub/templates/user_panel/content/maps.html
+28
-4
No files found.
BeHub/Hub/static/js/map.js
View file @
675749a5
...
...
@@ -56,5 +56,6 @@ Map.prototype.getAllBeacons = function(){
}
Map
.
prototype
.
showInfo
=
function
(
marker
){
alert
(
'marker klikniety'
+
marker
.
beacon
.
uuid
)
$
(
"#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 @
675749a5
...
...
@@ -4,9 +4,33 @@
<script>
var
map
;
function
startMap
(){
map
=
new
Map
();
};
$
(
document
).
ready
(
function
(){
$
(
'a[data-toggle="tab"]'
).
on
(
'shown.bs.tab'
,
function
(
e
)
{
var
target
=
$
(
e
.
target
).
attr
(
"href"
)
// activated tab
if
(
target
==
"#map"
&&
!
map
){
map
=
new
Map
();
}
});
});
</script>
<script
async
defer
src=
"https://maps.googleapis.com/maps/api/js?key=AIzaSyAaYyVEcLFqwKP_VnzfRSIMkWWWrLtMiGQ&signed_in=true&callback=startMap"
></script>
src=
"https://maps.googleapis.com/maps/api/js?key=AIzaSyAaYyVEcLFqwKP_VnzfRSIMkWWWrLtMiGQ&signed_in=true"
></script>
<!-- Modal -->
<div
class=
"modal fade"
id=
"myModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
>
<div
class=
"modal-dialog"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<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>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
Close
</button>
<button
type=
"button"
class=
"btn btn-primary"
>
Save changes
</button>
</div>
</div>
</div>
</div>
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