From f0b3d31485ced67f5acf4aa66dfcbe929bb4841c Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Wed, 17 Jun 2015 02:13:00 +0200 Subject: Ajout images menu pour catégorie 81 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/saclay/css/saclay.css | 8 ++++++++ static/saclay/images/subcategories/ress_heberg_off.png | Bin 0 -> 3419 bytes static/saclay/images/subcategories/ress_heberg_on.png | Bin 0 -> 3439 bytes 3 files changed, 8 insertions(+) create mode 100644 static/saclay/images/subcategories/ress_heberg_off.png create mode 100644 static/saclay/images/subcategories/ress_heberg_on.png diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css index c94d90b..d8eb4b3 100644 --- a/static/saclay/css/saclay.css +++ b/static/saclay/css/saclay.css @@ -615,4 +615,12 @@ background-image:url('../images/subcategories/patri_forets_on.png'); } +/*81 - Ressources pratiques - Hébergement*/ +#li_sub_81 label{ + background-image:url('../images/subcategories/ress_heberg_off.png'); +} + +#li_sub_81 .selected label{ + background-image:url('../images/subcategories/ress_heberg_on.png'); +} diff --git a/static/saclay/images/subcategories/ress_heberg_off.png b/static/saclay/images/subcategories/ress_heberg_off.png new file mode 100644 index 0000000..b8e14dc Binary files /dev/null and b/static/saclay/images/subcategories/ress_heberg_off.png differ diff --git a/static/saclay/images/subcategories/ress_heberg_on.png b/static/saclay/images/subcategories/ress_heberg_on.png new file mode 100644 index 0000000..b4f2ed2 Binary files /dev/null and b/static/saclay/images/subcategories/ress_heberg_on.png differ -- cgit v1.2.3 From dd382e46859835d052efadb0ec25aa6d4029601c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 14 Jul 2015 09:56:46 +0000 Subject: CSS : ajustements --- static/saclay/css/styles.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 09e5616..1ec84eb 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -1100,9 +1100,10 @@ a.share_id_email_single{ padding:3px; bottom:0; position:absolute; - width:275px; + width:276px; height:22px; - border-right:1px solid; + border-right:1px solid #999; + border-left:1px solid #999; } .sidebar-handler{ -- cgit v1.2.3 From 14f49b287fd5b6e836a527c6b74b073e414f0102 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Jul 2015 18:48:43 +0200 Subject: Correction du bandeau en bas --- static/saclay/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 1ec84eb..9e3606b 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -1100,7 +1100,7 @@ a.share_id_email_single{ padding:3px; bottom:0; position:absolute; - width:276px; + width:275px; height:22px; border-right:1px solid #999; border-left:1px solid #999; -- cgit v1.2.3 From 286f904655a7699a32a973197ebeeb76f6e6369a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Jul 2015 19:47:26 +0200 Subject: Mise à jour des images de fond de sous-catégories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/saclay/css/saclay.css | 8 ++++---- .../images/subcategories/agri_ventealaferme_off.png | Bin 0 -> 3495 bytes .../images/subcategories/agri_ventealaferme_on.png | Bin 0 -> 3531 bytes 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 static/saclay/images/subcategories/agri_ventealaferme_off.png create mode 100644 static/saclay/images/subcategories/agri_ventealaferme_on.png diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css index d8eb4b3..89607db 100644 --- a/static/saclay/css/saclay.css +++ b/static/saclay/css/saclay.css @@ -262,11 +262,11 @@ /*30 - Agri-cultures - Ventes en circuits courts*/ #li_sub_30 label{ - background-image:url('../images/subcategories/agri_1_off.png'); + background-image:url('../images/subcategories/agri_4_off.png'); } #li_sub_30 .selected label{ - background-image:url('../images/subcategories/agri_1_on.png'); + background-image:url('../images/subcategories/agri_4_on.png'); } /*31 - Agri-cultures - Exploitations agricoles*/ @@ -500,11 +500,11 @@ /*61 - Agri-cultures - Ventes à la ferme*/ #li_sub_61 label{ - background-image:url('../images/subcategories/agri_4_off.png'); + background-image:url('../images/subcategories/agri_ventealaferme_off.png'); } #li_sub_61 .selected label{ - background-image:url('../images/subcategories/agri_4_on.png'); + background-image:url('../images/subcategories/agri_ventealaferme_on.png'); } /*62 - Événements - Expositions*/ diff --git a/static/saclay/images/subcategories/agri_ventealaferme_off.png b/static/saclay/images/subcategories/agri_ventealaferme_off.png new file mode 100644 index 0000000..2aecffb Binary files /dev/null and b/static/saclay/images/subcategories/agri_ventealaferme_off.png differ diff --git a/static/saclay/images/subcategories/agri_ventealaferme_on.png b/static/saclay/images/subcategories/agri_ventealaferme_on.png new file mode 100644 index 0000000..04944cd Binary files /dev/null and b/static/saclay/images/subcategories/agri_ventealaferme_on.png differ -- cgit v1.2.3 From d050b5ad90a23a2e28323d7cf4434dad12340ab5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Jul 2015 20:07:38 +0200 Subject: Ajout du XSLT pour l'agenda de Guyancourt --- xslt/guyancourt.xslt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 xslt/guyancourt.xslt diff --git a/xslt/guyancourt.xslt b/xslt/guyancourt.xslt new file mode 100644 index 0000000..bc30103 --- /dev/null +++ b/xslt/guyancourt.xslt @@ -0,0 +1,18 @@ + + + + + + + + + Ville de Guyancourt : + + + guyancourt- + + + + + + -- cgit v1.2.3 From dbb8be4b756c5d513b0c79320ea8c21173c367f7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Jul 2015 20:28:14 +0200 Subject: Mise à jour du XSLT de Guyancourt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xslt/guyancourt.xslt | 1 - 1 file changed, 1 deletion(-) diff --git a/xslt/guyancourt.xslt b/xslt/guyancourt.xslt index bc30103..0bfece6 100644 --- a/xslt/guyancourt.xslt +++ b/xslt/guyancourt.xslt @@ -5,7 +5,6 @@ - Ville de Guyancourt : -- cgit v1.2.3 From e79c6a4a618244b51b6240cb77aad61ddafdd52c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Jul 2015 21:02:22 +0200 Subject: Fix guyancourt xslt --- xslt/guyancourt.xslt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xslt/guyancourt.xslt b/xslt/guyancourt.xslt index 0bfece6..235879b 100644 --- a/xslt/guyancourt.xslt +++ b/xslt/guyancourt.xslt @@ -3,7 +3,7 @@ - + Ville de Guyancourt : -- cgit v1.2.3 From fe236c0b794221822eb4734132a5737a049880eb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 6 Jun 2015 11:18:52 +0200 Subject: Ajout d'un JSON mettant en valeur les limites --- static/saclay/json/limites.json | 7 +++++++ templates/chimere/blocks/map.html | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 static/saclay/json/limites.json diff --git a/static/saclay/json/limites.json b/static/saclay/json/limites.json new file mode 100644 index 0000000..d2c2a8b --- /dev/null +++ b/static/saclay/json/limites.json @@ -0,0 +1,7 @@ +{ +"type": "FeatureCollection", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.738949030574581, 49.952603203582044 ], [ 4.243480768004685, 49.948105260236979 ], [ 4.309343170727384, 47.332563074133375 ], [ 0.728503413899879, 47.328106451174797 ], [ 0.738949030574581, 49.952603203582044 ] ], [ [ 2.161148780079391, 48.748364785500634 ], [ 2.042390351388339, 48.789422908160716 ], [ 2.048030956338872, 48.650148369873229 ], [ 2.211008350929044, 48.586371447549617 ], [ 2.336716129783049, 48.612010168394001 ], [ 2.381320745076844, 48.692319746223006 ], [ 2.375596174099763, 48.815969935499531 ], [ 2.161148780079391, 48.748364785500634 ] ] ] } } +] +} diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html index bc27287..6273576 100644 --- a/templates/chimere/blocks/map.html +++ b/templates/chimere/blocks/map.html @@ -177,6 +177,8 @@ $(function(){ $('#maps').chimere('zoom', {'area':{{zoom}} }); {% endif %} + $('#{{map_id}}').chimere('addJSON', "{{STATIC_URL}}saclay/json/limites.json"); + // init layer selection $(function() { {% for layer_name, js, def in map_layers %} -- cgit v1.2.3 From dca0da43a6359f3cc986cf9baf262c58700ceacd Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Jul 2015 18:09:41 +0200 Subject: Modification des limites communales de la carte (pour l'exemple) --- static/saclay/json/limites.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/saclay/json/limites.json b/static/saclay/json/limites.json index d2c2a8b..3e646c0 100644 --- a/static/saclay/json/limites.json +++ b/static/saclay/json/limites.json @@ -1,7 +1,8 @@ { "type": "FeatureCollection", "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, + "features": [ -{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.738949030574581, 49.952603203582044 ], [ 4.243480768004685, 49.948105260236979 ], [ 4.309343170727384, 47.332563074133375 ], [ 0.728503413899879, 47.328106451174797 ], [ 0.738949030574581, 49.952603203582044 ] ], [ [ 2.161148780079391, 48.748364785500634 ], [ 2.042390351388339, 48.789422908160716 ], [ 2.048030956338872, 48.650148369873229 ], [ 2.211008350929044, 48.586371447549617 ], [ 2.336716129783049, 48.612010168394001 ], [ 2.381320745076844, 48.692319746223006 ], [ 2.375596174099763, 48.815969935499531 ], [ 2.161148780079391, 48.748364785500634 ] ] ] } } +{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.738949030574581, 49.952603203582044 ], [ 4.243480768004685, 49.948105260236979 ], [ 4.309343170727384, 47.332563074133375 ], [ 0.728503413899879, 47.328106451174797 ], [ 0.738949030574581, 49.952603203582044 ] ], [ [ 2.069752750563478, 48.771056366248636 ], [ 2.096449810971296, 48.717893498971932 ], [ 2.068271635180755, 48.66439181053974 ], [ 2.154809628987194, 48.686753709518385 ], [ 2.262500307362811, 48.664111175042557 ], [ 2.209616730119525, 48.715657505665774 ], [ 2.257150720136152, 48.776238232587687 ], [ 2.152974156307578, 48.737477793856712 ], [ 2.069752750563478, 48.771056366248636 ] ] ] } } ] } -- cgit v1.2.3 From 3fd32a432242ed9b3a9075531c8baafef5d485f4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 30 Jul 2015 15:24:47 +0200 Subject: Mise à jour du contour MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/saclay/json/limites.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/saclay/json/limites.json b/static/saclay/json/limites.json index 3e646c0..f465662 100644 --- a/static/saclay/json/limites.json +++ b/static/saclay/json/limites.json @@ -3,6 +3,6 @@ "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, "features": [ -{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.738949030574581, 49.952603203582044 ], [ 4.243480768004685, 49.948105260236979 ], [ 4.309343170727384, 47.332563074133375 ], [ 0.728503413899879, 47.328106451174797 ], [ 0.738949030574581, 49.952603203582044 ] ], [ [ 2.069752750563478, 48.771056366248636 ], [ 2.096449810971296, 48.717893498971932 ], [ 2.068271635180755, 48.66439181053974 ], [ 2.154809628987194, 48.686753709518385 ], [ 2.262500307362811, 48.664111175042557 ], [ 2.209616730119525, 48.715657505665774 ], [ 2.257150720136152, 48.776238232587687 ], [ 2.152974156307578, 48.737477793856712 ], [ 2.069752750563478, 48.771056366248636 ] ] ] } } +{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -3.084285466472236, 50.930008929515168 ], [ 8.769838884960212, 50.961348212996356 ], [ 8.901619126492303, 46.02748987068658 ], [ -3.028813249685328, 45.923426619792622 ], [ -3.084285466472236, 50.930008929515168 ] ], [ [ 2.308463989101716, 48.834849987186722 ], [ 1.903186849198961, 48.835273024038287 ], [ 1.904075446728209, 48.642725738777457 ], [ 2.308802961286485, 48.644265672631519 ], [ 2.308463989101716, 48.834849987186722 ] ] ] } } ] } -- cgit v1.2.3 From a864bf9045c3c835818d1378baece91ef11d377d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 30 Jul 2015 16:00:18 +0200 Subject: La carte simple affiche les mêmes informations que la carte complète MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/chimere/main_map_simple.html | 120 +++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 14 deletions(-) diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html index 552d309..a14ea3f 100644 --- a/templates/chimere/main_map_simple.html +++ b/templates/chimere/main_map_simple.html @@ -1,24 +1,116 @@ -{% extends "chimere/main_map.html" %} -{% load i18n %} -{% block body_class %}class='simple'{% endblock %} -{% block body_id %}id='simple'{% endblock %} -{% block menu %}{# no menu in simple mode #}{% endblock %} +{% extends "chimere/base.html" %} +{% load i18n unlocalize_point chimere_tags %} +{% block extra_head %} +{% head_jquery %} +{% head_chimere %} +{% head_jme %} +{% head_form %} + + + + + + +{{ block.super }} +{% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} +
+
    +
  • + +
    • {% if itinerary_form %} +
  • + +
    • {% endif %} +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
- -

{% trans "Categories"%}

- -
-
-
+
+
+
{# dynamic content #} +
+
+ {% routing %} +
+
+
{# dynamic content #} +
+
{# dynamic content #} +
+
{# dynamic content #} +
+
+
+ {% endblock %} {% block content %} - +
+
+ + +
+ {% if not itinerary_form %}
+ + {% trans "Move on the map" %} + + + {% trans "Draw" %} + +
{% endif %} + + {% if simple %} + {% display_welcome 0 %} + {%else%} + {% display_welcome news_visible %} + {% endif %} + {% display_news news_visible %} {{ block.super }} +
+
+ + {% map_menu %} + {% map 'main-map' %} +
+ +{% endblock %} +{% block footer %} +

{% include "chimere/blocks/footer.html" %}

{% endblock %} -- cgit v1.2.3 From 1d38aa4d81052362b40d89994f9cf1372250850f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 11 Aug 2015 11:25:23 +0200 Subject: Mise à jour des limites pour Saclay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/saclay/json/limites.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/saclay/json/limites.json b/static/saclay/json/limites.json index f465662..c4bd374 100644 --- a/static/saclay/json/limites.json +++ b/static/saclay/json/limites.json @@ -3,6 +3,9 @@ "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, "features": [ -{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -3.084285466472236, 50.930008929515168 ], [ 8.769838884960212, 50.961348212996356 ], [ 8.901619126492303, 46.02748987068658 ], [ -3.028813249685328, 45.923426619792622 ], [ -3.084285466472236, 50.930008929515168 ] ], [ [ 2.308463989101716, 48.834849987186722 ], [ 1.903186849198961, 48.835273024038287 ], [ 1.904075446728209, 48.642725738777457 ], [ 2.308802961286485, 48.644265672631519 ], [ 2.308463989101716, 48.834849987186722 ] ] ] } } +{ "type": "Feature", "properties": { "id": 2 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.415367733044637, 49.146755062646641 ], [ 1.910690386864486, 49.150093445860122 ], [ 1.903186849198962, 48.835273024038308 ], [ 1.904075446728196, 48.642725738777457 ], [ 1.902387807685004, 48.319876279125701 ], [ 1.406722596398787, 48.324208966009472 ], [ 1.415367733044637, 49.146755062646641 ] ] ] } }, +{ "type": "Feature", "properties": { "id": 3 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 2.332812437502604, 49.14879263981846 ], [ 2.825963733102833, 49.149887858037772 ], [ 2.868637641079677, 48.309477652615946 ], [ 2.327778583840803, 48.322815269690658 ], [ 2.308802961286472, 48.644265672631498 ], [ 2.3084639891017, 48.834849987186722 ], [ 2.332812437502604, 49.14879263981846 ] ] ] } }, +{ "type": "Feature", "properties": { "id": 4 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.910690386864491, 49.150093445860115 ], [ 2.332812437502604, 49.14879263981846 ], [ 2.3084639891017, 48.834849987186722 ], [ 1.903186849198962, 48.835273024038308 ], [ 1.910690386864491, 49.150093445860115 ] ] ] } }, +{ "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.904075446728196, 48.642725738777457 ], [ 2.308802961286472, 48.644265672631498 ], [ 2.327778583840808, 48.322815269690643 ], [ 1.902387807684997, 48.31987627912568 ], [ 1.904075446728196, 48.642725738777457 ] ] ] } } ] } -- cgit v1.2.3 From 147e6762ea8625a5cacb389a2a1cf2ea92d668e0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 13 Aug 2015 11:43:05 +0200 Subject: Afficher : en partir, y aller, etc sur la carte simple --- templates/chimere/blocks/map_menu.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 templates/chimere/blocks/map_menu.html diff --git a/templates/chimere/blocks/map_menu.html b/templates/chimere/blocks/map_menu.html new file mode 100644 index 0000000..38fb4a8 --- /dev/null +++ b/templates/chimere/blocks/map_menu.html @@ -0,0 +1,14 @@ +{% load i18n %} +
+
    + {% if routing %} +
  • {% trans "From" context "routing" %}
    • +
  • {% trans "Add a step" context "routing" %}
    • +
  • {% trans "To" context "routing" %}
    • +
  • {% trans "Clear the itinerary" context "routing" %}
    • + {% endif%} +
  • {% trans "Zoom in" %}
    • +
  • {% trans "Zoom out" %}
    • +
  • {% trans "Center the map here" %}
    • +
+
-- cgit v1.2.3 From b70900fdf7b06a23f2775a8290092398d9d82123 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 13 Aug 2015 11:55:01 +0200 Subject: Modification de l'image de fon pour les équipements sportifs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/saclay/css/saclay.css | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css index 89607db..9bf32e4 100644 --- a/static/saclay/css/saclay.css +++ b/static/saclay/css/saclay.css @@ -188,14 +188,6 @@ background-image:url('../images/subcategories/bala_2_on.png'); } -/*17 - Sport et loisirs - Terrains de sport*/ -#li_sub_17 label{ - background-image:url('../images/subcategories/spor_3_off.png'); -} - -#li_sub_17 .selected label{ - background-image:url('../images/subcategories/spor_3_on.png'); -} /*18 - Sport et loisirs - Parcs et jardins*/ #li_sub_18 label{ @@ -215,13 +207,13 @@ background-image:url('../images/subcategories/spor_5_on.png'); } -/*20 - Sport et loisirs - Salles de sport*/ +/*20 - Sport et loisirs - Equipements sportifs */ #li_sub_20 label{ - background-image:url('../images/subcategories/spor_1_off.png'); + background-image:url('../images/subcategories/spor_3_off.png'); } #li_sub_20 .selected label{ - background-image:url('../images/subcategories/spor_1_on.png'); + background-image:url('../images/subcategories/spor_3_on.png'); } /*22 - Balades - Points étapes*/ -- cgit v1.2.3 From 1d46134d8861e072e334c0772a95d88523572d4a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 19 Aug 2015 23:44:43 +0200 Subject: Mise à jour du message d'avertissement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.py | 83 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/settings.py b/settings.py index f84e7db..190a0b4 100644 --- a/settings.py +++ b/settings.py @@ -4,7 +4,8 @@ # Don't edit this file: # overload all theses settings in your local_settings.py file -import os, sys +import os +import sys _ = lambda s: s DEBUG = False @@ -29,11 +30,11 @@ JQUERY_CSS_URLS = [] OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] GPSBABEL = '/usr/bin/gpsbabel' -GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an - # error of 5 meters -#GPSBABEL_OPTIONS = 'simplify,count=100' +# simplify with an  error of 5 meters +GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' +# GPSBABEL_OPTIONS = 'simplify,count=100' -## chimere specific ## +# chimere specific ## CHIMERE_DEFAULT_ZOOM = 10 # center of the map CHIMERE_DEFAULT_CENTER = (-1.679444, 48.114722) @@ -69,10 +70,12 @@ CHIMERE_MINIATURE_BY_DEFAULT = False # JS definition of the default map (for admin and when no map are defined in # the application) # cf. OpenLayers documentation for more details -CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map + +# OSM mapnik map +CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" CHIMERE_XAPI_URL = 'http://open.mapquestapi.com/xapi/api/0.6/' -CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL +CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'test' CHIMERE_OSM_PASSWORD = 'test' @@ -91,13 +94,14 @@ CHIMERE_ENABLE_ROUTING = False CHIMERE_ROUTING_TRANSPORT = (('foot', _(u"Foot")), ('bicycle', _(u"Bicycle")), ('motorcar', _(u"Motorcar")), - ) + ) -CHIMERE_ROUTING_SPEEDS = {'foot':((3, _(u"You are walking slowly")), - (6, _(u"You are walking pretty quickly")),), - 'bicycle':((16, _(u"You are riding pretty slowly")), - (22, _(u"You are riding pretty quickly")),) - } +CHIMERE_ROUTING_SPEEDS = {'foot': ((3, _(u"You are walking slowly")), + (6, _(u"You are walking pretty quickly")),), + 'bicycle': ((16, _(u"You are riding pretty slowly")), + (22, _(u"You are riding pretty quickly")) + ) + } # available routing engine: 'routino' CHIMERE_ROUTING_ENGINE = { @@ -107,25 +111,26 @@ CHIMERE_ROUTING_ENGINE = { } CHIMERE_ROUTING_FAIL_MESSAGE = u"""

Attention

-

Le moteur de routage a échoué dans sa recherche de trajet. Les points de +

Le moteur de routage a échoué dans sa recherche de trajet. Les points de départ ou d'arrivée sont peut-être trop loin d'une voie existante ou le trajet est trop dangereux.

""" NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search' # thumbnail -CHIMERE_THUMBS_SCALE_HEIGHT=250 -CHIMERE_THUMBS_SCALE_WIDTH=None +CHIMERE_THUMBS_SCALE_HEIGHT = 250 +CHIMERE_THUMBS_SCALE_WIDTH = None # length of short description CHIMERE_SHORT_DESC_LENGTH = 400 -CHIMERE_MODIF_EMAIL = _(u"""Hello, I would like to propose you a modification about this item: """) +CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification " + u"about this item: ") -CHIMERE_ROUTING_WARN_MESSAGE = u"""

Attention

-

Cet itinéraire comporte des passages dangereux, nous vous conseillons de -modifier votre recherche.

-""" +CHIMERE_ROUTING_WARN_MESSAGE = u"

Attention

"\ + u"

Cet itinéraire comporte des passages dangereux, nous vous conseillons"\ + u" de modifier votre recherche, en ajoutant par exemple un ou des points "\ + u"d'étape à votre parcours pour éviter les zones de danger.

" CHIMERE_CSV_ENCODING = 'ISO-8859-1' @@ -183,7 +188,7 @@ MEDIA_URL = '/media/' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.load_template_source', + # 'django.template.loaders.eggs.load_template_source', ) MIDDLEWARE_CLASSES = ( @@ -197,9 +202,6 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'chimere_saclay.urls' TEMPLATE_DIRS = [ - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. ROOT_PATH + 'templates', ] @@ -227,6 +229,7 @@ INSTALLED_APPS = [ try: import djcelery import kombu + kombu djcelery.setup_loader() BROKER_URL = 'django://' INSTALLED_APPS += ['kombu.transport.django', @@ -240,12 +243,13 @@ INSTALLED_APPS += [ 'chimere', ] -MOBILE_DOMAINS = [] # if you have specific domains for mobile access +MOBILE_DOMAINS = [] # if you have specific domains for mobile access LOGFILENAME = '/var/log/django/chimere.log' -LOGGING = {'version': 1, - 'disable_existing_loggers': False, +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, 'handlers': { # Include the default Django email handler for errors # This is what you'd get without configuring logging at all. @@ -277,8 +281,8 @@ LOGGING = {'version': 1, # Your own app - this assumes all your logger names start with "myapp." 'chimere': { 'handlers': ['logfile'], - 'level': 'WARNING', # Or maybe INFO or DEBUG - 'propogate': False + 'level': 'WARNING', # Or maybe INFO or DEBUG + 'propogate': False }, }, } @@ -308,12 +312,12 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals(): # share with global CHIMERE_SHARE_NETWORKS CHIMERE_SHARE_NETWORKS = ( - ("Email", 'mailto:?subject=%(text)s&body=%(url)s', - STATIC_URL + 'chimere/img/email.png'), - ("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s', - STATIC_URL + 'chimere/img/facebook.png'), - ("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s', - STATIC_URL + 'chimere/img/twitter.png'), + ("Email", 'mailto:?subject=%(text)s&body=%(url)s', + STATIC_URL + 'chimere/img/email.png'), + ("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s', + STATIC_URL + 'chimere/img/facebook.png'), + ("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s', + STATIC_URL + 'chimere/img/twitter.png'), ) if 'OSM_JS_URLS' not in globals(): @@ -323,6 +327,7 @@ if 'OSM_JS_URLS' not in globals(): "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] if 'OSM_MOBILE_JS_URLS' not in globals(): global OSM_MOBILE_JS_URLS - OSM_MOBILE_JS_URLS = [STATIC_URL + "openlayers/OpenLayers.mobile.js", - "http://www.openstreetmap.org/openlayers/OpenStreetMap.js" - ] + OSM_MOBILE_JS_URLS = [ + STATIC_URL + "openlayers/OpenLayers.mobile.js", + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js" + ] -- cgit v1.2.3