Merge remote-tracking branch 'origin/master'

BeHub/Hub/static/js/map.js

@@ -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,6 +55,40 @@ Map.prototype.getAllBeacons = function(){
     })
 }
 
-Map.prototype.showInfo = function(marker){
-    alert('marker klikniety' + marker.beacon.uuid)
+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

@@ -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">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+      </div>
+      <div class="modal-body" id="modal-content">
+
+      </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>