usuwanie linkóœ

BeHub/Hub/static/js/beacon.js

@@ -15,9 +15,9 @@ function show_beacons(){
                         '<td>'].join(""));
                             for(var j=0; j<beacon_managers[i].sites.length; j++){
                                 html.push(['<p> <a href="', beacon_managers[i].sites[j].link_url, '">', beacon_managers[i].sites[j].link_url, '</a>',
-                                '<button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Usun</button></p>'].join(""))
+                                '<button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Remove</button></p>'].join(""))
                             }
-                        html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Dodaj link</button></p>',
+                        html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Add link</button></p>',
                         '</td>',
                       '</tr>',
                     '</tbody>',
@@ -47,9 +47,9 @@ function show_beacons_list(){
                         '<td>'].join(""));
                             for(var j=0; j<beacon_managers[i].sites.length; j++){
                                 html.push(['<p> <a href="', beacon_managers[i].sites[j].link_url, '">', beacon_managers[i].sites[j].link_url, '</a>',
-                                 ,'<button <button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Usun</button></p>'].join(""))
+                                 ,'<button <button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Remove</button></p>'].join(""))
                             }
-                        html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Dodaj link</button></p>',
+                        html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Add link</button></p>',
                         '</td>',
                       '</tr>',
                     '</tbody>',
@@ -73,7 +73,6 @@ function removeProject(event, project_id){
 }
 
 function removeLink(beacon_manager, link){
-    event.stopPropagation();
     $.ajax({
         url: beacon_manager,
         type: 'GET',

BeHub/Hub/static/js/map.js

@@ -137,6 +137,7 @@ Map.prototype.showInfo = function(beacon){
                 success: function(result) {
                     map.clearMarkers();
                     map.getAllBeacons();
+                    show_beacons();
                     $("#myModal").modal("hide");
                 }
             });
@@ -156,6 +157,7 @@ Map.prototype.showInfo = function(beacon){
                 success: function(result) {
                     map.clearMarkers();
                     map.getAllBeacons();
+                    show_beacons();
                     $("#myModal").modal("hide");
                 }
             });

BeHub/Hub/templates/user_panel/content/beacon_detail.html

@@ -8,9 +8,9 @@
         <td>
 
             {% for site in beacon_data.sites %}
-            <p> <a href="site.link_url">{{ site.link_url }} </a> <button class="btn btn-danger">Usun</button></p>
+            <p> <a href="site.link_url">{{ site.link_url }} </a> <button class="btn btn-danger">Remove</button></p>
             {% endfor %}
-            <p> <button class="btn btn-success">Dodaj link</button></p>
+            <p> <button class="btn btn-success">Add link</button></p>
         </td>
 
       </tr>

BeHub/Hub/templates/user_panel/content/beacon_list.html

@@ -16,7 +16,7 @@
                 </div>
                 <div class="info">
                     <h4 class="text-center"><!-- Button trigger modal -->
-                      Dodaj beacona
+                      Add beacon
                     </h4>
                 </div>
             </div>
@@ -33,10 +33,6 @@
     </script>
     <div id="container2__">
 
-            {% for beacon_data in beacon_display  %}
-            {% include 'user_panel/content/beacon_detail.html' %}
-            {% endfor %}
-                    {% include 'user_panel/content/beacon_detail.html' %}
     </div>
 </div>
 
@@ -66,11 +62,11 @@
 
     $("#myModal").modal("show");
     $("#modal-content").html('<form action="/login/" method="post" class="form-signin">\
-                <p><input id="name" type="text" class="form-control" placeholder="Nazwa beacona" required autofocus name="name"></p>\
+                <p><input id="name" type="text" class="form-control" placeholder="Name" required autofocus name="name"></p>\
                 <p><input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc"></p>\
                 <p><input id="uuid" type="text" class="form-control" placeholder="UUID" required autofocus name="uuid"></p>\
                 <p><input id="long" type="text" class="form-control" placeholder="Longitude" required autofocus name="long"></p>\
-                <p><input id="lat" type="text" class="form-control" placeholder="latitude" required autofocus name="lat"></p>\
+                <p><input id="lat" type="text" class="form-control" placeholder="Latitude" required autofocus name="lat"></p>\
     </form>');
 
     $("#modal-footer").html('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\

BeHub/Hub/templates/user_panel/content/beacons.html

@@ -8,15 +8,8 @@
     });
 </script>
 <div class="container">
+
         <div id="container__">
 
         </div>
-
-        {% for beacon_data in beacon_display  %}
-        {% include 'user_panel/content/beacon_detail.html' %}
-        {% endfor %}
-                {% include 'user_panel/content/beacon_detail.html' %}
-
-
-
 </div>
\ No newline at end of file

BeHub/Hub/templates/user_panel/content/dashboard.html

@@ -17,7 +17,7 @@
                 </div>
                 <div class="info">
                     <h4 class="text-center"><!-- Button trigger modal -->
-                      Nowy projekt
+                      New project
                     </h4>
                 </div>
             </div>
@@ -53,13 +53,13 @@
     <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">Dodaj projekt</h4>
+        <h4 class="modal-title" id="myModalLabel">Add project</h4>
       </div>
       <div class="modal-body" id="modal-content">
 
           <form action="/login/" method="post" class="form-signin">
-                <p><input id="name" type="text" class="form-control" placeholder="Nazwa projektu" required autofocus name="name"></p>
-                <p><textarea id="desc" class="form-control" type="description" id="article_content" name="content" placeholder="Zawartosc" maxlength="140" rows="7"></textarea></p>
+                <p><input id="name" type="text" class="form-control" placeholder="Project name" required autofocus name="name"></p>
+                <p><textarea id="desc" class="form-control" type="description" id="article_content" name="content" placeholder="Description" maxlength="140" rows="7"></textarea></p>
 
                 </form>
       </div>

BeHub/Hub/templates/user_panel/content/project.html

@@ -13,8 +13,8 @@
 <div class="col-md-10 col-md-offset-1 " >
 
 <ul class="nav nav-tabs nav-justified">
-  <li class="active"><a data-toggle="tab" href="#beacons">Twoje beacony</a></li>
-  <li><a data-toggle="tab" href="#map">Mapa</a></li>
+  <li class="active"><a data-toggle="tab" href="#beacons">Your beacons</a></li>
+  <li><a data-toggle="tab" href="#map">Map</a></li>
 </ul>
 
 <div class="tab-content">
@@ -38,7 +38,7 @@
     <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>
+        <h4 class="modal-title" id="myModalLabel">Add</h4>
       </div>
       <div class="modal-body" id="modal-content">