Commit a2aab80a authored by Daniel STAN's avatar Daniel STAN
Browse files

Merge branch 'master' of git+ssh://git.crans.org/git/intranet

parents 16e7f94f 7c652989
......@@ -29,7 +29,8 @@ from django.http import HttpResponse
#from django.contrib.auth.decorators import login_required, permission_required
def get_xml(request):
doc = parse_xml.global_status()
public = not request.user.groups.filter(name='crans_nounou')
doc = parse_xml.global_status(public)
return HttpResponse(doc.toxml('utf-8'),content_type='text/xml; coding=utf-8')
def index(request):
......
......@@ -31,7 +31,8 @@ WifiMap = {
'off': new OpenLayers.Layer.Markers("En panne"),
'on': new OpenLayers.Layer.Markers("Fonctionnelle"),
'autres': new OpenLayers.Layer.Markers("Autres"),
'hl': new OpenLayers.Layer.Markers("Remarquables")};
'hl': new OpenLayers.Layer.Markers("Remarquables")
};
var bornes = {};
this.featureLayer = new OpenLayers.Layer.Vector("Test");
//var markers = new OpenLayers.Layer.Markers("Pointeur");
......@@ -179,6 +180,8 @@ WifiMap = {
this.marker.icon.size.h = 25*ratio;
this.marker.icon.offset.x = -this.marker.icon.size.w/2;
this.marker.icon.offset.y = -this.marker.icon.size.h;
this.marker.icon.setOpacity(this.highlighted ? 0.7 : 1)
this.marker.icon.imageDiv.style.pointerEvents = this.highlighted ? 'none': '';
this.marker.icon.draw();
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment