From: Michael Dale <dale@users.mediawiki.org>
Date: Thu, 20 Aug 2009 11:37:48 +0000 (+0000)
Subject: * kskin final state before revert for presentations
X-Git-Tag: 1.31.0-rc.0~40184
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=419ffbc39d0316dbe36ac97bcb89df95d8e044c6;p=lhc%2Fweb%2Fwiklou.git

* kskin final state before revert for presentations
---

diff --git a/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html b/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html
index 8c92bc718f..cdfab24e08 100644
--- a/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html
+++ b/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html
@@ -13,7 +13,7 @@ once you include: mv_embed.js on any remote page you can then use the video tag
 <br />
   <table border="1" cellpadding="6" width="600">
   		    <tr>
-	      <td valign="top"><video durationHint="70"
+	      <td valign="top"><video durationHint="5"
 	      		style="width:400px;height:288px"
 				poster="http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/B-36_bomber.ogg/mid-B-36_bomber.ogg.jpg" 
 				src="http://upload.wikimedia.org/wikipedia/commons/0/0d/B-36_bomber.ogg"></video></video></td>
diff --git a/js2/mwEmbed/libClipEdit/mvClipEdit.js b/js2/mwEmbed/libClipEdit/mvClipEdit.js
index 6e68d11eb5..bc27bdf80b 100644
--- a/js2/mwEmbed/libClipEdit/mvClipEdit.js
+++ b/js2/mwEmbed/libClipEdit/mvClipEdit.js
@@ -404,7 +404,7 @@ mvClipEdit.prototype = {
 			max: max_slider,
 			values: [start_sec, end_sec],
 			slide: function(event, ui) {
-				js_log(" vals:"+  seconds2npt( ui.values[0] ) + ' : ' + seconds2npt( ui.values[1]) );
+				//js_log(" vals:"+  seconds2npt( ui.values[0] ) + ' : ' + seconds2npt( ui.values[1]) );
 				$j('#'+_this.control_ct + ' .startInOut').val( seconds2npt( ui.values[0] ) );
 				$j('#'+_this.control_ct + ' .endInOut').val( seconds2npt( ui.values[1] ) );
 			},
diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index f3877c3bb2..301b6c12f4 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -1098,12 +1098,24 @@ embedVideo.prototype = {
 		this.seek_time_sec = 0;
 		this.setSliderValue(0);
 		var _this = this;
-
+		//alert(" w:" + this.width +  ' h: ' + this.height);
 		//if the clip resolution is < 320 don't do fancy onClipDone stuff
 		if(this.width < 300){
-			return ;
-		}
-		this.onClipDone_disp = true;
+			$j('#dc_'+this.id).html('<div style="width: '+this.width+'px; height: '+this.height+'px; padding-top: 21px;" class="k-edit-screen">'+
+  						'<div>'+
+   						'<h1 style="font-family: arial,sans-serif; font-style: normal; font-variant: normal; font-weight: bold; font-size: 16px; line-height: normal; font-size-adjust: none; font-stretch: normal; -x-system-font: none;">You can <a href="">edit</a> this video with<br/>the <a title="Online Open Source Video Platform" target="_blank" href="http://corp.kaltura.com/">Kaltura</a> video editor</h1>'+
+   						'<a title="Online Open Source Video Platform" target="_blank" href="http://corp.kaltura.com/"><img width="30" height="30" alt="Online Open Source Video Platform" src="'+mv_skin_img_path+'kaltura_open_source_video_platform.gif"/></a>'+
+  					'</div><!-- div -->'+
+ 					'</div>');
+		}else{
+			$j('#dc_'+this.id).html(
+			'<div class="k-edit-screen" style="width:'+this.width+'px;height:'+this.height+'px;" >'+	  
+			   '<h1 style="font-family: arial,sans-serif; font-style: normal; font-variant: normal; font-weight: bold; font-size: 25px; line-height: normal; font-size-adjust: none; font-stretch: normal; -x-system-font: none;">You can <a href="">edit</a> this video with<br/>the <a title="Open Source Video Platform" target="_blank" href="http://corp.kaltura.com/">Kaltura</a> video editor</h1>'+
+			   '<a title="Open Source Video Platform" target="_blank" href="http://corp.kaltura.com/"><img width="30" height="30" alt="Open Source Video Platform" src="'+mv_skin_img_path+'kaltura_open_source_video_platform.gif"/></a>'+
+			  '</div>');
+		}
+		$j('.k-edit-screen').width(this.width);
+		/*this.onClipDone_disp = true;
 		this.thumbnail_disp = true;
 		//make sure we are not in preview mode( no end clip actions in preview mode)
 		if( this.preview_mode )
@@ -1150,7 +1162,7 @@ embedVideo.prototype = {
 			});
 		}else{
 			this.getNextPrevLinks();
-		}
+		}*/
 	},
 	//@@todo we should merge getNextPrevLinks with textInterface .. there is repeated code between them.
 	getNextPrevLinks:function(){
diff --git a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
index 3c03395d47..9dcd88f9ea 100644
--- a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
+++ b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js
@@ -159,6 +159,11 @@ var nativeEmbed = {
 		//update currentTime				
 		this.currentTime = this.vid.currentTime;		
 		this.addPresTimeOffset();
+		
+		//do clip done 
+		if(this.currentTime > this.duration){
+			this.onClipDone();
+		}
 		//js_log('currentTime:' + this.currentTime);
 		//js_log('this.currentTime: ' + this.currentTime );
 		//once currentTime is updated call parent_monitor
diff --git a/js2/mwEmbed/libSequencer/mvPlayList.js b/js2/mwEmbed/libSequencer/mvPlayList.js
index a01b2c0ee4..858b1bd4cc 100644
--- a/js2/mwEmbed/libSequencer/mvPlayList.js
+++ b/js2/mwEmbed/libSequencer/mvPlayList.js
@@ -549,7 +549,8 @@ mvPlayList.prototype = {
 	setStatus:function(value){
 		$j('#mv_time_'+this.id).html( value );
 	},
-	setSliderValue:function(value){				
+	setSliderValue:function(value){		
+		var _this = this;		
 		//slider is on 1000 scale: 
 		var val = parseInt( value *1000 ); 			
 		$//j('#mv_play_head_' + this.id).slider('value', val);