diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 28 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/multimedia_file.html | 6 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/welcome.html | 11 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 2 |
4 files changed, 39 insertions, 8 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index ff2e088..5ec2b8a 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -300,15 +300,21 @@ ul#action-2 { margin:4px 8px; } +#news_content{ + overflow:auto; +} + #detail_content{ overflow:auto; height:80%; } +#news_content img, #detail_content img{ max-width:280px; } +#news_content p, #detail_content p{ padding:0.2em 0; margin:0; @@ -723,8 +729,11 @@ table.inline-table td input[type=file]{ .small-gallery{ width:320px; - min-height:30px; + min-height:35px; text-align:center; + margin-left:auto; + margin-right:auto; + margin-top:15px; } .small-gallery .media-player, @@ -736,8 +745,25 @@ table.inline-table td input[type=file]{ /*height:180px;*/ } +.ui-tabs-panel{ + overflow:auto; +} + +.media-img{ + max-height:400px; +} + +.media-video, +.media-img, +.media-player{ + display:block; + margin-left:auto; + margin-right:auto; +} + /** jme **/ + /*overlay controls*/ .media-controls-wrapper { position: absolute; diff --git a/chimere/templates/chimere/blocks/multimedia_file.html b/chimere/templates/chimere/blocks/multimedia_file.html index a1e9868..a8ce282 100644 --- a/chimere/templates/chimere/blocks/multimedia_file.html +++ b/chimere/templates/chimere/blocks/multimedia_file.html @@ -1,14 +1,14 @@ {% load i18n %} {% if multimedia_item.picture %} -<a rel="prettyPhoto" href='{{multimedia_item.picture.url}}' ><img alt="{{multimedia_item.name}}" src='{{multimedia_item.thumbnailfile.url}}'/></a>{% endif %} +<a rel="prettyPhoto" href='{{multimedia_item.picture.url}}' ><img class='media-img' alt="{{multimedia_item.name}}" src='{{multimedia_item.thumbnailfile.url}}'/></a>{% endif %} {% if multimedia_item.url %} {% if multimedia_item.multimedia_type.iframe %} -<iframe class='video' src='{{multimedia_item.url}}'> +<iframe class='media-video video' src='{{multimedia_item.url}}'> </iframe> {% else %} {% ifequal multimedia_item.multimedia_type.media_type 'I' %} -<img alt="{{multimedia_item.name}}" src='{{multimedia_item.url}}'/> +<img class='media-img' alt="{{multimedia_item.name}}" src='{{multimedia_item.url}}'/> {% else %} <div class="media-player"> <span class="media-label">{{multimedia_item.name}}</span> diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html index 72d37b3..3ec2ccf 100644 --- a/chimere/templates/chimere/blocks/welcome.html +++ b/chimere/templates/chimere/blocks/welcome.html @@ -2,8 +2,13 @@ {% if news_lst or welcome_message %} <a href='#' id='welcome_button' class='ui-widget ui-button ui-state-default ui-corner-all'>{% trans "Welcome message"%}</a> <script type='text/javascript'> -function display_welcome(){$("#welcome").dialog({title:"{% trans "Welcome"%}", - width:360});} +function display_welcome(){ + var width = $(window).width(); + width = width - 40*width/100; + var height = $(window).height()-200; + $("#welcome").dialog({title:"{% trans "Welcome"%}", + width:width, height:height}); +} $("#welcome_button").bind('click', display_welcome); $(function(){ $('#welcome div.media-player').jmeEmbedControls(); @@ -13,7 +18,7 @@ $(function(){ }); </script> <div id='welcome' style='display:none'> - <div id='detail_content'> + <div id='news_content'> {% if welcome_message %} <div id='welcome_message'> {{welcome_message|safe}} diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index c195fbe..4084236 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -62,7 +62,7 @@ {% endif %} <script language='javascript' type='text/javascript'> $('html').addClass('js-on'); -$(function(){ +$(document).ready(function(){ $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false, height: "auto", width: "auto"}); $('div.media-player').jmeEmbedControls(); |