summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--settings.py10
-rw-r--r--static/saclay/css/styles.css23
-rw-r--r--static/saclay/js/interface.js4
-rw-r--r--templates/chimere/detail.html21
4 files changed, 27 insertions, 31 deletions
diff --git a/settings.py b/settings.py
index 843f09e..3bf047a 100644
--- a/settings.py
+++ b/settings.py
@@ -73,6 +73,7 @@ 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
+
# OSM mapnik map
CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')"
@@ -142,10 +143,10 @@ CHIMERE_SHORT_DESC_LENGTH = 400
CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification "
u"about this item: ")
-CHIMERE_ROUTING_WARN_MESSAGE = u"""<h3 class='warn'>Attention</h3>
-<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons de
-modifier votre recherche.</p>
-"""
+CHIMERE_ROUTING_WARN_MESSAGE = u"<h3 class='warn'>Attention</h3>"\
+ u"<p>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.</p>"
CHIMERE_CSV_ENCODING = 'ISO-8859-1'
@@ -203,7 +204,6 @@ MEDIA_URL = '/media/'
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
- # 'django.template.loaders.eggs.load_template_source',
)
MIDDLEWARE_CLASSES = (
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 4f46db6..3fdde4e 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -23,7 +23,7 @@ h2, .cloud h4, #layer_selection, #layer_selection h4, #permalink a,
}
/* activated */
-.small-galery p.legend, #detail_footer, #detail_footer a, #chimere_itinerary h4,
+#detail_footer, #detail_footer a, #chimere_itinerary h4,
h3.warn, .itinerary_label.itinerary_start, .itinerary_label.itinerary_end,
.action li.ui-state-active{
color:#fff;
@@ -97,7 +97,6 @@ ul#multimedia_list_content li, #welcome .footer,
background-color:#d6d6c4;
}
-.small-galery p.legend,
#detail_footer{
background-color:#9f9f89;
}
@@ -148,11 +147,6 @@ div.warning, .errorlist{
background-color:#fff;
}
-/* black */
-.small-galery{
- background-color:#000;
-}
-
h2, h3{
background:none;
}
@@ -1348,9 +1342,14 @@ label[for=id_transport_0]{
background-image:url('../images/buttons/walk.png');
}
+#id_transport_it span#id_transport_it_foot{
+ display:none;
+}
+
#id_transport_it span#id_transport_it_foot.selected,
label[for=id_transport_0]:hover,
label[for=id_transport_0][aria-pressed=true]{
+ display:inline-block;
background-image:url('../images/buttons/walk_on.png');
}
@@ -1359,9 +1358,14 @@ label[for=id_transport_1]{
background-image:url('../images/buttons/bicycle.png');
}
+#id_transport_it span#id_transport_it_bicycle{
+ display:none;
+}
+
#id_transport_it span#id_transport_it_bicycle.selected,
label[for=id_transport_1]:hover,
label[for=id_transport_1][aria-pressed=true]{
+ display:inline-block;
background-image:url('../images/buttons/bicycle_on.png');
}
@@ -1521,8 +1525,9 @@ ul#roadmap_toolbar a img{
}
ul#roadmap_toolbar{
position:absolute;
- top:45px;
right:10px;
+ top: 47px;
+ margin: 0;
}
ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
@@ -1803,7 +1808,7 @@ a.close_img{
margin-top:0;
}
-.small-galery p.legend{
+.small-gallery p.legend{
line-height:22px;
}
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index cfaaae5..114c210 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -219,6 +219,10 @@ function display_feature_detail(data, settings){
$('html').addClass('js-on');
$(function(){
$('div.media-player').jmeEmbedControls();
+ setTimeout(function(){
+ settings.current_popup.updateSize();
+ setTimeout(function(){ settings.current_popup.updateSize(); }, 1000);
+ }, 1000);
});
}
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index b511eae..4d9348b 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -10,6 +10,9 @@
{% for multimedia_item in marker.default_multimedia_items %}
{% multimedia_render multimedia_item %}
{%endfor%}
+ {% for item in marker.multimedia_items %}
+ {% multimedia_render item %}
+ {%endfor%}
</div>
{%endif%}
<div>
@@ -21,11 +24,8 @@
<div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div>
{% endif %}
{% for property in marker.getProperties %}{% if property.value %}
- <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value %}</a>{%endif%}</div>
+ <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div>
{%endif%}{% endfor %}
- {% if marker.multimedia_items %}
- <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
- {% endif %}
</div>
</div>
<div id='detail_footer'>
@@ -46,19 +46,6 @@
</a>
{% endcomment %}
</div>
-{% if marker.multimedia_items %}
-<div id='gallery-{{marker.pk}}' class='gallery'>
- <div class='tabs'>
- <ul>{% for item in marker.multimedia_items %}
- <li><a href="#tab-{{ forloop.counter }}">{{ item.name }}</a></li>{% endfor %}
- </ul>
- {% for multimedia_item in marker.multimedia_items %}
- <div id="tab-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'>
- {% multimedia_render multimedia_item %}
- </div>{% endfor %}
- </div>
-</div>
-{% endif %}
<script language='javascript' type='text/javascript'>
<!--
$('html').addClass('js-on');
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 10:15:35 +0000