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

panorama/static/panorama/js/pano.js

@@ -174,12 +174,12 @@ function drawDecorations(ox, oy, tx, ty, twidth, theight) {
 
     // draw a vertical blue line with the central dot
     // the dot is centered on (ox, oy) = (canvas.width/2, canvas.width/2)
-    var line_width = 6;
-    cntext.fillStyle = "rgba(0,0,255,0.5)";
-    cntext.strokeStyle = "rgb(255,255,255)";
-    cntext.lineWidth = 1;
+    var line_width = 3;
+    cntext.fillStyle = "rgba(43, 130, 203, 0.7)";
+    cntext.strokeStyle = "yellow";
+    cntext.lineWidth = 2;
     cntext.fillRect(canvas.width/2-line_width/2, 0, line_width, canvas.height);
-    cntext.strokeRect(canvas.width/2-line_width/2, canvas.height/2-line_width, line_width, line_width);
+    cntext.strokeRect(canvas.width/2-line_width, canvas.height/2-line_width, line_width*2, line_width*2);
     for(var i = 0; i < zm.pt_list.length; i++) {
       if (zm.pt_list[i]['type'] != 'unlocated') {
 	    cntext.fillStyle = 'rgba('+point_colors[zm.pt_list[i]['type']]+',0.5)';
@@ -1218,7 +1218,8 @@ function getCone(lat, lng, bearing, cap, distance){
         destVincenty(lat, lng, cap.cap_max, distance).lng])
 
 	var p = L.polygon(conepoints, {
-	    color: 'grey',
+	    color: 'black',
+            weight: '1',
 	    fillColor: 'grey',
 	    fillOpacity: 0.5
 	    });
@@ -1277,10 +1278,11 @@ function load_map(){
 	var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
 	var osm = new L.TileLayer(osmUrl, {attribution: osmAttrib});		
 	map.addLayer(osm);
-    map.addLayer( markerClusters );
+        map.addLayer( markerClusters );
+
 
 	L.marker([panorama_lat, panorama_lng]).addTo(map);
-    map.fitBounds(allMarkers,{padding: [30, 30]});
+        map.fitBounds(allMarkers,{padding: [30, 30]});
 
     map.on('click', function(e) { 
         /* Compute the new cap to show given the clic lat/lng */
@@ -1324,8 +1326,8 @@ function update_map(){
     var bearing = $('#angle_ctrl').val();
     var cap = getCapMinMaxVisible();
 
-	viewField = getCone(panorama_lat,panorama_lng,bearing,cap,7000);
-    viewDirection = L.polygon([[panorama_lat, panorama_lng],[destVincenty(panorama_lat, panorama_lng, bearing, 7000).lat,destVincenty(panorama_lat, panorama_lng, bearing, 7000).lng]]);
+    viewField = getCone(panorama_lat,panorama_lng,bearing,cap,7000);
+    viewDirection = L.polygon([[panorama_lat, panorama_lng],[destVincenty(panorama_lat, panorama_lng, bearing, 7000).lat,destVincenty(panorama_lat, panorama_lng, bearing, 7000).lng]],{color: '#2880ca', opacity: 1, weight: 2});
     
     viewField.addTo(map);
     viewDirection.addTo(map);

panorama/templates/panorama/main.html

@@ -70,11 +70,11 @@
             $("ul.side-nav").children().click(function(e) {
                 var menu = $(e.target);
                 var content = menu.next();
+                var contentid = content.attr("id");
                 if (content.is("ul") && content.hasClass("collapse") && !content.hasClass('in')) {
                     $(".collapse.in").each(function(){ 
                         $(".collapse.in").animate({height: '1px'}, 500, function(){
-                            $(".collapse.in").removeClass("in");
-                            $(content).addClass("in");
+                            $(".collapse.in").not(document.getElementById(contentid)).removeClass("in");
                         });
                     });
                 };

panorama/templates/panorama/view.html

@@ -71,16 +71,19 @@
           iconAnchor: [11, 35],
           popupAnchor: [0,-50]
       });
+      
       {% for pano in panoramas %}
-          var marker = L.marker([{{ pano.latitude }}, {{ pano.longitude }}], {icon: panoIcon, riseOnHover: true});
-          marker.on("click",function(){document.location.href="{% url 'panorama:view_pano' pano.id %}"});
-          var popup = marker.bindPopup('{{ pano.name }}',{className : 'markerpopup', closeButton: false,});
-          popup.on('mouseover', marker.openPopup);
-          popup.on('mouseout', marker.closePopup);
-          markerClusters.addLayer( marker );
-          allMarkers.push([{{ pano.latitude }}, {{ pano.longitude }}]);
+          {% if panorama.name != pano.name  %}
+              var marker = L.marker([{{ pano.latitude }}, {{ pano.longitude }}], {icon: panoIcon, riseOnHover: true});
+              marker.on("click",function(){document.location.href="{% url 'panorama:view_pano' pano.id %}"});
+              var popup = marker.bindPopup('{{ pano.name }}',{className : 'markerpopup', closeButton: false,});
+              popup.on('mouseover', marker.openPopup);
+              popup.on('mouseout', marker.closePopup);
+              markerClusters.addLayer( marker );
+              allMarkers.push([{{ pano.latitude }}, {{ pano.longitude }}]);
+          {% endif %}
       {% endfor %}
-      
+
       $( document ).ready(load_map);
     </script>
 {% endblock js %}