+ "tileOptions": {
+ "crossOriginKeyword": null
+ },
+ "attribution": provider.attribution
+ }, options);
+ return OpenLayers.Layer.OSM.prototype.initialize.call(this, name, hosts, options);
+ }
+ });
+}
+
+/*
+ * StamenMapType for Google Maps API V3
+ *
+ */
+if (typeof google === "object" && typeof google.maps === "object") {
+
+ // Extending Google class based on a post by Bogart Salzberg of Portland Webworks,
+ // http://www.portlandwebworks.com/blog/extending-googlemapsmap-object
+ google.maps.ImageMapType = (function(_constructor){
+ var f = function() {
+ if (!arguments.length) {
+ return;
+ }
+ _constructor.apply(this, arguments);
+ }
+ f.prototype = _constructor.prototype;
+ return f;
+ })(google.maps.ImageMapType);
+
+
+ google.maps.StamenMapType = function(name) {
+ var provider = getProvider(name),
+ subdomains = provider.subdomains;
+ return google.maps.ImageMapType.call(this, {
+ "getTileUrl": function(coord, zoom) {
+ var numTiles = 1 << zoom,
+ wx = coord.x % numTiles,
+ x = (wx < 0) ? wx + numTiles : wx,
+ y = coord.y,
+ index = (zoom + x + y) % subdomains.length;
+ return provider.url
+ .replace("{S}", subdomains[index])
+ .replace("{Z}", zoom)
+ .replace("{X}", x)
+ .replace("{Y}", y);
+ },
+ "tileSize": new google.maps.Size(256, 256),
+ "name": name,
+ "minZoom": provider.minZoom,
+ "maxZoom": provider.maxZoom
+ });
+ };
+
+ // FIXME: is there a better way to extend classes in Google land?
+ // Possibly fixed, see above ^^^ | SC
+ google.maps.StamenMapType.prototype = new google.maps.ImageMapType;
+}
+
+})(typeof exports === "undefined" ? this : exports);
diff --git a/avisstage/statics.py b/avisstage/statics.py
index 0127fd1..012c457 100644
--- a/avisstage/statics.py
+++ b/avisstage/statics.py
@@ -1,13 +1,13 @@
# coding: utf-8
DEPARTEMENTS_DEFAUT = (
- ('phy', 'Physique'),
- ('maths', 'Maths'),
- ('bio', 'Biologie'),
- ('chimie', 'Chimie'),
+ ('phy', u'Physique'),
+ ('maths', u'Maths'),
+ ('bio', u'Biologie'),
+ ('chimie', u'Chimie'),
('geol', u'Géosciences'),
- ('dec', 'DEC'),
- ('info', 'Informatique'),
+ ('dec', u'DEC'),
+ ('info', u'Informatique'),
('litt', u'Littéraire'),
('guests', u'Pensionnaires étrangers'),
('pei', u'PEI'),
diff --git a/avisstage/templates/avisstage/detail/profil.html b/avisstage/templates/avisstage/detail/profil.html
index b598c88..6e7025c 100644
--- a/avisstage/templates/avisstage/detail/profil.html
+++ b/avisstage/templates/avisstage/detail/profil.html
@@ -4,10 +4,11 @@
{% block title %}Profil de {{ object.nom }} - ExperiENS{% endblock %}
{% block content %}
- Profil de {{ object.nom }}
+ Profil de {{ object.nom }}
{% if object.user == user %}
-
Modifier mes infos
+ Modifier mes infos
{% endif %}
+
Promotion : {{ object.promotion }}
Adresse de contact : {{ object.mail }}
diff --git a/avisstage/templates/avisstage/detail/stage.html b/avisstage/templates/avisstage/detail/stage.html
index 544b879..02b7275 100644
--- a/avisstage/templates/avisstage/detail/stage.html
+++ b/avisstage/templates/avisstage/detail/stage.html
@@ -7,7 +7,7 @@
-
+
+