From 09ba3dba912a7b96062cd477a81d4e6c1dcaa350 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 11 Jun 2009 15:00:09 +0000
Subject: [PATCH] Last of the hardcoded extras fixes, with changelog notice.

---
 docs/changelog/7.x.x.txt           |  1 +
 www/extras/ukplayer/config.xml     |  2 +-
 www/extras/ukplayer/content.xml    | 30 +++++++++++------------
 www/extras/ukplayer/readme.txt     | 35 ++++++++++++++++++++++++++-
 www/extras/ukplayer/slideshow.html | 38 ++++++++++++++++++++++++------
 5 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0fef4518d..8c32a862b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,6 +15,7 @@
  - fixed #9953: Matrix 2.0 - Not enough tests
  - fixed #10121: Q and A template doesn't work with default Forum Rich Editor
  - rfe #10423: Provide a way to access the instance of the thing that was added, modified, or deleted via workflow. (Eric Kennedy)
+ - fixed #10486: Hardcoded extras in files in www/extras
 
 7.7.9
  - fixed #10266: Public Profile overrides Able to be friend   
diff --git a/www/extras/ukplayer/config.xml b/www/extras/ukplayer/config.xml
index 46feb3bee..77409fb8c 100644
--- a/www/extras/ukplayer/config.xml
+++ b/www/extras/ukplayer/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-	<content_url>/extras/ukplayer/content.xml</content_url>
+	<content_url>content.xml</content_url>
 	
 	<width>400</width>
 	<height>300</height>
diff --git a/www/extras/ukplayer/content.xml b/www/extras/ukplayer/content.xml
index f50ba6b92..0c2ed2d14 100644
--- a/www/extras/ukplayer/content.xml
+++ b/www/extras/ukplayer/content.xml
@@ -2,24 +2,24 @@
 <content>
 	<slides>
 		<slide>
-			<width>400</width>
-			<height>300</height>
-			<title><![CDATA[<b>Slide</b> One]]></title>
-			<description><![CDATA[ This is the United Knowledge Player for <u>WebGUI</u>!]]></description>
-			<image_source>/extras/ukplayer/dummycontent/explain.jpg</image_source>
+			<width>400</width>
+			<height>300</height>
+			<title><![CDATA[Slide One]]></title>
+			<description><![CDATA[This is the United Knowledge Player for WebGUI!]]></description>
+			<image_source>dummycontent/explain.jpg</image_source>
 			<duration>5</duration>
-			<thumb_source>/extras/ukplayer/dummycontent/explain.jpg</thumb_source>
-			<sound_source>/extras/ukplayer/dummycontent/transporter.mp3</sound_source>
+			<thumb_source>dummycontent/explain.jpg</thumb_source>
+			<sound_source></sound_source>
 		</slide>
 		<slide>
-			<width>400</width>
-			<height>300</height>
-			<title><![CDATA[<b>Slide</b> Two]]></title>
-			<description><![CDATA[ This is the United Knowledge Player for <u>WebGUI</u>!]]></description>
-			<image_source>/extras/ukplayer/dummycontent/united-knowledge-logo.jpg</image_source>
+			<width>400</width>
+			<height>300</height>
+			<title><![CDATA[Slide Two]]></title>
+			<description><![CDATA[This is the United Knowledge Player for WebGUI!]]></description>
+			<image_source>dummycontent/united-knowledge-logo.jpg</image_source>
 			<duration>5</duration>
-			<thumb_source>/extras/ukplayer/dummycontent/united-knowledge-logo.jpg</thumb_source>
-			<sound_source>/extras/ukplayer/dummycontent/transporter.mp3</sound_source>
+			<thumb_source>dummycontent/united-knowledge-logo.jpg</thumb_source>
+			<sound_source></sound_source>
 		</slide>
 	</slides>
-</content>
+</content>
diff --git a/www/extras/ukplayer/readme.txt b/www/extras/ukplayer/readme.txt
index 665609d06..4e0479e5e 100644
--- a/www/extras/ukplayer/readme.txt
+++ b/www/extras/ukplayer/readme.txt
@@ -1,6 +1,6 @@
 United Knowledge Slideshow Player - readme.txt
 
-Copyright: United Knowledge, 2008
+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
@@ -62,6 +62,10 @@ default values for most, but we recommend setting ALL properties yourself).
 	and when a slide is smaller than the slideshow.
 	Value: 0x followed by hexadecimal color
 
+<skin>rounded</skin>
+	The textarea, controls and thumbnails can be displayed with two different skins.
+	Value: simple or rounded
+
 
 
 **********************************************************************************************
@@ -92,6 +96,16 @@ default values for most, but we recommend setting ALL properties yourself).
 	When set to true the textarea will hide after a few seconds.
 	Value: true or false
 
+<text_display>over</text_display>
+	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
+
+<text_height>50</text_height>
+	The minimum height of the textarea.
+	Value: number in px
+
 
 
 **********************************************************************************************
@@ -114,6 +128,16 @@ default values for most, but we recommend setting ALL properties yourself).
 	When set to true the controls will hide after a few seconds.
 	Value: true or false
 
+<playbutton_percent_width>20</playbutton_percent_width>
+	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
+
+<playbutton_max_width>200</playbutton_max_width>
+	A maximum width for the play button to prevent it from becoming too large.
+	Value: number in px
+
 
 
 **********************************************************************************************
@@ -143,6 +167,10 @@ default values for most, but we recommend setting ALL properties yourself).
 	The width of the gap between two thumbnail images.
 	Value: number in px
 
+<thumbnails_hide>false</thumbnails_hide>
+	When set to true, the thumbnails are hidden.
+	Value: true or false
+
 
 
 **********************************************************************************************
@@ -153,6 +181,11 @@ default values for most, but we recommend setting ALL properties yourself).
 	If true the slideshow will start with the sound muted.
 	Value: true or false
 
+<sound>off</sound>
+	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
+
 <autostart>false</autostart>
 	If true the slideshow will start upon loading. If false a play button will be
 	displayed.
diff --git a/www/extras/ukplayer/slideshow.html b/www/extras/ukplayer/slideshow.html
index 3ea11aee2..05c5d4e20 100644
--- a/www/extras/ukplayer/slideshow.html
+++ b/www/extras/ukplayer/slideshow.html
@@ -3,9 +3,9 @@
 <head>
     <title>UKplayer Slideshow Demo</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script type="text/javascript" src="/extras/ukplayer/swfobject.js"></script>
+    <script type="text/javascript" src="swfobject.js"></script>
     <script type="text/javascript">
-        swfobject.registerObject("myFlashContent","9.0.0","/extras/ukplayer/expressInstall.swf");
+        swfobject.registerObject("myFlashContent","9.0.0","expressInstall.swf");
     </script>
 </head>
 
@@ -13,7 +13,7 @@
 
 <!--
 This is the United Knowledge Player for WebGUI.
-It enables you to display foto's as a movie. The 
+It enables you to display photo's as a movie. The 
 configuration options can be found in the readme 
 file here:
 /extras/ukplayer/readme.txt
@@ -33,11 +33,11 @@ Copyright 2008 United Knowledge http:/www.unitedknowledge.nl/
 
 <div>
     <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="400" height="300" id="myFlashContent">
-        <param name="movie" value="/extras/ukplayer/slideShow.swf" />
-        <param name="flashvars" value="config=/extras/ukplayer/config.xml" />
+        <param name="movie" value="slideShow.swf" />
+        <param name="flashvars" value="config=config.xml" />
         <!--[if !IE]>-->
-        <object type="application/x-shockwave-flash" data="/extras/ukplayer/slideShow.swf" width="400" height="300">
-            <param name="flashvars" value="config=/extras/ukplayer/config.xml" />
+        <object type="application/x-shockwave-flash" data="slideShow.swf" width="400" height="300">
+            <param name="flashvars" value="config=config.xml" />
         <!--<![endif]-->
             <a href="http:/www.adobe.com/go/getflashplayer">
                 <img src="http:/www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
@@ -50,5 +50,29 @@ Copyright 2008 United Knowledge http:/www.unitedknowledge.nl/
 
 <p>Code generated with the <a href="http://www.bobbyvandersluis.com/swfobject/generator/index.html">SWFObject 2 HTML and JavaScript generator</a>.</p>
 
+<textarea rows="25" cols="130">
+<script type="text/javascript" src="^Extras(ukplayer/swfobject.js);"></script>
+<script type="text/javascript">
+	swfobject.registerObject("myFlashContent","9.0.0","^Extras(ukplayer/expressInstall.swf);");
+</script>
+
+<div>
+    <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="400" height="300" id="myFlashContent">
+        <param name="movie" value="^Extras(ukplayer/slideShow.swf);" />
+        <param name="flashvars" value="config=^Extras(ukplayer/config.xml);" />
+        <!--[if !IE]>-->
+            <object type="application/x-shockwave-flash" data="^Extras(ukplayer/slideShow.swf);" width="400" height="300">
+            <param name="flashvars" value="config=^Extras(ukplayer/config.xml);" />
+        <!--<![endif]-->
+        <a href="http:/www.adobe.com/go/getflashplayer">
+            <img src="http:/www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
+        </a>
+        <!--[if !IE]>-->
+            </object>
+        <!--<![endif]-->
+    </object>
+</div>
+</textarea>
+
 </body>
 </html>