Author: andre
Date: 2010-03-17 11:48:57 +0100 (Wed, 17 Mar 2010)
New Revision: 41457
Modified:
openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
details mainly regarding audio
Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-17
10:01:18 UTC (rev 41456)
+++ openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-17
10:48:57 UTC (rev 41457)
@@ -12,28 +12,43 @@
display: none;
}
-div.oiplayer { width: 320px; }
-div.oiplayer span.duration, div.oiplayer span.start { display: none; }
+div.oiplayer
+{
+ width: 320px;
+ position: relative;
+}
+
div.oiplayer > div.player,
div.oiplayer > div.player > object
{
- /*position: relative;*/
margin: 0;
padding: 0;
}
+div.oiplayer.audio > div.player
+{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ z-index: 9;
+}
+div.oiplayer.audio > div.player > audio
+{
+ position: absolute;
+ bottom: 28px;
+ left: 0;
+ width: 100%;
+}
div.oiplayer > div.controls
{
height: 24px;
margin: 4px 0 0 0;
- /*
- position: relative;
- top: 0px;
+ /* position: absolute;
+ bottom: 0;
left: 0;
z-index: 99;
-*/
background-image: url(images/controls-whitie.png);
- background-repeat: repeat;
+ background-repeat: repeat; */
}
div.oiplayer > div.player > img
@@ -48,11 +63,13 @@
div.oiplayer > div.preview { cursor: pointer; }
div.oiplayer > div.preview.video { background: url(images/preview_video.png)
left top repeat; }
-div.oiplayer > div.preview.audio { background: url(images/preview_audio.png)
left top repeat; }
+div.oiplayer > div.preview.audio
+{
+ background: url(images/preview_audio.png) left top repeat;
+}
-div.oiplayer audio, #msie_cortadoplayer_oiplayer
+div.oiplayer.audio, #msie_cortadoplayer_oiplayer
{
- width: 320px;
/*
position: absolute;
bottom: 0;
@@ -67,7 +84,6 @@
height: 240px;
font-size: 1.1em;
background-image: url(images/preview_video.png);
- margin-bottom: 6px;
}
div.inavailable p
@@ -124,7 +140,12 @@
div.oiplayer.fullscreen ul.controls li.play a,
div.oiplayer.fullscreen ul.controls li.pause a { margin-left: 1px; }
-div.oiplayer div.playerinfo { font-size: xx-small; }
+div.oiplayer div.oiplayerinfo
+{
+ font-size: xx-small;
+ margin-top: 4px;
+ background-color: #efefef;
+}
div.oiplayer ul.controls li.sound a
{
@@ -135,7 +156,7 @@
margin-left: 7px;
}
-div.oiplayer ul.controls li.sound.off a
+div.oiplayer ul.controls li.sound.muted a
{
float: right;
background-image: url(images/controls-soundoff.png);
@@ -145,7 +166,7 @@
}
div.oiplayer.fullscreen ul.controls li.sound a,
-div.oiplayer.fullscreen ul.controls li.sound.off a { margin-right: 3px; }
+div.oiplayer.fullscreen ul.controls li.sound.muted a { margin-right: 3px; }
div.oiplayer ul.controls li.screen a
{
@@ -224,6 +245,7 @@
top: 0;
left: 0;
background-color: #fff;
+ z-index: 99;
}
div.oiplayer.fullscreen > img.preview { margin: 0 auto; }
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-17 10:01:18 UTC (rev 41456)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-17 10:48:57 UTC (rev 41457)
@@ -89,7 +89,6 @@
if ($(ctrls).find('li.pause').length == 0) {
$(ctrls).find('li.play').addClass('pause');
}
- var slider = $(ctrls).find("div.slider > div");
$.oiplayer.follow(pl);
} else if (pl.state == 'play') {
pl.pause();
@@ -101,7 +100,7 @@
});
$(ctrls).find('li.sound a').click(function(ev){
- if (pl.state != 'init') {
+ if (pl.state != 'init' && pl.state != 'ended') {
pl.mute();
$(ctrls).find('li.sound').toggleClass('muted');
}
@@ -154,7 +153,6 @@
$(div).find('.preview').css("z-index", "1");
}
$(div).find('div.player').show().height(player.height).width(player.width);
- // for audio? $(player.player).css("z-index", "9");
player.play();
if (player.config.controls) {
var ctrls = $(div).find('ul.controls');
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
