summaryrefslogtreecommitdiff
path: root/templates/chimere/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'templates/chimere/blocks')
-rw-r--r--templates/chimere/blocks/map.html23
-rw-r--r--templates/chimere/blocks/map_menu.html14
-rw-r--r--templates/chimere/blocks/news.html8
-rw-r--r--templates/chimere/blocks/share_bar.html7
-rw-r--r--templates/chimere/blocks/submited.html6
-rw-r--r--templates/chimere/blocks/welcome.html4
6 files changed, 42 insertions, 20 deletions
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 9e37b3f..6273576 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -7,7 +7,7 @@ $(function(){
$('#cluster_list').dialog({'autoOpen':false,
'resizable':false,
'width':340,
- 'dialogClass':'no-titlebar'});
+ 'dialogClass':'no-titlebar-small'});
});
// -->
</script>
@@ -27,16 +27,15 @@ $(function(){
<!--
//LIB iOS
var connectWebViewJavascriptBridge = function(callback) {
- if (window.WebViewJavascriptBridge) {
- callback(WebViewJavascriptBridge);
- } else {
- document.addEventListener('WebViewJavascriptBridgeReady', function() {
- callback(WebViewJavascriptBridge);
- }, false);
- }
+ if (window.WebViewJavascriptBridge) {
+ callback(WebViewJavascriptBridge);
+ } else {
+ document.addEventListener('WebViewJavascriptBridgeReady', function() {
+ callback(WebViewJavascriptBridge);
+ }, false);
+ }
};
//fin lib ios
-
var routing_panel_open = function(){
$('#frm_categories').hide();
$('#chimere_itinerary_panel').show();
@@ -125,7 +124,7 @@ $(function(){
'{{STATIC_URL}}saclay/images/routing_step.png',
new OpenLayers.Size(37, 42),
new OpenLayers.Pixel(-(37/2), -42));
- var numZoomLevels = 6;
+ var numZoomLevels = 7;
var maxZoomLevel = 19;
var resolutions;
var zoomOffset;
@@ -155,6 +154,8 @@ $(function(){
{% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
{% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
{% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
+ {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
+ {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
{{icon_offset_y}});
chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);
@@ -176,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 %}
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 %}
+<div id='chimere_map_menu'>
+ <ul>
+ {% if routing %}
+ <li id='map_menu_from' class='routing_item'>{% trans "From" context "routing" %}</li>
+ <li id='map_menu_step' class='routing_item'>{% trans "Add a step" context "routing" %}</li>
+ <li id='map_menu_to' class='routing_item'>{% trans "To" context "routing" %}</li>
+ <li id='map_menu_clear' class='routing_item'>{% trans "Clear the itinerary" context "routing" %}</li>
+ {% endif%}
+ <li id='map_menu_zoomin'>{% trans "Zoom in" %}</li>
+ <li id='map_menu_zoomout'>{% trans "Zoom out" %}</li>
+ <li id='map_menu_center'>{% trans "Center the map here" %}</li>
+ </ul>
+</div>
diff --git a/templates/chimere/blocks/news.html b/templates/chimere/blocks/news.html
index 84dfe04..3788b64 100644
--- a/templates/chimere/blocks/news.html
+++ b/templates/chimere/blocks/news.html
@@ -1,5 +1,4 @@
{% load i18n sanitize chimere_tags %}
-{% if news_lst %}
<script type='text/javascript'>
<!--
$(function(){
@@ -14,6 +13,7 @@ $(function(){
<div id='news' style='display:none'>
<h2>{% trans "News" %}</h2>
<div class='news'>
+ {% if news_lst %}
{% for news in news_lst %}
<div class='info'>
{% if news.title %}
@@ -34,7 +34,11 @@ $(function(){
</p>
</div>
{%endfor%}
+ {% else %}
+ <div class='info'>
+ <em>{% trans "No news today."%}</em>
+ </div>
+ {% endif %}
</div>
</div>
-{% endif %}
diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html
index 73177fc..aaa9fc4 100644
--- a/templates/chimere/blocks/share_bar.html
+++ b/templates/chimere/blocks/share_bar.html
@@ -4,12 +4,11 @@
<a href='{{share_network.1}}'>{{share_network.0}}</a>
{% endfor %}{%else%}
<ul class='share'>
- <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'>{% trans "Email" %}</a></li>
+ <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'><img src="{{share_network.0.2}}" alt="{{share_network.0.0}}"/></a></li>
{% if not email_only %}<li class='share-icon'><a href="#">{% trans "Share" %}</a></li>{% for share_network in share_networks %}
- {%if forloop.counter0%}
- <li class='shared' style='display:none'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>{%endif%}
+ <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>
{% endfor %}
- <li class='shared' style='display:none'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
+ <li class='shared'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
</ul>{% endif %}
<script type='text/javascript'>
<!--
diff --git a/templates/chimere/blocks/submited.html b/templates/chimere/blocks/submited.html
index 93016c5..5e72617 100644
--- a/templates/chimere/blocks/submited.html
+++ b/templates/chimere/blocks/submited.html
@@ -2,8 +2,8 @@
<div class='edit' id='submited-window'>
<p><strong>Merci pour votre contribution au projet !</strong></p>
-<p>En proposant un nouvel élément, vous contribuez à enrichir la carte avec des données libres. Une fois validée, votre contribution sera disponible selon les termes de la licence <a href='https://creativecommons.org/licenses/by-sa/3.0/fr/'>Creative Commons Paternité - Pas d’Utilisation Commerciale 2.0 France</a>. Vous devez être l’auteur des éléments que vous nous faites partager ou bien vous être assuré de l’accord de leur auteur pour cette mise à disposition. Ceci concerne les textes, photos et tout contenu multimedia.</p>
-<p>N’hésitez pas à nous contacter pour toute question : <a href='mailto:carteouverte@terreetcite.org'>carteouverte@terreetcite.org</a>.</p>
+<p>En proposant un nouvel élément, vous contribuez à enrichir la carte avec des données libres. Une fois validée, votre contribution sera disponible selon les termes de la licence <a href='https://creativecommons.org/licenses/by-nc/2.0/fr/'>Creative Commons Paternité - Pas d’Utilisation Commerciale 2.0 France</a>. Vous devez être l’auteur des éléments que vous nous faites partager ou bien vous être assuré de l’accord de leur auteur pour cette mise à disposition. Ceci concerne les textes, photos et tout contenu multimedia.</p>
+{% if contact_email %}<p>N’hésitez pas à nous contacter pour toute question : <a href='mailto:{{contact_email}}'>{{contact_email}}</a>.</p>{% endif%}
</div>
<script type='text/javascript'>
<!--
@@ -11,7 +11,7 @@
$("#submited-window").dialog({
modal: true,
dialogClass:'no-titlebar-small',
- width:300,
+ width:340,
resizable:false,
beforeClose: function() {
window.location = "{{index_url}}";
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index b811257..8d7add2 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -7,7 +7,9 @@ $(function(){
$('#welcome video').each(function(index){$(this).pause()});
$('#welcome audio').each(function(index){$(this).pause()});
$("#welcome").dialog({width:826, height:410, dialogClass:'welcome-dialog'
- {% if not display %}, autoOpen:false{% endif %}});
+ {% if not display %}, autoOpen:false{% endif %},
+ open: function () { $("#welcome_content").scrollTop(0); }
+ });
});
// -->
</script>
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-22 13:55:11 +0000