Merge branch 'master' of https://github.com/arjancwidlak/webgui into …

…arjancwidlak-master
plainblack · Sep 24, 2010 · c3d0c74 · c3d0c74
2 parents 8ecf297 + b10be67
commit c3d0c74
Show file tree

Hide file tree

Showing 13 changed files with 516 additions and 0 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.2
  - fixed #11884: Editing Templates impossible / Code editor not loaded
+ - recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked. 
 
 7.10.1
  - fixed #11851: Story Topic: top story variables should be available all the time

diff --git a/docs/gotcha.txt b/docs/gotcha.txt
@@ -7,6 +7,11 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.10.2
+--------------------------------------------------------------------
+     * The UKPLayer - a slideshow that displays images as a movie - 
+       is in WebGUI again. Licencing information was overlooked. An 
+       upgrade to 7.10.1 will break the Matrix. This is fixed now.
 7.10.1
 --------------------------------------------------------------------
      * WebGUI now depends on PerlIO::eol, for doing line ending translation.

diff --git a/www/extras/ukplayer/config.xml b/www/extras/ukplayer/config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+	<content_url>content.xml</content_url>
+
+	<width>400</width>
+	<height>300</height>
+	<background_color>0xE0E0E0</background_color>
+	<default_duration>5</default_duration>
+	<default_slidewidth>400</default_slidewidth>
+	<default_slideheight>300</default_slideheight>
+
+	<font>Verdana</font>
+	<font_size>12</font_size>
+	<font_color>0xFFFFFF</font_color>
+
+	<text_border_color>0x888888</text_border_color>
+	<text_bg_color>0x000000</text_bg_color>
+	<text_autohide>true</text_autohide>
+	<text_display>over</text_display> <!--over|above|none-->
+	<text_height>0</text_height>
+
+	<controls_color>0xFFFFFF</controls_color>
+	<controls_border_color>0x888888</controls_border_color>
+	<controls_bg_color>0x000000</controls_bg_color>
+	<controls_autohide>true</controls_autohide>
+
+	<playbutton_percent_width>20</playbutton_percent_width>
+	<playbutton_max_width>200</playbutton_max_width>
+
+	<thumbnail_width>60</thumbnail_width>
+	<thumbnail_height>45</thumbnail_height>
+	<thumbnail_border_color>0x888888</thumbnail_border_color>
+	<thumbnails_hide>false</thumbnails_hide>
+	<menu_autohide>true</menu_autohide>
+	<menu_dead_zone_width>100</menu_dead_zone_width>
+	<menu_gaps>8</menu_gaps>
+
+	<sound>off</sound> <!-- on|off -->
+	<mute_at_start>false</mute_at_start>
+	<autostart>true</autostart>
+	<autopause>false</autopause>
+	<loop>true</loop>
+	<error_message_content><![CDATA[XML not found: ]]></error_message_content>
+	<error_message_image><![CDATA[Image not found]]></error_message_image>
+
+	<skin>rounded</skin> <!--simple|rounded-->
+</config>
diff --git a/www/extras/ukplayer/content.xml b/www/extras/ukplayer/content.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<content>
+	<slides>
+		<slide>
+			<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>dummycontent/explain.jpg</thumb_source>
+			<sound_source></sound_source>
+		</slide>
+		<slide>
+			<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>dummycontent/united-knowledge-logo.jpg</thumb_source>
+			<sound_source></sound_source>
+		</slide>
+	</slides>
+</content>
diff --git a/www/extras/ukplayer/dummycontent/explain.jpg b/www/extras/ukplayer/dummycontent/explain.jpg
diff --git a/www/extras/ukplayer/dummycontent/transporter.mp3 b/www/extras/ukplayer/dummycontent/transporter.mp3
diff --git a/www/extras/ukplayer/dummycontent/united-knowledge-logo.jpg b/www/extras/ukplayer/dummycontent/united-knowledge-logo.jpg
diff --git a/www/extras/ukplayer/expressInstall.swf b/www/extras/ukplayer/expressInstall.swf
diff --git a/www/extras/ukplayer/licence.txt b/www/extras/ukplayer/licence.txt
@@ -0,0 +1,63 @@
+The UKPLayer 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 UKPlayer makes use of three libraries that are compatible with GPL v.2. These are:
+
+PureMVC (Creative Commons Attribution Licence 3.0)
+http://puremvc.org/
+
+Tweener (BSD Licence)
+http://code.google.com/p/tweener/wiki/License
+
+Hydrotik (licence see below)
+http://blog.hydrotik.com/
+/*
+
+ * Copyright 2007-2008 (c) Donovan Adams, http://blog.hydrotik.com/
+
+ *
+
+ * Permission is hereby granted, free of charge, to any person
+
+ * obtaining a copy of this software and associated documentation
+
+ * files (the "Software"), to deal in the Software without
+
+ * restriction, including without limitation the rights to use,
+
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+
+ * copies of the Software, and to permit persons to whom the
+
+ * Software is furnished to do so, subject to the following
+
+ * conditions:
+
+ *
+
+ * The above copyright notice and this permission notice shall be
+
+ * included in all copies or substantial portions of the Software.
+
+ *
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+
+ * OTHER DEALINGS IN THE SOFTWARE.
+
+ */