From: olivier <> Date: Tue, 23 Dec 2008 18:54:45 +0000 (+0000) Subject: works alright in IE7 X-Git-Tag: 1.1~757 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=40f3d09e5ee870d17e22ef1aaa1167b23db4b87b;p=telemeta.git works alright in IE7 --- diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css index 0de75c43..96f6be30 100644 --- a/telemeta/htdocs/css/player.css +++ b/telemeta/htdocs/css/player.css @@ -17,19 +17,19 @@ } -#player_maximized button, #player_minimized button { +#player_maximized .toggle, #player_minimized .toggle { + display: block; + overflow: hidden; position: absolute; right: 12px; - top: 2px; - font-size: 10px; - padding: 2px; - margin: 2px 1px 1px 1px; - background: transparent; - color: transparent; - width: 20px; - height: 10px; - border: solid 1px white; - border-top: solid 2px white; + top: 4px; + width: 18px; + padding: 10px 0 0 0; + height: 0px !important; + height /**/:10px; /* for IE5/Win only */ + background-image: url('../images/maximize.gif'); + text-decoration: none; + border: 0; } #player_maximized { margin: 10px 0 15px 0; diff --git a/telemeta/htdocs/js/player.js b/telemeta/htdocs/js/player.js index c7bfa1f5..76801bf4 100644 --- a/telemeta/htdocs/js/player.js +++ b/telemeta/htdocs/js/player.js @@ -8,7 +8,6 @@ var player; function togglePlayerMaximization() { var view = $('#player'); $('#player_maximized, #player_minimized').css('display', 'none'); - var button; var ctr; if (view.parents('#player_maximized').length) { ctr = $('#player_minimized').append(view); @@ -17,7 +16,7 @@ function togglePlayerMaximization() { } ctr.css({opacity: 0, display: 'block'}); player.resize(); - ctr.animate({opacity: 1}, 200, null); + ctr.animate({opacity: 1}, 100, null); } function load_sound() { @@ -52,7 +51,7 @@ function load_player(duration) { }); }); - $('#player_maximized button, #player_minimized button').click(function() { + $('#player_maximized .toggle, #player_minimized .toggle').click(function() { togglePlayerMaximization(); this.blur(); return false; diff --git a/telemeta/templates/mediaitem_detail.html b/telemeta/templates/mediaitem_detail.html index e16212ee..25f55205 100644 --- a/telemeta/templates/mediaitem_detail.html +++ b/telemeta/templates/mediaitem_detail.html @@ -35,11 +35,11 @@ load_player({{ item.get_duration }}); {% if item.file %}