Browse Source

[svn r22183] FS#2867 - The online editor: Another correction in the video content template. A correction in "flvPlayer" plugin.

Ivan Tcholakov 15 years ago
parent
commit
fa91505487

+ 4 - 4
main/inc/lib/fckeditor/editor/plugins/flvPlayer/flvPlayer.js

@@ -471,14 +471,14 @@ Media.prototype.getInnerHTML = function ( objectId )
 	}
 
 	var s = "" ;
-	//s += '<p>\n' ;
+	s += '\n' ;
 	s += '<div id="player' + randomnumber + '-parent" style="text-align: center;">\n'; //'<div id="player' + randomnumber + '-parent" style="text-align: center;' + cssfloat + '">\n';
-	s += '<div style="border-style: none; height: ' + thisHeight + 'px; width: ' + thisWidth + 'px; overflow: hidden; background-color: rgb(220, 220, 220); /* background-image: url(' + oEditor.FCKConfig.PluginsPath + 'flvPlayer/flvPlayer.gif); background-repeat:no-repeat; background-position:center; */' + cssalign + '">' ;
+	s += '<div style="border-style: none; height: ' + thisHeight + 'px; width: ' + thisWidth + 'px; overflow: hidden; background-color: rgb(220, 220, 220); ' + cssalign + '">' ;
 
 	s += '<script src="' + FCKConfig.ScriptSWFObject + '" type="text/javascript"></script>\n' ;
 
 	s += '<div id="player' + randomnumber + '">' ;
-	s += '<a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.' ;
+	s += '<a href="http://www.macromedia.com/go/getflashplayer" target="_blank">Get the Flash Player</a> to see this video.' ;
 	// Moved after info - Added width,height,overflow for MSIE7
 	s += '<div id="player' + randomnumber + '-config" style="display: none;visibility: hidden;width: 0px;height:0px;overflow: hidden;">' ;
 	// Save settings
@@ -650,7 +650,7 @@ Media.prototype.getInnerHTML = function ( objectId )
 	s += '</script>\n' ;
 	s += '</div>\n' ;
 	s += '</div>\n' ;
-	//s += '</p>\n' ;
+	s += '\n' ;
 
 	return s ;
 } ;

+ 1 - 1
main/install/dokeos_main.sql

@@ -1890,7 +1890,7 @@ INSERT INTO system_template (title, comment, image, content) VALUES
 			<td style="width: 50%; vertical-align: top;">
 
  				<div style="text-align: center;" id="player810625-parent">
-					<div style="border-style: none; overflow: hidden; width: 320px; height: 240px; background-color: rgb(220, 220, 220); background-repeat: no-repeat; background-position: center center;">
+					<div style="border-style: none; overflow: hidden; width: 320px; height: 240px; background-color: rgb(220, 220, 220);">
 						<script src="{REL_PATH}main/inc/lib/swfobject/swfobject.js" type="text/javascript"></script>
 						<div id="player810625"><a href="http://www.macromedia.com/go/getflashplayer" target="_blank">Get the Flash Player</a> to see this video.
 							<div id="player810625-config" style="overflow: hidden; display: none; visibility: hidden; width: 0px; height: 0px;">url={REL_PATH}main/default_course_document/video/flv/example.flv width=320 height=240 loop=false play=false downloadable=false fullscreen=true displayNavigation=true displayDigits=true align=left dispPlaylist=none playlistThumbs=false</div>

+ 2 - 2
main/install/update-db-1.8.5-1.8.6.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: update-db-1.8.5-1.8.6.inc.php 22182 2009-07-17 08:09:30Z ivantcholakov $
+<?php // $Id: update-db-1.8.5-1.8.6.inc.php 22183 2009-07-17 08:28:11Z ivantcholakov $
 /* See license terms in /dokeos_license.txt */
 /**
 ==============================================================================
@@ -944,7 +944,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					<td style="width: 50%; vertical-align: top;">
 
 					<div style="text-align: center;" id="player810625-parent">
-					<div style="border-style: none; overflow: hidden; width: 320px; height: 240px; background-color: rgb(220, 220, 220); background-repeat: no-repeat; background-position: center center;">
+					<div style="border-style: none; overflow: hidden; width: 320px; height: 240px; background-color: rgb(220, 220, 220);">
 						<script src="{REL_PATH}main/inc/lib/swfobject/swfobject.js" type="text/javascript"></script>
 						<div id="player810625"><a href="http://www.macromedia.com/go/getflashplayer" target="_blank">Get the Flash Player</a> to see this video.
 							<div id="player810625-config" style="overflow: hidden; display: none; visibility: hidden; width: 0px; height: 0px;">url={REL_PATH}main/default_course_document/video/flv/example.flv width=320 height=240 loop=false play=false downloadable=false fullscreen=true displayNavigation=true displayDigits=true align=left dispPlaylist=none playlistThumbs=false</div>