[MMBASE SCM] r41510 - in openimages/trunk/src/main/webapp/oiplayer: . css css/images js

[andre]

Author: andre
Date: 2010-03-18 14:20:29 +0100 (Thu, 18 Mar 2010)
New Revision: 41510

Modified:
   openimages/trunk/src/main/webapp/oiplayer/css/images/controls-whitie.png
   openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
   openimages/trunk/src/main/webapp/oiplayer/index.html
   openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
   openimages/trunk/src/main/webapp/oiplayer/js/play.js
Log:
more options for controls

Modified: 
openimages/trunk/src/main/webapp/oiplayer/css/images/controls-whitie.png
===================================================================
(Binary files differ)

Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css  2010-03-18 
13:05:12 UTC (rev 41509)
+++ openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css  2010-03-18 
13:20:29 UTC (rev 41510)
@@ -43,12 +43,17 @@
 {
        height: 24px;
        margin: 4px 0 0 0;
-       /* position: absolute;
+}
+
+div.oiplayer > div.controls.top
+{
+       position: absolute;
        bottom: 0;
-       left: 0;
        z-index: 99;
        background-image: url(images/controls-whitie.png);
-       background-repeat: repeat; */
+       background-repeat: repeat;
+    height: 24px;
+       padding: 3px 4px;
 }
 
 div.oiplayer > .preview { cursor: pointer; }
@@ -237,18 +242,9 @@
 }
 
 div.oiplayer.fullscreen > img.preview { margin: 0 auto; }
-div.oiplayer.fullscreen > div.player,
+div.oiplayer.fullscreen > div.player { margin: 0 auto; }
 div.oiplayer.fullscreen > div.controls { margin: 0 auto; }
 
-div.oiplayer.fullscreen > div.controls
-{
-       /*position: fixed;*/
-       bottom: 0;
-       /*left: 0;*/
-       width: 100%;
-       margin: 0 auto;
-}
-
 /* ### example html ### */
 body.oiplayer-example
 {

Modified: openimages/trunk/src/main/webapp/oiplayer/index.html
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/index.html        2010-03-18 
13:05:12 UTC (rev 41509)
+++ openimages/trunk/src/main/webapp/oiplayer/index.html        2010-03-18 
13:20:29 UTC (rev 41510)
@@ -19,7 +19,7 @@
   <div id="clientcaps">  </div> <!-- div#clientcaps is needed for Java 
detection in MSIE -->
   
   <video class="oip_ea_duration_101 oip_ea_start_0"
-    controls="controls" 
poster="http://www.openimages.eu/images/18489/WEEKNUMMER364-HRE0000D9C6.png";>
+    
poster="http://www.openimages.eu/images/18489/WEEKNUMMER364-HRE0000D9C6.png";>
     <source type="video/ogg; codecs=theora" 
src="http://www.openimages.eu/files/09/9734.9730.WEEKNUMMER364-HRE0000D9C6.ogv";>
 </source>
     <source type="video/mp4; codecs=unknown" 
src="http://www.openimages.eu/files/09/9740.9730.WEEKNUMMER364-HRE0000D9C6.mp4";>
 </source>
   </video>

Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js     
2010-03-18 13:05:12 UTC (rev 41509)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js     
2010-03-18 13:20:29 UTC (rev 41510)
@@ -193,7 +193,10 @@
             player.oheight = player.height;
         }
         var window_w = $(window).width();
-        var window_h = $(window).height() - 35;
+        var window_h = $(window).height();
+        if (! $(div).find('div.controls').is('.top')) {
+            window_h = window_h - 35;
+        }
         var multi_w = window_w / player.owidth;
         var multi_h = window_h / player.oheight;
         var half = 0;
@@ -211,7 +214,7 @@
         
         $(div).toggleClass('fullscreen');
         $(div).find('div.player').width(player.width).height(player.height);
-        $(div).find('div.controls').width(player.width);
+        $(div).find('div.controls').width(player.width).css('margin-left', 
half);
         $(div).find('div.controls li.slider').width(player.width - 170);
         
$(div).find('.preview').width(player.width).height(player.height).css('margin-left',
 half);
         $(player.player).width(player.width).height(player.height);

Modified: openimages/trunk/src/main/webapp/oiplayer/js/play.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/play.js        2010-03-18 
13:05:12 UTC (rev 41509)
+++ openimages/trunk/src/main/webapp/oiplayer/js/play.js        2010-03-18 
13:20:29 UTC (rev 41510)
@@ -9,8 +9,8 @@
 $(document).ready(function() {
     $('body.oiplayer-example').oiplayer({
         server : 'http://www.openimages.eu', /* msie (or windows java) has 
issues with just a dir */
-        jar : '/player/cortado-ovt-stripped-wm_r38710.jar',
-        flash : '/player/flowplayer-3.1.1.swf',
-        controls : true
+        jar : '/oiplayer/cortado-ovt-stripped-wm_r38710.jar',
+        flash : '/oiplayer/plugins/flowplayer-3.1.5.swf',
+        controls : 'top'
     });
 });

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs