diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 5ca8cb0a4..a64f1c6fd 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -11,6 +11,10 @@ save you many hours of grief. -------------------------------------------------------------------- * WebGUI now depends on PerlIO::eol, for doing line ending translation. + * The UK Flash player has been removed due to licensing issues with Debian + and the GPL. If you need this functionality, try using the Carousel + Asset instead. + 7.10.0 -------------------------------------------------------------------- * Due to a bug in the 7.8.24-7.9.11 upgrade, the ordering of template diff --git a/www/extras/ukplayer/config.xml b/www/extras/ukplayer/config.xml deleted file mode 100644 index 77409fb8c..000000000 --- a/www/extras/ukplayer/config.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - content.xml - - 400 - 300 - 0xE0E0E0 - 5 - 400 - 300 - - Verdana - 12 - 0xFFFFFF - - 0x888888 - 0x000000 - true - over - 0 - - 0xFFFFFF - 0x888888 - 0x000000 - true - - 20 - 200 - - 60 - 45 - 0x888888 - false - true - 100 - 8 - - off - false - true - false - true - - - - rounded - diff --git a/www/extras/ukplayer/content.xml b/www/extras/ukplayer/content.xml deleted file mode 100644 index 0c2ed2d14..000000000 --- a/www/extras/ukplayer/content.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - 400 - 300 - <![CDATA[Slide One]]> - - dummycontent/explain.jpg - 5 - dummycontent/explain.jpg - - - - 400 - 300 - <![CDATA[Slide Two]]> - - dummycontent/united-knowledge-logo.jpg - 5 - dummycontent/united-knowledge-logo.jpg - - - - diff --git a/www/extras/ukplayer/dummycontent/explain.jpg b/www/extras/ukplayer/dummycontent/explain.jpg deleted file mode 100644 index fe452828f..000000000 Binary files a/www/extras/ukplayer/dummycontent/explain.jpg and /dev/null differ diff --git a/www/extras/ukplayer/dummycontent/transporter.mp3 b/www/extras/ukplayer/dummycontent/transporter.mp3 deleted file mode 100644 index d148a80a5..000000000 Binary files a/www/extras/ukplayer/dummycontent/transporter.mp3 and /dev/null differ diff --git a/www/extras/ukplayer/dummycontent/united-knowledge-logo.jpg b/www/extras/ukplayer/dummycontent/united-knowledge-logo.jpg deleted file mode 100644 index 358b34411..000000000 Binary files a/www/extras/ukplayer/dummycontent/united-knowledge-logo.jpg and /dev/null differ diff --git a/www/extras/ukplayer/expressInstall.swf b/www/extras/ukplayer/expressInstall.swf deleted file mode 100644 index 86958bf3a..000000000 Binary files a/www/extras/ukplayer/expressInstall.swf and /dev/null differ diff --git a/www/extras/ukplayer/readme.txt b/www/extras/ukplayer/readme.txt deleted file mode 100644 index 4e0479e5e..000000000 --- a/www/extras/ukplayer/readme.txt +++ /dev/null @@ -1,283 +0,0 @@ -United Knowledge Slideshow Player - readme.txt - -Copyright: United Knowledge, 2009 - -The Slideshow PLayer is licensed under the terms of the GNU General Public License, version 2 -http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - -SWFObject 2, the code used to display the Slideshow, is licensed under the MIT License -http://www.opensource.org/licenses/mit-license.php - - -********************************************************************************************** -* * -* The configuration XML * -* * -********************************************************************************************** - -With the configuration .xml file you can customize the look and the behaviour of the -slideshow. It contains the following properties (the values are example values; there are -default values for most, but we recommend setting ALL properties yourself). - - - -********************************************************************************************** -* Structure of the xml * -********************************************************************************************** - - - [properties go here] - - - - -********************************************************************************************** -* General properties * -********************************************************************************************** - -/someUrl/someXmlFile.xml - The url to the .xml file that contains the content. - Value: an absolute or relative url to an xml file - -400 -300 - The width and height of the player itself (this value is overwritten by the flashVars - but the tags need to be here). - Value: number in px - -8 - The duration of each slide. This can be overwritten by setting the duration per slide - in the content .xml file. - Value: number in seconds - -400 -300 - If the width or height of a slide is larger than the values specified here, the slide - will be resized proportionally. Slides that are smaller than the slidshow will not be - resized. - Value: number in px - -0xeeeeee - The background color for the slideshow. This will be visible during the transitions - and when a slide is smaller than the slideshow. - Value: 0x followed by hexadecimal color - -rounded - The textarea, controls and thumbnails can be displayed with two different skins. - Value: simple or rounded - - - -********************************************************************************************** -* Text properties * -********************************************************************************************** - -Verdana - The font of the text in the slideshow. - Value: Verdana, Arial or TimesNewRoman - -12 - The font size of the text in the slideshow. - Value: number in px - -0xffffff - The color of the text in the slideshow. - Value: 0x followed by hexadecimal color - -0xffffff - The color of the border of the textarea. - Value: 0x followed by hexadecimal color - -0x000000 - The background color of the textarea. - Value: 0x followed by hexadecimal color - -false - When set to true the textarea will hide after a few seconds. - Value: true or false - -over - The textarea can be postioned over the slides, above the slides (the height of the player - should be the sum of the height of the slides and the height of the textarea) or can be - hidden. - Value: over, above or none - -50 - The minimum height of the textarea. - Value: number in px - - - -********************************************************************************************** -* Controls properties * -********************************************************************************************** - -0xffffff - The color of the buttons. - Value: 0x followed by hexadecimal color - -0xffffff - The color of the border of the area with the buttons. - Value: 0x followed by hexadecimal color - -0x000000 - The background color of the area with the buttons. - Value: 0x followed by hexadecimal color - -true - When set to true the controls will hide after a few seconds. - Value: true or false - -20 - The width of the big play button (which appears when auto_start is false and, if loop is - set to false, after the slideshow has finished) can be set in a percentage of the total - width of the movie. - Value: percentage of movie width - -200 - A maximum width for the play button to prevent it from becoming too large. - Value: number in px - - - -********************************************************************************************** -* Thumbnail properties * -********************************************************************************************** - -40 -30 - The height and width of each thumbnail image in the bar at the bottom of the - slideshow. - Value: number in px - -0x888888 - The color of the border of each thumbnail image. - Value: 0x followed by hexadecimal color - -true - When set to true the thumbnail bar will hide after a few seconds. - Value: true or false - -160 - The width of the area in the center of the thumbnail bar in which the user can hover - the mouse, without the thumbnail bar moving to the left or to the right. - Value: number in px - -6 - The width of the gap between two thumbnail images. - Value: number in px - -false - When set to true, the thumbnails are hidden. - Value: true or false - - - -********************************************************************************************** -* Behaviour properties * -********************************************************************************************** - -true - If true the slideshow will start with the sound muted. - Value: true or false - -off - If the sound is turned off, the audio files will not be played and the mute and volume - controls will be hidden. - Value: on or off - -false - If true the slideshow will start upon loading. If false a play button will be - displayed. - Value: true or false - -true - If true the slideshow will pause when clicking on a thumbnail or clicking the - previous or next buttons. - Value: true or false - -false - If true the slideshow will loop. If false, when the last slide has been displayed, - the slideshow will move back to the first slide and show a play button. - Value: true or false - - - -********************************************************************************************** -* Error messages * -********************************************************************************************** - - - - Value: any text in CDATA tags: - - - - -********************************************************************************************** -* * -* The content XML * -* * -********************************************************************************************** - -The content .xml file contains the properties for each slide. - - - -********************************************************************************************** -* Structure of the xml * -********************************************************************************************** - - - - [properties go here] - [properties go here] - ... - - - - - -********************************************************************************************** -* Properties in the slide tag * -********************************************************************************************** - -<![CDATA[My first slide]]> - The title of the slide. - Value: any text in CDATA tags: - - - The description of the slide. - Value: any text in CDATA tags: - -/someUrl/someImg.jpg - The url to the slide image. - Value: an absolute or relative url to a .jpg, .gif or .png file - -/someUrl/someImg_thumb.jpg - The url to the thumbnail of the slide image. - Value: an absolute or relative url to a .jpg, .gif or .png file - -/someUrl/someImg_thumb.jpg - The url to the sound file that will be played when the slide is displayed. It will be - played once for the duration of the slide (if the duration of the sound file is longer - than the set duration of the slide it will be cut off). This property is optional. - Value: an absolute or relative url to a .mp3 file - -8 - The duration for this specific slide. This value will overwrite the duration value set - in the configuration xml. This property is optional. - Value: number in seconds - -400 -300 - The width and height of the slide. This will overwrite the default_slidewidth and - default_slideheight set in the configuration xml. The width and height properties are - optional. - Value: number in px - - - -********************************************************************************************** -* eof * -********************************************************************************************** \ No newline at end of file diff --git a/www/extras/ukplayer/slideShow.swf b/www/extras/ukplayer/slideShow.swf deleted file mode 100644 index 9fca5bf8c..000000000 Binary files a/www/extras/ukplayer/slideShow.swf and /dev/null differ diff --git a/www/extras/ukplayer/slideshow.html b/www/extras/ukplayer/slideshow.html deleted file mode 100644 index 05c5d4e20..000000000 --- a/www/extras/ukplayer/slideshow.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - UKplayer Slideshow Demo - - - - - - - - - -
- - - - - - - - - Get Adobe Flash player - - - - - -
- -

Code generated with the SWFObject 2 HTML and JavaScript generator.

- - - - - diff --git a/www/extras/ukplayer/swfobject.js b/www/extras/ukplayer/swfobject.js deleted file mode 100644 index 08fb27000..000000000 --- a/www/extras/ukplayer/swfobject.js +++ /dev/null @@ -1,5 +0,0 @@ -/* SWFObject v2.1 - Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis - This software is released under the MIT License -*/ -var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("