diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 14 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 76 | ||||
| -rw-r--r-- | chimere/templates/chimere/feeds/rss_descr.html | 2 |
3 files changed, 47 insertions, 45 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 7bd9cb2..b50e829 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -304,39 +304,39 @@ ul#action-2 { overflow:auto; } -#detail_content{ +.detail_content{ overflow:auto; height:80%; } #news_content img, -#detail_content img{ +.detail_content img{ max-width:280px; } #news_content p, -#detail_content p{ +.detail_content p{ padding:0.2em 0; margin:0; } -ul#share{ +ul.share{ list-style-type:none; margin:0; padding:0; } -ul#share li{ +ul.share li{ display:inline; line-height:22px; vertical-align: bottom; } -#share a{ +.share a{ text-decoration:None; } -#share img{ +.share img{ border:None; width:22px; height:22px; diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index 4084236..9c2414e 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -1,6 +1,6 @@ {% load i18n sanitize chimere_tags %} <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{{ marker.name }}</h2> -<div id='detail_content'> +<div class='detail_content'> {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%} <div class='small-gallery'> {% for picture in marker.default_pictures %} @@ -13,19 +13,19 @@ {%endif%} <div> {% if dated %} - <p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} + <p class='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}} {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span> {% endif %} {% if marker.description %} <p class='description'>{{ marker.description|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p> {% endif %} {% for property in marker.getProperties %} - <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p> + <p class='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p> {% endfor %} {% if marker.origin %}<p class='detail_source'><strong>{% trans "Source:" %}</strong> <span>{{marker.origin}}</span></p>{% endif %} {% if marker.license %}<p class='detail_license'><strong>{% trans "License:" %}</strong> <span>{{marker.license}}</span></p>{% endif %} {% if marker.multimedia_items %} - <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a> + <a href='#' class='show_gallery_link'>{% trans "Show multimedia gallery" %}</a> {% endif %} </div> {% comment %} @@ -41,7 +41,7 @@ {% if simple %}{% trans "Share on"%}{% for share_network in share_networks %} <a href='{{share_network.1}}'>{{share_network.0}}</a> {% endfor %}{%else%} - <ul id='share'> + <ul class='share'> <li>{% trans "Share"%}</li>{% for share_network in share_networks %} <li><a href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li> {% endfor %}</ul>{% endif %} @@ -51,10 +51,10 @@ <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 %} + <li><a href="#tab-{{marker.pk}}-{{ 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 %}'> + <div id="tab-{{marker.pk}}-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'> {% multimedia_render multimedia_item %} </div>{% endfor %} </div> @@ -64,43 +64,45 @@ $('html').addClass('js-on'); $(document).ready(function(){ $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false, - height: "auto", width: "auto"}); - $('div.media-player').jmeEmbedControls(); - $('.tabs').tabs({ - select: function(event, ui) { - //pause all medias - $('video').each(function(index){$(this).pause()}); - $('audio').each(function(index){$(this).pause()}); - //start current tabvideo - $('ui.panel video').each(function(index){ - //prevents a Flash-Bug in IE with newest Flash-Player - $(this).reinitMedia({queue: true}) - .play() - ;}); - $('ui.panel audio').each(function(index){ - //prevents a Flash-Bug in IE with newest Flash-Player - $(this).reinitMedia({queue: true}) - .play() - ;}); + height: "auto", width: "auto", + open: function(event,ui) { + $('.tabs').tabs({ + select: function(event, ui) { + //pause all medias + $('video').each(function(index){$(this).pause()}); + $('audio').each(function(index){$(this).pause()}); + //start current tabvideo + $('ui.panel video').each(function(index){ + //prevents a Flash-Bug in IE with newest Flash-Player + $(this).reinitMedia({queue: true}) + .play() + ;}); + $('ui.panel audio').each(function(index){ + //prevents a Flash-Bug in IE with newest Flash-Player + $(this).reinitMedia({queue: true}) + .play() + ;}); + } + }); + $('div.media-player').jmeEmbedControls(); + $('.video div.media-player').bind('useractive', function(){ + $('div.media-controls', this).stop().animate({opacity: 1}); + }).bind('userinactive', function(){ + $('div.media-controls', this).stop().animate({opacity: 0}); + }); + $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto'); + $("#gallery-{{marker.pk}}").dialog("option", "width", 'auto'); + $("#gallery-{{marker.pk}}").dialog("option", "position", + ['center', 'center']); } - }); - $('.video div.media-player').bind('useractive', function(){ - $('div.media-controls', this).stop().animate({opacity: 1}); - }).bind('userinactive', function(){ - $('div.media-controls', this).stop().animate({opacity: 0}); - }); -}); -$("#gallery-{{marker.pk}}").bind( "dialogopen", function(event, ui) { - $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto'); - $("#gallery-{{marker.pk}}").dialog("option", "width", 'auto'); - $("#gallery-{{marker.pk}}").dialog("option", "position", ['center', 'center']); + }); }); $("#gallery-{{marker.pk}}").bind( "dialogclose", function(event, ui) { //pause all medias $('video').each(function(index){$(this).pause()}); $('audio').each(function(index){$(this).pause()}); }); -$('#show_gallery_link').click(function(){ +$('.show_gallery_link').click(function(){ $("#gallery-{{marker.pk}}").dialog('open'); return false; }); diff --git a/chimere/templates/chimere/feeds/rss_descr.html b/chimere/templates/chimere/feeds/rss_descr.html index b157c56..3d0c029 100644 --- a/chimere/templates/chimere/feeds/rss_descr.html +++ b/chimere/templates/chimere/feeds/rss_descr.html @@ -1,6 +1,6 @@ {% load i18n %} {% load sanitize %} -<div id='detail_content'> +<div class='detail_content'> {% for picture in obj.pictures.all %}<a href='{{picture.picture.url}}'><img src='{{picture.thumbnailfile.url}}' alt="{{picture.name}}"/></a>{% endfor %} <ul> {% if obj.description %}<li class='description'><strong>{% trans "Description:" %}</strong> {{ obj.description|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4"|safe }}</li>{% endif %} |