Author: andre
Date: 2010-03-01 15:05:41 +0100 (Mon, 01 Mar 2010)
New Revision: 41209
Modified:
openimages/trunk/src/main/webapp/index.jspx
openimages/trunk/src/main/webapp/mediafragment.jspx
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
openimages/trunk/src/main/webapp/oiplayer/player.html
openimages/trunk/src/main/webapp/style/js/play.js.jsp
Log:
moved oiplayer
Modified: openimages/trunk/src/main/webapp/index.jspx
===================================================================
--- openimages/trunk/src/main/webapp/index.jspx 2010-03-01 13:59:30 UTC (rev
41208)
+++ openimages/trunk/src/main/webapp/index.jspx 2010-03-01 14:05:41 UTC (rev
41209)
@@ -10,9 +10,9 @@
<oip:html styleClass="home">
<jsp:attribute name="head">
<script src="${mm:link('/style/js/play.js.jsp')}"
type="text/javascript"><!-- help ie --></script>
- <script src="${mm:link('/player/flowplayer-3.1.1.min.js')}"
type="text/javascript"><!-- help ie --></script>
- <script src="${mm:link('/style/js/jquery.oiplayer.js')}"
type="text/javascript"><!-- help ie --></script>
- <link href="${mm:link('/style/css/player.css')}" rel="stylesheet"
type="text/css" />
+ <script src="${mm:link('/oiplayer/flowplayer-3.1.1.min.js')}"
type="text/javascript"><!-- help ie --></script>
+ <script src="${mm:link('/oiplayer/js/jquery.oiplayer.js')}"
type="text/javascript"><!-- help ie --></script>
+ <link href="${mm:link('/oiplayer/css/oiplayer.css')}" rel="stylesheet"
type="text/css" />
<link href="${mm:link('/feeds/atom/')}" rel="alternate"
type="application/atom+xml" title="Open Image Platform latest uploads" />
<mm:node number="page_home">
<mm:relatednodescontainer type="mediafragments" role="posrel"
searchdirs="destination">
Modified: openimages/trunk/src/main/webapp/mediafragment.jspx
===================================================================
--- openimages/trunk/src/main/webapp/mediafragment.jspx 2010-03-01 13:59:30 UTC
(rev 41208)
+++ openimages/trunk/src/main/webapp/mediafragment.jspx 2010-03-01 14:05:41 UTC
(rev 41209)
@@ -14,10 +14,10 @@
<jsp:attribute name="head">
<script src="${mm:link('/style/js/typewatch.js')}"
type="text/javascript"><!-- help ie --></script>
<script src="${mm:link('/style/js/mmtag.js')}"
type="text/javascript"><!-- help ie --></script>
- <script src="${mm:link('/player/flowplayer-3.1.1.min.js')}"
type="text/javascript"><!-- help ie --></script>
- <script src="${mm:link('/style/js/jquery.oiplayer.js')}"
type="text/javascript"><!-- help ie --></script>
+ <script src="${mm:link('/oiplayer/plugins/flowplayer-3.1.1.min.js')}"
type="text/javascript"><!-- help ie --></script>
+ <script src="${mm:link('/oiplayer/js/jquery.oiplayer.js')}"
type="text/javascript"><!-- help ie --></script>
<script src="${mm:link('/style/js/play.js.jsp')}"
type="text/javascript"><!-- help ie --></script>
- <link href="${mm:link('/style/css/player.css')}" rel="stylesheet"
type="text/css" />
+ <link href="${mm:link('/oiplayer/css/oiplayer.css')}" rel="stylesheet"
type="text/css" />
<mm:link page="/feeds/atom/">
<mm:param name="related"><mm:field name="number" /></mm:param>
<link href="${_}" rel="alternate" type="application/atom+xml"
title="Open Image Platform related items of ${_node.title}" />
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-01 13:59:30 UTC (rev 41208)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-01 14:05:41 UTC (rev 41209)
@@ -52,7 +52,6 @@
//console.log("info: " + player.info);
var poster = createPoster(self, player); // using self (complete
input) for MSIE
- console.log(poster);
if ($.browser.msie || player.myname == 'flowplayer') {
$('p.oiplayer-warn').hide(); // MSIE places stuff partly
outside mediatag
$(div).find('div.oiplayer-flash').hide(); // .remove() would
indefinitely loop MSIE
Modified: openimages/trunk/src/main/webapp/oiplayer/player.html
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/player.html 2010-03-01
13:59:30 UTC (rev 41208)
+++ openimages/trunk/src/main/webapp/oiplayer/player.html 2010-03-01
14:05:41 UTC (rev 41209)
@@ -21,7 +21,9 @@
<div id="clientcaps"> </div>
- <video width="310" controls="controls"
poster="http://www.openbeelden.nl/images/18489/WEEKNUMMER364-HRE0000D9C6.png";>
+ <video controls="controls"
poster="http://www.openbeelden.nl/images/18489/WEEKNUMMER364-HRE0000D9C6.png";>
+ <source type="video/ogg; codecs=theora"
src="http://www.openbeelden.nl/files/09/9734.9730.WEEKNUMMER364-HRE0000D9C6.ogv";>
</source>
+ <source type="video/ogg; codecs=theora"
src="http://www.openbeelden.nl/files/09/9737.9730.WEEKNUMMER364-HRE0000D9C6.ogv";>
</source>
<source type="video/mp4; codecs=unknown"
src="http://www.openbeelden.nl/files/09/9740.9730.WEEKNUMMER364-HRE0000D9C6.mp4";>
</source>
</video>
Modified: openimages/trunk/src/main/webapp/style/js/play.js.jsp
===================================================================
--- openimages/trunk/src/main/webapp/style/js/play.js.jsp 2010-03-01
13:59:30 UTC (rev 41208)
+++ openimages/trunk/src/main/webapp/style/js/play.js.jsp 2010-03-01
14:05:41 UTC (rev 41209)
@@ -14,8 +14,8 @@
function initPlayer() {
$('.main-column, .b_user-mediapreview').oiplayer({
'server' : '<mm:url page="/" absolute="true" />', /* msie (or windows
java) has issues with just a dir */
- 'jar' : '${mm:link('/oiplayer/cortado-ovt-stripped-wm_r38710.jar')}',
- 'flash' : '${mm:link('/oiplayer/flowplayer-3.1.1.swf')}',
+ 'jar' :
'${mm:link('/oiplayer/plugins/cortado-ovt-stripped-wm_r38710.jar')}',
+ 'flash' : '${mm:link('/oiplayer/plugins/flowplayer-3.1.1.swf')}',
'controls' : false
});
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
![http://www.openbeelden.nl/images/18489/WEEKNUMMER364-HRE0000D9C6.png"](http://www.openbeelden.nl/images/18489/WEEKNUMMER364-HRE0000D9C6.png"){kind=link}