Merge branch 'rezine-style' of https://code.ffdn.org/FFDN/celutz into rezine-style

panorama/static/panorama/css/celutz.css

@@ -46,9 +46,12 @@ input[type="text"]:focus {
           box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
 }
 
-#id_altitude,
-#id_longitude,
-#id_latitude ,
+#id_newpano-altitude,
+#id_newpano-longitude,
+#id_newpano-latitude ,
+#id_custompoint-altitude,
+#id_custompoint-longitude,
+#id_custompoint-latitude ,
 #angle_ctrl,
 #elvtr_ctrl,
 #loca_altitude,
@@ -57,7 +60,7 @@ input[type="text"]:focus {
   padding: 0 0 0 5px;
 }
 
-#id_image {
+#id_newpano-image {
   color: #999;
   font-size: 11px;
   display: block;

panorama/templates/panorama/main.html

@@ -50,6 +50,19 @@ style="padding:0px"
     maxClusterRadius: 20
     });
 
+    function fillcoord() {
+            var lat = map.getCenter().lat.toFixed(5);
+            var lng = map.getCenter().lng.toFixed(5);
+            $('#id_custompoint-latitude').val(lat);
+            $('#id_newpano-latitude').val(lat);
+            $('#id_custompoint-longitude').val(lng);
+            $('#id_newpano-longitude').val(lng);
+            $.get("http://api.geonames.org/astergdem?lat="+lat+"&lng="+lng+"&username=celutz&style=full" ).done(
+                function(data) {
+                    $('#id_custompoint-altitude').val(parseInt(data));
+                    $('#id_newpano-altitude').val(parseInt(data));
+                });
+    }
     function initmap() {
         // set up the map
         map = new L.Map('map');
@@ -66,7 +79,7 @@ style="padding:0px"
         var crosshairIcon = L.icon({
             iconUrl: 'images/crosshair.png',
             iconSize:     [20, 20], // size of the icon
-            iconAnchor:   [10, 10], // point of the icon which will correspond to marker's location
+            iconAnchor:   [10, 10] // point of the icon which will correspond to marker's location
         });
         crosshair = new L.marker(map.getCenter(), {clickable:false});
         crosshair.addTo(map);
@@ -76,17 +89,13 @@ style="padding:0px"
             crosshair.setLatLng(map.getCenter());
         });
         map.on('moveend', function(e) {
-            var lat = map.getCenter().lat.toFixed(5);
-            var lng = map.getCenter().lng.toFixed(5);
-            $('#id_custompoint-latitude').val(lat);
-            $('#id_newpano-latitude').val(lat);
-            $('#id_custompoint-longitude').val(lng);
-            $('#id_newpano-longitude').val(lng);
-            $.get("http://api.geonames.org/astergdem?lat="+lat+"&lng="+lng+"&username=celutz&style=full" ).done(
-                function(data) {
-                    $('#id_custompoint-altitude').val(parseInt(data));
-                    $('#id_newpano-altitude').val(parseInt(data));
-                });
+            if ($("#locate-gps,#new-pano").hasClass("collapse in")){
+                fillcoord();
+            }
+        });
+        $('#locate-gps-btn, #new-pano-btn').on('click', function(e) {
+            console.log('test');
+            fillcoord();
         });
     var panoIcon = L.icon({
         iconUrl: '{% static "panorama/img/marker-red.png" %}',

panorama/templates/panorama/sidebar.html

@@ -24,7 +24,7 @@
             </ul>
         </li>
         <li>
-            <a href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate GPS point" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <a id="locate-gps-btn" href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate GPS point" %}<i class="fa fa-fw fa-caret-down"></i></a>
             <ul id="locate-gps" class="collapse">
                 <li>
                     <form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
@@ -37,7 +37,7 @@
             </ul>
         </li>
         <li>
-            <a href="javascript:;" data-toggle="collapse" data-target="#new-pano"><i class="fa fa-fw fa-plus-square"></i> {% trans "Add new panorama" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <a id="new-pano-btn" href="javascript:;" data-toggle="collapse" data-target="#new-pano"><i class="fa fa-fw fa-plus-square"></i> {% trans "Add new panorama" %}<i class="fa fa-fw fa-caret-down"></i></a>
             <ul id="new-pano" class="collapse">
                 <li>
                     <form action="{% url 'panorama:new' %}" enctype="multipart/form-data" method="post">{% csrf_token %}