Merge lp:~dangarner/xibo/106-server into lp:xibo/1.0

[Dan Garner]

=== modified file 'server/install/database/1.sql'
--- server/install/database/1.sql	2009-12-31 11:48:37 +0000
+++ server/install/database/1.sql	2010-02-02 19:48:16 +0000
@@ -572,7 +572,7 @@
 -- Constraints for table `pages`
 --
 ALTER TABLE `pages`
-  ADD CONSTRAINT `pages_ibfk_1` FOREIGN KEY (`pagegroupID`) REFERENCES `pages` (`pagegroupID`);
+  ADD CONSTRAINT `pages_ibfk_1` FOREIGN KEY (`pagegroupID`) REFERENCES `pagegroup` (`pagegroupID`);
 
 --
 -- Constraints for table `schedule`

=== added file 'server/install/database/10.sql'
--- server/install/database/10.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/10.sql	2010-02-02 19:48:16 +0000
@@ -0,0 +1,30 @@
+INSERT INTO `pagegroup` (
+`pagegroupID` ,
+`pagegroup`
+)
+VALUES (
+NULL ,  'Templates'
+);
+
+ALTER TABLE  `pages` DROP FOREIGN KEY  `pages_ibfk_1` ;
+
+ALTER TABLE  `pages` ADD FOREIGN KEY (  `pagegroupID` ) REFERENCES  `pagegroup` (
+`pagegroupID`
+);
+
+INSERT INTO `pages` (name, pagegroupid)
+SELECT 'resolution', pagegroupid FROM `pagegroup` WHERE pagegroup = 'Templates';
+
+INSERT INTO `menuitem` (`MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
+SELECT '4', pageID, NULL, 'Resolutions', NULL, NULL, '10' FROM pages WHERE name = 'resolution';
+
+INSERT INTO `menuitem` (`MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
+SELECT '4', pageID, NULL, 'Templates', NULL, NULL, '10' FROM pages WHERE name = 'template';
+
+UPDATE `module` SET  `Module` =  'PowerPoint' WHERE  `module`.`ModuleID` = 4 LIMIT 1 ;
+
+ALTER TABLE  `layout` CHANGE  `xml`  `xml` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+
+UPDATE `version` SET `app_ver` = '1.0.6';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '10';
\ No newline at end of file

=== modified file 'server/install/database/9.sql'
--- server/install/database/9.sql	2009-12-31 11:48:37 +0000
+++ server/install/database/9.sql	2010-02-02 19:48:16 +0000
@@ -1,14 +1,13 @@
 INSERT INTO `pages` (
-`pageID` ,
 `name` ,
 `pagegroupID`
 )
 VALUES (
-28 , 'manual', '2'
+'manual', '2'
 );
 
-INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
-VALUES (NULL, 2, 28, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', '10');
+INSERT INTO `menuitem` (`MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
+SELECT '2', pageID, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', '10' FROM pages WHERE name = 'manual';
 
 UPDATE `module` SET `ValidExtensions` = 'ppt,pps,pptx' WHERE `module`.`ModuleID` =4 LIMIT 1 ;
 

=== modified file 'server/lib/app/pagemanager.class.php'
--- server/lib/app/pagemanager.class.php	2009-12-31 11:48:37 +0000
+++ server/lib/app/pagemanager.class.php	2010-02-02 19:48:16 +0000
@@ -70,7 +70,7 @@
 		// create a user object (will try to login)
 		// we must do this after executing any functions otherwise we will be logged
 		// out again before exec any log in function calls		
-		if ($this->q != 'login' && $this->q != 'forgotten') 
+		if ($this->q != 'login' && $this->q != 'logout')
 		{ 
 			// Attempt a user login
 			if (!$user->attempt_login($this->ajax))

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2009-07-07 20:01:49 +0000
+++ server/lib/app/session.class.php	2010-02-02 19:48:16 +0000
@@ -101,13 +101,13 @@
 				
 				if (!$db->query(sprintf("UPDATE session SET session_expiration = $newExp, isExpired = 0 WHERE session_id = '%s' ", $db->escape_string($key))))
 				{
-					log_entry($db, "error", $db->error());
+					Debug::LogEntry($db, "error", $db->error());
 				}
 			}
 			else
 			{
 				// Its set - but its wrong - not good
-				log_entry($db, "error", "Incorrect SecurityToken from " . $remoteAddr);
+				Debug::LogEntry($db, "error", "Incorrect SecurityToken from " . $remoteAddr);
 				
 				$this->isExpired = 1;
 			}
@@ -126,12 +126,12 @@
 	
 	function write($key, $val) 
 	{
-		$db 			=& $this->db;
+		$db 		=& $this->db;
 		
-		$newExp 		= time() + $this->max_lifetime;
+		$newExp 	= time() + $this->max_lifetime;
 		$lastaccessed 	= date("Y-m-d H:i:s");
-		$userAgent		= Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'No user agent');
-		$remoteAddr		= Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING);
+		$userAgent	= Kit::GetParam('HTTP_USER_AGENT', $_SERVER, _STRING, 'No user agent');
+		$remoteAddr	= Kit::GetParam('REMOTE_ADDR', $_SERVER, _STRING);
 		
 		$result = $db->query(sprintf("SELECT session_id FROM session WHERE session_id = '%s'", $db->escape_string($key)));
 		
@@ -158,7 +158,7 @@
 		
 		if(!$db->query($SQL)) 
 		{
-			log_entry($db, "error", $db->error());
+			Debug::LogEntry($db, "error", $db->error());
 			return(false);
 		}
 		
@@ -173,16 +173,20 @@
 		
 		$result = $db->query("$SQL"); 
 		
-		if (!$result) log_entry($db,'audit',$db->error());
+		if (!$result) Debug::LogEntry($db,'audit',$db->error());
 		
 		return $result;
 	}
 
 	function gc($max_lifetime) 
 	{
-		$db =& $this->db;
-		
-		return $db->query("UPDATE session SET IsExpired = 1 WHERE session_expiration < ".time());
+            $db =& $this->db;
+
+            // Delete sessions older than 10 times the max lifetime
+            $SQL = sprintf("DELETE FROM session WHERE IsExpired = 1 AND session_expiration < %d", time() - ($max_lifetime * 10));
+            $db->query($SQL);
+
+            return $db->query(sprintf("UPDATE session SET IsExpired = 1 WHERE session_expiration < %d", time()));
 	}
 	
 	function set_user($key, $userid) 
@@ -203,19 +207,19 @@
 	 * Updates the session ID with a new one
 	 * @return 
 	 */
-	public function RegenerateSessionID($oldSessionID) 
-	{
-		$db =& $this->db;
-		
-	    session_regenerate_id(false);
-		
-	    $new_sess_id = session_id();
-		
-		$this->key = $new_sess_id;
-	       
-	    $query = sprintf("UPDATE session SET session_id = '%s' WHERE session_id = '%s'", $db->escape_string($new_sess_id), $db->escape_string($oldSessionID));
-	    $db->query($query);
-	}
+        public function RegenerateSessionID($oldSessionID)
+        {
+            $db =& $this->db;
+
+            session_regenerate_id(false);
+
+            $new_sess_id = session_id();
+
+            $this->key = $new_sess_id;
+
+            $query = sprintf("UPDATE session SET session_id = '%s' WHERE session_id = '%s'", $db->escape_string($new_sess_id), $db->escape_string($oldSessionID));
+            $db->query($query);
+        }
 	
 	function set_page($key, $lastpage) 
 	{
@@ -243,7 +247,7 @@
 		
 		if (!$db->query($SQL))
 		{
-			log_entry($db, "error", $db->error());
+			Debug::LogEntry($db, "error", $db->error());
 		}
 	}
 	
@@ -255,7 +259,7 @@
 		
 		if (!$db->query($SQL))
 		{
-			log_entry($db, "error", $db->error());
+			Debug::LogEntry($db, "error", $db->error());
 		}
 	}
 	

=== added file 'server/lib/data/resolution.data.class.php'
--- server/lib/data/resolution.data.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/data/resolution.data.class.php	2010-02-02 19:48:16 +0000
@@ -0,0 +1,99 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class Resolution extends Data
+{
+    /**
+     * Adds a resolution
+     * @param <type> $resolution
+     * @param <type> $width
+     * @param <type> $height
+     * @return <type>
+     */
+    public function Add($resolution, $width, $height)
+    {
+        $db =& $this->db;
+        
+        $SQL = "INSERT INTO resolution (resolution, width, height) VALUES ('%s', %d, %d)";
+        $SQL = sprintf($SQL, $db->escape_string($resolution), $width, $height);
+
+        if(!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25000, 'Cannot add this resolution.');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Edits a resolution
+     * @param <type> $resolutionID
+     * @param <type> $resolution
+     * @param <type> $width
+     * @param <type> $height
+     * @return <type>
+     */
+    public function Edit($resolutionID, $resolution, $width, $height)
+    {
+        $db =& $this->db;
+
+        $SQL = "UPDATE resolution SET resolution = '%s', width = %d, height = %d WHERE resolutionID = %d ";
+        $SQL = sprintf($SQL, $db->escape_string($resolution), $width, $height, $resolutionID);
+
+        if(!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25000, 'Cannot edit this resolution.');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a Resolution
+     * @param <type> $resolutionID
+     * @return <type>
+     */
+    public function Delete($resolutionID)
+    {
+        $db =& $this->db;
+
+        $SQL = "DELETE FROM resolution WHERE resolutionID = %d";
+        $SQL = sprintf($SQL, $resolutionID);
+
+        if(!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25000, 'Cannot delete this resolution.');
+
+            return false;
+        }
+
+        return true;
+    }
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/js/layout.js'
--- server/lib/js/layout.js	2009-12-31 11:48:37 +0000
+++ server/lib/js/layout.js	2010-02-02 19:48:16 +0000
@@ -45,15 +45,18 @@
 			orderRegion(ui.draggable, this);
 		}
 	});
+
+        // Refresh the preview
+        var preview = Preview.instances[$('#timeline_ctl').attr('regionid')];
+        preview.SetSequence(preview.seq);
 }
 
 var background_button_callback = function()
 {
 	//Want to attach an onchange event to the drop down for the bg-image
-	var libraryloc = $('#libraryloc').val();
-	var fileUrl = $('#bg_image').val();
+	var id = $('#bg_image').val();
 	
-	$('#bg_image_image').attr("src", "index.php?p=module&q=GetImage&file="+"tn_" + fileUrl);
+	$('#bg_image_image').attr("src", "index.php?p=module&q=GetImage&id=" + id + "&width=80&height=80&dynamic");
 }
 
 var text_callback = function()
@@ -89,25 +92,37 @@
 	$('.region').draggable({containment:container, stop:function(e, ui){
 		//Called when draggable is finished
 		submitBackground(this);
-	}}).resizable({containment:container, minWidth:25, minHeight:25, stop:function(e, ui){
+	}, drag: updateRegionInfo }).resizable({containment:container, minWidth:25, minHeight:25, stop:function(e, ui){
 		//Called when resizable is finished
 		submitBackground(this);
-	}}).contextMenu('regionMenu', {
+	}, resize: updateRegionInfo }
+        ).contextMenu('regionMenu', {
 	    bindings: {
-	        'options': function(t) {
-				XiboFormRender($(t).attr("href"));
+	        'btnTimeline': function(t) {
+                    XiboFormRender($(t).attr("href"));
 	        },
-			'deleteRegion': function(t) {
+                'options' : function(region) {
+                    var width 	= $(region).css("width");
+                    var height 	= $(region).css("height");
+                    var top 	= $(region).css("top");
+                    var left 	= $(region).css("left");
+                    var regionid = $(region).attr("regionid");
+                    var layoutid = $(region).attr("layoutid");
+
+                    var layout = $('#layout');
+
+                    XiboFormRender("index.php?p=layout&q=ManualRegionPositionForm&layoutid="+layoutid+"&regionid="+regionid+"&top="+top+"&left="+left+"&width="+width+"&height="+height+"&layoutWidth="+layout.width()+"&layoutHeight="+layout.height());
+                },
+		'deleteRegion': function(t) {
 	            deleteRegion(t);
-	        }
-			,
-			'setAsHomepage': function(t) {
-				var layoutid = $(t).attr("layoutid");
-				var regionid = $(t).attr("regionid");
+	        },
+		'setAsHomepage': function(t) {
+                    var layoutid = $(t).attr("layoutid");
+                    var regionid = $(t).attr("regionid");
 				
 	            XiboFormRender("index.php?p=user&q=SetUserHomepageForm&layoutid="+layoutid+"&regionid="+regionid);
 	        }
-    	}
+            }
 	});
 	
 	$('#layout').contextMenu('layoutMenu', {
@@ -132,11 +147,32 @@
 	
 	// Preview
 	$('.region').each(function(){
-    	var preview = new Preview(this);
+            new Preview(this);
 	});
 
+        // Aspect ration option
+       $('#lockAspectRatio').change(function(){
+            var opt = $('#lockAspectRatio').val();
+
+            if (opt == "on") {
+                alert("on");
+                $('.region').resizable('option', 'aspectRatio', true);
+            }
+            else {
+                $('.region').resizable('option', 'aspectRatio', false);
+            }
+
+       });
 });
 
+/*
+ * Updates the Region Info
+ */
+function updateRegionInfo(e, ui) {
+    var pos = $(this).position();
+    $('.regionInfo', this).html($(this).width() + " x " + $(this).height() + " (" + pos.left + "," + pos.top + ")");
+}
+
 /**
  * Adds a region to the specified layout
  * @param {Object} layout
@@ -160,6 +196,9 @@
 	var left 	= $(region).css("left");
 	var regionid = $(region).attr("regionid");
 	var layoutid = $(region).attr("layoutid");
+
+        var preview = Preview.instances[regionid];
+        preview.SetSequence(preview.seq);
 	
 	$.ajax({type:"post", url:"index.php?p=layout&q=RegionChange&layoutid="+layoutid+"&ajax=true", cache:false, dataType:"json", 
 		data:{"width":width,"height":height,"top":top,"left":left,"regionid":regionid},success: XiboSubmitResponse});
@@ -186,10 +225,11 @@
 	var layoutid = timeLine.attr("layoutid");
 	var regionid = timeLine.attr("regionid");
 	var mediaid = $(timeBar).attr("mediaid");
+        var lkid     = $(timeBar).attr("lkid");
 	var sequence = $(mediaBreak).attr("breakid");
 	
 	$.ajax({type:"post", url:"index.php?p=layout&q=RegionOrder&layoutid="+layoutid+"&callingpage=layout&ajax=true", cache:false, dataType:"json", 
-		data:{"mediaid":mediaid,"sequence":sequence,"regionid":regionid},success: XiboSubmitResponse});
+		data:{"mediaid":mediaid,"lkid":lkid,"sequence":sequence,"regionid":regionid},success: XiboSubmitResponse});
 }
 
 /**
@@ -202,10 +242,18 @@
 	XiboFormRender('index.php?p=layout&layoutid='+layoutid+'&regionid='+regionid+'&q=RegionOptions');
 }
 
+function manualPositionCallback() {
+    $('#btnFullScreen').click(function(){
+        $('#width', '.XiboForm').val($('#layoutWidth').val());
+        $('#height', '.XiboForm').val($('#layoutHeight').val());
+        $('#top', '.XiboForm').val('0');
+        $('#left', '.XiboForm').val('0');
+    })
+}
+
 
 function Preview(regionElement)
 {
-		
 	// Load the preview - sequence 1
 	this.seq = 1;
 	this.layoutid = $(regionElement).attr("layoutid");
@@ -229,15 +277,6 @@
 		.append("<div class='prevSeq' style='position:absolute; left:1px; top:"+ arrowsTop +"px'><img src='img/arrow_left.gif' /></div>")
 		.append("<div class='nextSeq' style='position:absolute; right:1px; top:"+ arrowsTop +"px'><img src='img/arrow_right.gif' /></div>");
 	
-	// Bind the events to the Nav Buttons
-	$(regionElement).hover(function(){
-		//In
-		$('.previewNav, .info', regionElement).fadeIn("slow");
-	}, function(){
-		//Out
-		$('.previewNav, .info', regionElement).fadeOut("slow");
-	});
-	
 	$('.prevSeq', $(this.previewElement)).click(function() {
 		var preview = Preview.instances[regionid];
 		var maxSeq 	= $('#maxSeq', preview.previewContent[0]).val();
@@ -276,12 +315,13 @@
 Preview.prototype.SetSequence = function(seq)
 {
 	this.seq = seq;
+
+        //console.log('Setting sequence to: ' + seq);
 	
 	var layoutid 		= this.layoutid;
 	var regionid 		= this.regionid;
 	var previewContent 	= this.previewContent;
-	var previewElement	= this.previewElement;
-	var maxSeq 			= $('#maxSeq', previewContent[0]).val();
+	
 	
 	this.width	= $(this.regionElement).width();
 	this.height = $(this.regionElement).height();

=== added file 'server/lib/js/resolution.js'
--- server/lib/js/resolution.js	1970-01-01 00:00:00 +0000
+++ server/lib/js/resolution.js	2010-02-02 19:48:16 +0000
@@ -0,0 +1,19 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
\ No newline at end of file

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2009-12-31 11:48:37 +0000
+++ server/lib/modules/module.class.php	2010-02-02 19:48:16 +0000
@@ -561,5 +561,15 @@
 
 		return $this->name;
 	}
+
+        /**
+         * Preview code for a module
+         * @param <type> $width
+         * @param <type> $height
+         */
+        public function Preview($width, $height)
+        {
+            return '<div style="text-align:center;"><img alt="' . $this->type . ' thumbnail" src="img/forms/' . $this->type . '.png" /></div>';
+        }
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2009-12-03 21:27:56 +0000
+++ server/lib/pages/content.class.php	2010-02-02 19:48:16 +0000
@@ -403,6 +403,9 @@
 		$user			=& $this->user;
 		$response		= new ResponseManager();
 		$formMgr 		= new FormManager($db, $user);
+
+                $mediatype              = '';
+                $name                   = '';
 		
 		if (isset($_SESSION['content']['mediatype'])) $mediatype = $_SESSION['content']['mediatype'];
 		if (isset($_SESSION['content']['name'])) $name = $_SESSION['content']['name'];
@@ -519,7 +522,7 @@
 			    <tr>
 			        <th>Name</th>
 		            <th>Type</th>
-		            <th>Duration</th>
+		            <th>Duration (s)</th>
 		            <th>Shared</th>
 			        <th>Select</th>
 			    </tr>

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2009-11-29 18:51:30 +0000
+++ server/lib/pages/layout.class.php	2010-02-02 19:48:16 +0000
@@ -294,7 +294,7 @@
 		}
 		
 		// Create an array out of the tags
-		$tagsArray = split(' ', $tags);
+		$tagsArray = explode(' ', $tags);
 		
 		// Add the tags XML to the layout
 		$layoutObject = new Layout($db);
@@ -821,37 +821,44 @@
 	 */
 	function BackgroundForm() 
 	{
-		$db 			=& $this->db;
-		$user			=& $this->user;
+		$db 		=& $this->db;
+		$user		=& $this->user;
 		
 		$helpManager	= new HelpManager($db, $user);
-		$response		= new ResponseManager();
+		$response	= new ResponseManager();
 		
 
 		//load the XML into a SimpleXML OBJECT
-		$xml 				= simplexml_load_string($this->xml);
+		$xml                = simplexml_load_string($this->xml);
 				
-		$backgroundImage 	= (string) $xml['background'];
-		$backgroundColor 	= (string) $xml['bgcolor'];
-		$width				= (string) $xml['width'];
-		$height				= (string) $xml['height'];
-		
-		//File upload directory.. get this from the settings object
-		$databaseDir = Config::GetSetting($db, "LIBRARY_LOCATION");
-		
-		//Manipulate the images slightly
+		$backgroundImage    = (string) $xml['background'];
+		$backgroundColor    = (string) $xml['bgcolor'];
+		$width              = (string) $xml['width'];
+		$height             = (string) $xml['height'];
+                $bgImageId          = 0;
+
+                // Do we need to override the background with one passed in?
+                $bgOveride          = Kit::GetParam('backgroundOveride', _GET, _STRING);
+
+                if ($bgOveride != '')
+                    $backgroundImage = $bgOveride;
+		
+		// Manipulate the images slightly
 		if ($backgroundImage != "")
 		{
-			$backgroundImage = str_replace("bg_".$width."x".$height."_", "", $backgroundImage);
-			$thumbBgImage = "index.php?p=module&q=GetImage&file=tn_".$backgroundImage;
+                    // Get the ID for the background image
+                    $bgImageInfo = explode('.', $backgroundImage);
+                    $bgImageId = $bgImageInfo[0];
+
+                    $thumbBgImage = "index.php?p=module&q=GetImage&id=$bgImageId&width=80&height=80&dynamic";
 		}
 		else
 		{
-			$thumbBgImage = "img/forms/filenotfound.png";
+                    $thumbBgImage = "img/forms/filenotfound.png";
 		}
 		
 		//A list of available backgrounds
-		$backgroundList = dropdownlist("SELECT '', 'None', 3, 1 AS name, 0 As sort_order UNION SELECT storedAs, name, permissionID, userID, 1 AS sort_order FROM media WHERE type = 'image' AND IsEdited = 0 AND retired = 0 AND storedAs IS NOT NULL ORDER BY sort_order, 1","bg_image", $backgroundImage, "onchange=\"background_button_callback()\"", false, true);
+		$backgroundList = dropdownlist("SELECT '0', 'None', 3, 1 AS name, 0 As sort_order UNION SELECT mediaID, name, permissionID, userID, 1 AS sort_order FROM media WHERE type = 'image' AND IsEdited = 0 AND retired = 0 AND storedAs IS NOT NULL ORDER BY sort_order, 1","bg_image", $bgImageId, "onchange=\"background_button_callback()\"", false, true);
 		
 		//A list of web safe colors
 		//Strip the # from the currently set color
@@ -868,7 +875,7 @@
 			trigger_error("Unable to get the Resolution information", E_USER_ERROR);
 		}
 		
-		$row 			= $db->get_row($results) ;
+		$row 		= $db->get_row($results) ;
 		$resolutionid 	=  Kit::ValidateParam($row[0], _INT);
 		
 		//Make up the list
@@ -886,7 +893,6 @@
 		//
 		$form = <<<FORM
 		<form class="XiboForm" method="post" action="index.php?p=layout&q=EditBackground">
-			<input type="hidden" id="libraryloc" value="$databaseDir">
 			<input type="hidden" id="layoutid" name="layoutid" value="$this->layoutid">
 			<table>
 				<tr>
@@ -910,6 +916,7 @@
 					<td>
 						<input type="submit" value="Save" />
 						<input id="btnCancel" type="button" title="No / Cancel" onclick="$('#div_dialog').dialog('close');return false; " value="Cancel" />
+                                                <input class="XiboFormButton" type="button" href="index.php?p=module&q=Exec&mod=image&method=AddForm&backgroundImage=true&layoutid=$this->layoutid" title="Add Image" value="Add Image" />
 						$helpButton
 					</td>
 				</tr>
@@ -927,20 +934,22 @@
 	 */
 	function EditBackground()
 	{
-		$db 				=& $this->db;
-		$user 				=& $this->user;
-		$response			= new ResponseManager();
+		$db 			=& $this->db;
+		$user 			=& $this->user;
+		$response		= new ResponseManager();
 		
-		$layoutid 			= Kit::GetParam('layoutid', _POST, _INT);
-		$bg_color 			= '#'.Kit::GetParam('bg_color', _POST, _STRING);
-		$bg_image 			= Kit::GetParam('bg_image', _POST, _STRING);
-		$bg_image_original 	= Kit::GetParam('bg_image', _POST, _STRING);
+		$layoutid 		= Kit::GetParam('layoutid', _POST, _INT);
+		$bg_color 		= '#'.Kit::GetParam('bg_color', _POST, _STRING);
+		$mediaID 		= Kit::GetParam('bg_image', _POST, _INT);
 		$resolutionid		= Kit::GetParam('resolutionid', _POST, _INT);
-		
-		//File upload directory.. get this from the settings object
-		$libraryLocation 	= Config::GetSetting($db, "LIBRARY_LOCATION");
-		
-		//Look up the width and the height
+
+                // Get the file URI
+                $SQL = sprintf("SELECT StoredAs FROM media WHERE MediaID = %d", $mediaID);
+
+                if (!$bg_image = $db->GetSingleValue($SQL, 'StoredAs', _STRING))
+                    trigger_error('No media found for that media ID', E_USER_ERROR);
+		
+		// Look up the width and the height
 		$SQL = sprintf("SELECT width, height FROM resolution WHERE resolutionID = %d ", $resolutionid);
 		
 		if (!$results = $db->query($SQL)) 
@@ -953,25 +962,12 @@
 		$row 	= $db->get_row($results) ;
 		$width  =  Kit::ValidateParam($row[0], _INT);
 		$height =  Kit::ValidateParam($row[1], _INT);
-		
-		//If we have a background image we need to create one of the appropriate size
-		if ($bg_image != "")
-		{
-			//Create the appropriate file name
-			$bg_image = "bg_" . $width . "x" . $height . "_" . $bg_image;
-			
-			//Make sure we have an appropriately sized image
-			if (!file_exists($libraryLocation . $bg_image))
-			{
-				ResizeImage($libraryLocation.$bg_image_original, $libraryLocation . $bg_image, $width, $height);
-			}
-		}
-		
+
+                
 		include_once("lib/pages/region.class.php");
-		
 		$region = new region($db, $user);
 		
-		if (!$region->EditBackground($layoutid, $bg_color, $bg_image_original, $width, $height))
+		if (!$region->EditBackground($layoutid, $bg_color, $bg_image, $width, $height))
 		{
 			//there was an ERROR
 			$response->SetError($region->errorMsg);
@@ -979,7 +975,7 @@
 		}
 		
 		// Update the layout record with the new background
-		$SQL = sprintf("UPDATE layout SET background = '%s' WHERE layoutid = %d ", $bg_image_original, $layoutid);
+		$SQL = sprintf("UPDATE layout SET background = '%s' WHERE layoutid = %d ", $bg_image, $layoutid);
 		
 		if (!$db->query($SQL)) 
 		{
@@ -1058,6 +1054,95 @@
 		$response->SetFormSubmitResponse('Region Deleted.', true, sprintf("index.php?p=layout&layoutid=%d&modify=true", $this->layoutid));
 		$response->Respond();
 	}
+
+        /*
+         * Form called by the layout which shows a manual positioning/sizing form.
+         */
+        function ManualRegionPositionForm()
+        {
+            $db 	=& $this->db;
+            $user 	=& $this->user;
+            $response = new ResponseManager();
+
+            $regionid 	= Kit::GetParam('regionid', _GET, _STRING);
+            $layoutid 	= Kit::GetParam('layoutid', _GET, _INT);
+            $top 	= Kit::GetParam('top', _GET, _INT);
+            $left 	= Kit::GetParam('left', _GET, _INT);
+            $width 	= Kit::GetParam('width', _GET, _INT);
+            $height 	= Kit::GetParam('height', _GET, _INT);
+            $layoutWidth = Kit::GetParam('layoutWidth', _GET, _INT);
+            $layoutHeight = Kit::GetParam('layoutHeight', _GET, _INT);
+
+            $form = <<<END
+		<form class="XiboForm" method="post" action="index.php?p=layout&q=ManualRegionPosition">
+                    <input type="hidden" name="layoutid" value="$layoutid">
+                    <input type="hidden" name="regionid" value="$regionid">
+                    <input id="layoutWidth" type="hidden" name="layoutWidth" value="$layoutWidth">
+                    <input id="layoutHeight" type="hidden" name="layoutHeight" value="$layoutHeight">
+                    <table>
+			<tr>
+                            <td><label for="top" title="Offset from the Top Corner">Top Offset</label></td>
+                            <td><input name="top" type="text" id="top" value="$top" tabindex="1" /></td>
+			</tr>
+			<tr>
+                            <td><label for="left" title="Offset from the Left Corner">Left Offset</label></td>
+                            <td><input name="left" type="text" id="left" value="$left" tabindex="2" /></td>
+			</tr>
+			<tr>
+                            <td><label for="width" title="Width of the Region">Width</label></td>
+                            <td><input name="width" type="text" id="width" value="$width" tabindex="3" /></td>
+			</tr>
+			<tr>
+                            <td><label for="height" title="Height of the Region">Height</label></td>
+                            <td><input name="height" type="text" id="height" value="$height" tabindex="4" /></td>
+			</tr>
+                        <tr>
+                            <td></td>
+                            <td>
+                                <input type='submit' value="Save" / >
+                                <input id="btnCancel" type="button" title="No / Cancel" onclick="$('#div_dialog').dialog('close');return false; " value="Cancel" />
+                                <input id="btnFullScreen" type='button' value="Full Screen" / >
+                            </td>
+                        </tr>
+                    </table>
+		</form>
+END;
+
+            $response->SetFormRequestResponse($form, 'Manual Region Positioning', '350px', '275px', 'manualPositionCallback');
+            $response->Respond();
+        }
+
+        function ManualRegionPosition()
+        {
+            $db 	=& $this->db;
+            $user 	=& $this->user;
+            $response   = new ResponseManager();
+
+            $layoutid   = Kit::GetParam('layoutid', _POST, _INT);
+            $regionid   = Kit::GetParam('regionid', _POST, _STRING);
+            $top        = Kit::GetParam('top', _POST, _INT);
+            $left       = Kit::GetParam('left', _POST, _INT);
+            $width      = Kit::GetParam('width', _POST, _INT);
+            $height 	= Kit::GetParam('height', _POST, _INT);
+
+            Debug::LogEntry($db, 'audit', sprintf('Layoutid [%d] Regionid [%s]', $layoutid, $regionid), 'layout', 'ManualRegionPosition');
+
+            // Remove the "px" from them
+            $width  = str_replace('px', '', $width);
+            $height = str_replace('px', '', $height);
+            $top    = str_replace('px', '', $top);
+            $left   = str_replace('px', '', $left);
+
+            include_once("lib/pages/region.class.php");
+
+            $region = new region($db, $user);
+
+            if (!$region->EditRegion($layoutid, $regionid, $width, $height, $top, $left))
+                trigger_error($region->errorMsg, E_USER_ERROR);
+
+            $response->SetFormSubmitResponse('Region Resized', true, "index.php?p=layout&modify=true&layoutid=$layoutid");
+            $response->Respond();
+        }
 	
 	/**
 	 * Edits the region information
@@ -1073,12 +1158,12 @@
 		
 		//Vars
 		$regionid 	= Kit::GetParam('regionid', _REQUEST, _STRING);
-		$width 		= $_POST['width'];
-		$height 	= $_POST['height'];
-		$top 		= $_POST['top'];
-		$left 		= $_POST['left'];
+		$top            = Kit::GetParam('top', _POST, _INT);
+                $left           = Kit::GetParam('left', _POST, _INT);
+                $width          = Kit::GetParam('width', _POST, _INT);
+                $height 	= Kit::GetParam('height', _POST, _INT);
 		
-		//Remove the "px" from them
+		// Remove the "px" from them
 		$width 	= str_replace("px", '', $width);
 		$height = str_replace("px", '', $height);
 		$top 	= str_replace("px", '', $top);
@@ -1114,8 +1199,9 @@
 		//Vars
 		$regionid 		= Kit::GetParam('regionid', _POST, _STRING);
 		$mediaid 		= Kit::GetParam('mediaid', _POST, _STRING);
+		$lkid        		= Kit::GetParam('lkid', _POST, _STRING, '');
 		$sequence 		= Kit::GetParam('sequence', _POST, _INT);
-		$callingPage 	= Kit::GetParam('callingpage', _POST, _STRING);
+		$callingPage            = Kit::GetParam('callingpage', _POST, _STRING);
 		
 		$sequence--; //zero based
 		
@@ -1123,7 +1209,7 @@
 		
 		$region = new region($db, $user);
 		
-		if (!$region->ReorderMedia($this->layoutid, $regionid, $mediaid, $sequence))
+		if (!$region->ReorderMedia($this->layoutid, $regionid, $mediaid, $sequence, $lkid))
 		{
 			//there was an ERROR
 			trigger_error($region->errorMsg, E_USER_ERROR);
@@ -1192,12 +1278,15 @@
 		//Fix up the background css
 		if ($bgImage == "")
 		{
-			$background_css = "$bgColor";
+                    $background_css = "$bgColor";
 		}
 		else
 		{
-			$bgImage = "bg_" . $width . "x" . $height . "_" . $bgImage; 
-			$background_css = "url('index.php?p=module&q=GetImage&file=$bgImage') top center no-repeat; background-color:$bgColor";
+                    // Get the ID for the background image
+                    $bgImageInfo = explode('.', $bgImage);
+                    $bgImageId = $bgImageInfo[0];
+
+                    $background_css = "url('index.php?p=module&q=GetImage&id=$bgImageId&width=$width&height=$height&dynamic&proportional=0') top center no-repeat; background-color:$bgColor";
 		}
 		
 		$width 	= $width . "px";
@@ -1210,38 +1299,49 @@
 		//get the regions
 		foreach ($regionNodeList as $region)
 		{
-			//get dimensions
+			// get dimensions
+                        $tipWidth       = $region->getAttribute('width');
+                        $tipHeight      = $region->getAttribute('height');
+                        $tipTop         = $region->getAttribute('top');
+                        $tipLeft        = $region->getAttribute('left');
+
 			$regionWidth 	= $region->getAttribute('width') . "px";
 			$regionHeight 	= $region->getAttribute('height') . "px";
-			$regionLeft		= $region->getAttribute('left') . "px";
-			$regionTop		= $region->getAttribute('top') . "px";
-			$regionid		= $region->getAttribute('id');
+			$regionLeft	= $region->getAttribute('left') . "px";
+			$regionTop	= $region->getAttribute('top') . "px";
+			$regionid	= $region->getAttribute('id');
 			
-			$previewStyle	= "position:absolute; top:0px; left:0px; width: 100%; height: 100%;";
-			$paddingTop		= $regionHeight / 2 - 16;
-			$paddingTop		= $paddingTop . "px";
+			$paddingTop	= $regionHeight / 2 - 16;
+			$paddingTop	= $paddingTop . "px";
 
 			$regionTransparency  = '<div class="regionTransparency" style="width:100%; height:100%;">';
 			$regionTransparency .= '</div>';
 
 			$doubleClickLink = "XiboFormRender($(this).attr('href'))";
 			$regionHtml .= "<div id='region_$regionid' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=layout&layoutid=$this->layoutid&regionid=$regionid&q=RegionOptions' ondblclick=\"$doubleClickLink\"' class='region' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft;\">
-								$regionTransparency							
-								<div class='preview' style='$previewStyle'>
+					  $regionTransparency
+                                           <div class='regionInfo'>
+                                                $tipWidth x $tipHeight ($tipLeft,$tipTop)
+                                           </div>
+								<div class='preview'>
 									<div class='previewContent'></div>
-									<div class='previewNav' style='display:none;'></div>
+									<div class='previewNav'></div>
 								</div>
 							</div>";
 		}
 		
 		//render the view pane
 		$surface = <<<HTML
+                <!--<div id="aspectRatioOption">
+                    <input id="lockAspectRatio" type="checkbox" /><label for="lockAspectRatio">Lock Aspect Ratio?</label>
+                </div>-->
 		<div id="layout" layoutid="$this->layoutid" style="position:relative; width:$width; height:$height; border: 1px solid #000; background:$background_css;">
 		$regionHtml
 		</div>
 		<div class="contextMenu" id="regionMenu">
 			<ul>
-				<li id="options">Options</li>
+				<li id="btnTimeline">Timeline</li>
+                                <li id="options">Options</li>
 				<li id="deleteRegion">Delete</li>
 				<li id="setAsHomepage">Set as Homepage</li>
 			</ul>
@@ -1415,7 +1515,7 @@
 			$rightClass = "timebar_".$mediaType."_right";
 			
 			$mediaHtml .= <<<BUTTON
-			<div class="timebar_ctl" style="position:absolute; top:$top; left:$leftVal; width:$thumbWidthVal;" mediaid="$mediaid">
+			<div class="timebar_ctl" style="position:absolute; top:$top; left:$leftVal; width:$thumbWidthVal;" mediaid="$mediaid" lkid="$lkid">
 				<div class="timebar">
 					<div class="$rightClass">
 					<div class="$leftClass"></div>
@@ -1641,7 +1741,7 @@
 		
 		if (!$xmlString = $region->GetLayoutXml($layoutid))
 		{
-			trigger_error($region->errorMsg, E_USER_ERROR);
+                    trigger_error($region->errorMsg, E_USER_ERROR);
 		}
 		
 		$xml->loadXML($xmlString);
@@ -1651,9 +1751,9 @@
 		$nodeList 	= $xpath->query("//region[@id='$regionid']/media");
 		
 		$return = "<input type='hidden' id='maxSeq' value='{$nodeList->length}' />";
-		$return .= "<div class='seqInfo' style='position:absolute; right:15px; top:1px; color:#FFF; background-color:#000; z-index:50; padding: 5px;'>
-						<span>$seqGiven / {$nodeList->length}</span>
-					</div>";
+		$return .= "<div class='seqInfo' style='position:absolute; right:15px; top:31px; color:#FFF; background-color:#000; z-index:50; padding: 5px;'>
+                                <span style='font-family: Verdana;'>$seqGiven / {$nodeList->length}</span>
+                            </div>";
 		
 		if ($nodeList->length == 0)
 		{
@@ -1667,111 +1767,27 @@
 		$node = $nodeList->item($seq);
 			
 		// We have our node.
-		$type 				= (string) $node->getAttribute("type");
+		$type 			= (string) $node->getAttribute("type");
 		$mediaDurationText 	= (string) $node->getAttribute("duration");
-		
-		$return .= "<div class='info regionTransparency' style='display:none; position:absolute; top: 15px; left: 150px; background-color:#FFF; z-index: 50;'>
-						<h5>Media Information</h5>
-						<ul>
-							<li>Type: $type</li>
-							<li>Duration: $mediaDurationText</li>
-						</ul>
-					</div>";
-		
-		if ($type == "text")
-		{
-			$direction = (string) $node->getAttribute("direction");
-			
-			$textNode = $node->getElementsByTagName("text");
-			$textNode = $textNode->item(0);
-			
-			$textId 	= $regionid."_text";
-			$innerId 	= $regionid."_innerText";
-			$timerId	= $regionid."_timer";
-			$widthPx	= $width."px";
-			$heightPx	= $height."px";
-			
-			$textWrap = "";
-			if ($direction == "left" || $direction == "right") $textWrap = "white-space:nowrap;";
-			
-			//Show the contents of text accordingly
-			$return .= <<<END
-			<div id="$textId" style="position:relative;overflow:hidden;width:$widthPx; height:$heightPx;">
-				<div id="$innerId" style="position:absolute; left: 0px; top: 0px; $textWrap">
-					<div class="article">
-						$textNode->textContent
-					</div>
-				</div>
-			</div>
-			<script type="text/javascript">
-				var tr = new TextRender("$textId", "$innerId", "$direction");
-				
-				clearInterval(timer);
-				
-				var timer = 0;
-				timer = setInterval("tr.TimerTick()", 30);
-			</script>
-END;
-		}
-		elseif ($type == "ticker")
-		{
-			$direction = (string) $node->getAttribute("direction");
-			
-			//Show the contents of template accordingly
-			$templateNode = $node->getElementsByTagName("template");
-			$templateNode = $templateNode->item(0);
-			
-			$textId 	= $regionid."_text";
-			$innerId 	= $regionid."_innerText";
-			$timerId	= $regionid."_timer";
-			$widthPx	= $width."px";
-			$heightPx	= $height."px";
-			
-			$textWrap = "";
-			if ($direction == "left" || $direction == "right") $textWrap = "white-space:nowrap;";
-			
-			//Show the contents of text accordingly
-			$return .= <<<END
-			<div id="$textId" style="position:relative;overflow:hidden;width:$widthPx; height:$heightPx;">
-				<div id="$innerId" style="position:absolute; left: 0px; top: 0px; $textWrap">
-					<div class="article">
-						$templateNode->textContent
-					</div>
-				</div>
-			</div>
-			<script type="text/javascript">
-				var tr = new TextRender("$textId", "$innerId", "$direction");
-				
-				clearInterval(timer);
-				
-				var timer = 0;
-				timer = setInterval("tr.TimerTick()", 30);
-			</script>
-END;
-		}
-		elseif ($type == "image")
-		{
-			// Call the ratio width / height
-			$ratioWidth = $width;
-			$ratioHeight = $height;
-						
-			// We need to get the URI from <options>
-			$optionsNode = $node->getElementsByTagName("uri");
-			$uri		 = $optionsNode->item(0)->textContent;
-
-			Debug::LogEntry($db, 'audit', 'The Uri is:' . $uri);
-			
-			// Show the image - scaled to the aspect ratio of this region (get from GET)
-			$return .= "<div style='text-align:center;'><img alt='$type thumbnail' src='index.php?p=module&q=GetImage&file=$uri&width=$ratioWidth&height=$ratioHeight&dynamic' /></div>";
-		}
-		else
-		{
-			// Show a thumbnail (centered) - will need the width/height of the region from get again
-			$centerHeight = $height / 2 - 40;
-			$centerHeight = $centerHeight . "px";
-			
-			$return .= "<div style='text-align:center;'><img alt='$type thumbnail' src='img/forms/$type.png' /></div>";
-		}
+                $mediaid                = (string) $node->getAttribute("id");
+		
+		$return .= "
+                    <div class='previewInfo' style='position:absolute; right:15px; top:61px; color:#FFF; background-color:#000; z-index:50; padding: 5px; font-family: Verdana;'>
+                        <span style='font-family: Verdana;'>Type: $type <br />
+                        Duration: $mediaDurationText (s)</span>
+                    </div>";
+		
+		// Create a module to deal with this
+                if (!file_exists('modules/' . $type . '.module.php'))
+                {
+                    $return .= 'Unknow module type';
+                }
+
+                require_once("modules/$type.module.php");
+
+                $moduleObject = new $type($db, $user, $mediaid, $layoutid, $regionid);
+
+                $return .= $moduleObject->Preview($width, $height);
 		
 		$response->html = $return;
 		$response->Respond();

=== modified file 'server/lib/pages/module.class.php'
--- server/lib/pages/module.class.php	2009-11-29 19:36:42 +0000
+++ server/lib/pages/module.class.php	2010-02-02 19:48:16 +0000
@@ -113,48 +113,59 @@
 	 */
 	function GetImage()
 	{
-		$db =& $this->db;
-		
-		$file 		= Kit::GetParam('file', _REQUEST, _STRING);
-		$dynamic	= isset($_REQUEST['dynamic']);
-		
-		//File upload directory.. get this from the settings object
-		$library 	= Config::GetSetting($db, "LIBRARY_LOCATION");
-		
-		$fileName 	= $library . $file;
-		$uid 		= $fileName;
-		
-		// Get the info for this new temporary file
-		$info 		= getimagesize($uid);
-		
-		if ($dynamic && $info[2])
-		{
-			$width 	= Kit::GetParam('width', _GET, _INT);
-			$height = Kit::GetParam('height', _GET, _INT);
-			
-			// dynamically create an image of the correct size - used for previews
-			ResizeImage($uid, "", $width, $height, true, 'browser');
-			
-			exit;
-		}
-
-		if (!$image = file_get_contents($uid))
-		{
-			//not sure
-			Debug::LogEntry($db, "audit", "Cant find: $uid", "module", "GetImage");
-			
-			$uid 	= "img/forms/filenotfound.png";
-			$image 	= file_get_contents($uid);
-		}
-		
-		$size = getimagesize($uid);
-		
-		//Output the image header
-		header("Content-type: {$size['mime']}");
-		
-		echo $image;
-		
-		exit;
+            $db         =& $this->db;
+
+            $mediaID 	= Kit::GetParam('id', _GET, _INT, 0);
+            $proportional = Kit::GetParam('proportional', _GET, _BOOL, true);
+            $dynamic	= isset($_REQUEST['dynamic']);
+            
+            if ($mediaID == 0)
+                die ('No media ID provided');
+
+            // Get the file URI
+            $SQL = sprintf("SELECT StoredAs FROM media WHERE MediaID = %d", $mediaID);
+
+            if (!$file = $db->GetSingleValue($SQL, 'StoredAs', _STRING))
+                die ('No media found for that media ID');
+
+            //File upload directory.. get this from the settings object
+            $library 	= Config::GetSetting($db, "LIBRARY_LOCATION");
+            $fileName 	= $library . $file;
+
+            // Get the info for this new temporary file
+            if (!$info = getimagesize($fileName))
+            {
+                echo $fileName . ' is not an image';
+                exit;
+            }
+
+            if ($dynamic && $info[2])
+            {
+                $width  = Kit::GetParam('width', _GET, _INT);
+                $height = Kit::GetParam('height', _GET, _INT);
+
+                // dynamically create an image of the correct size - used for previews
+                ResizeImage($fileName, '', $width, $height, $proportional, 'browser');
+
+                exit;
+            }
+
+            if (!$image = file_get_contents($fileName))
+            {
+                //not sure
+                Debug::LogEntry($db, 'audit', "Cant find: $uid", 'module', 'GetImage');
+
+                $fileName = 'img/forms/filenotfound.png';
+                $image 	= file_get_contents($fileName);
+            }
+
+            $size = getimagesize($fileName);
+
+            //Output the image header
+            header("Content-type: {$size['mime']}");
+
+            echo $image;
+            exit;
 	}
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/pages/region.class.php'
--- server/lib/pages/region.class.php	2009-12-31 11:48:37 +0000
+++ server/lib/pages/region.class.php	2010-02-02 19:48:16 +0000
@@ -326,9 +326,11 @@
 	 * @param $mediaid Object
 	 * @param $sequence Object
 	 */
-	public function ReorderMedia($layoutid, $regionid, $mediaid, $sequence) 
+	public function ReorderMedia($layoutid, $regionid, $mediaid, $sequence, $lkid = '')
 	{
 		$db =& $this->db;
+
+                Debug::LogEntry($db, 'audit', 'LkID = ' . $lkid, 'region', 'ReorderMedia');
 		
 		//Load the XML for this layout
 		$xml = new DOMDocument("1.0");
@@ -336,7 +338,12 @@
 		
 		//Get the Media Node in question in a DOMNode using Xpath
 		$xpath = new DOMXPath($xml);
-		$mediaNodeList = $xpath->query("//region[@id='$regionid']/media[@id='$mediaid']");
+                
+                if ($lkid == '')
+                    $mediaNodeList = $xpath->query("//region[@id='$regionid']/media[@id='$mediaid']");
+                else
+                    $mediaNodeList = $xpath->query("//region[@id='$regionid']/media[@lkid='$lkid']");
+
 		$mediaNode = $mediaNodeList->item(0);
 		
 		//Remove this node from its parent

=== added file 'server/lib/pages/resolution.class.php'
--- server/lib/pages/resolution.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/pages/resolution.class.php	2010-02-02 19:48:16 +0000
@@ -0,0 +1,326 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class resolutionDAO
+{
+    private $db;
+    private $user;
+
+    function __construct(database $db, user $user)
+    {
+        $this->db =& $db;
+        $this->user =& $user;
+
+        include_once('lib/data/resolution.data.class.php');
+    }
+
+    function displayPage()
+    {
+        $db =& $this->db;
+
+        require("template/pages/resolution_view.php");
+    }
+
+    function ResolutionFilter()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $filterForm = <<<END
+            <div class="FilterDiv" id="ResolutionFilter">
+                <form onsubmit="return false">
+                    <input type="hidden" name="p" value="resolution">
+                    <input type="hidden" name="q" value="ResolutionGrid">
+                </form>
+            </div>
+END;
+
+            $id = uniqid();
+
+            $xiboGrid = <<<HTML
+            <div class="XiboGrid" id="$id">
+                <div class="XiboFilter">
+                    $filterForm
+                </div>
+                <div class="XiboData">
+
+                </div>
+            </div>
+HTML;
+            echo $xiboGrid;
+    }
+
+    function ResolutionGrid()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $SQL = "SELECT * FROM resolution ORDER BY resolution";
+
+        if (!$results = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error('Unable to Query for resolutions.');
+        }
+
+        $output = <<<END
+            <div class="info_table">
+                <table style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Resolution</th>
+                            <th>Designer Width</th>
+                            <th>Designer Height</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+END;
+
+        while($row = $db->get_assoc_row($results))
+        {
+            $resolutionID = Kit::ValidateParam($row['resolutionID'], _INT);
+            $resolution = Kit::ValidateParam($row['resolution'], _STRING);
+            $width      = Kit::ValidateParam($row['width'], _INT);
+            $height     = Kit::ValidateParam($row['height'], _INT);
+
+            $output .= '<tr>';
+            $output .= '<td>' . $resolution . '</td>';
+            $output .= '<td>' . $width . '</td>';
+            $output .= '<td>' . $height . '</td>';
+            $output .= '<td>';
+            $output .= '  <button class="XiboFormButton" href="index.php?p=resolution&q=EditForm&resolutionid=' . $resolutionID . '"><span>Edit</span></button>';
+            $output .= '  <button class="XiboFormButton" href="index.php?p=resolution&q=DeleteForm&resolutionid=' . $resolutionID . '"><span>Delete</span></button>';
+            $output .= '</td>';
+            $output .= '</tr>';
+        }
+
+        $output .= '</tbody></table></div>';
+
+        $response->SetGridResponse($output);
+        $response->Respond();
+    }
+
+    function AddForm()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $form = <<<END
+            <form class="XiboForm" method="post" action="index.php?p=resolution&q=Add">
+                <table>
+                    <tr>
+                        <td><label for="resolution" title="A name for this resolution">Resolution<span class="required">*</span></label></td>
+                        <td><input name="resolution" type="text" id="resolution" tabindex="1" /></td>
+                    </tr>
+                    <tr>
+                        <td><label for="width" title="Width">Width<span class="required">*</span></label></td>
+                        <td><input name="width" type="text" id="width" tabindex="2" /></td>
+                    </tr>
+                    <tr>
+                        <td><label for="height" title="Height">Height<span class="required">*</span></label></td>
+                        <td><input name="height" type="text" id="height" tabindex="3" /></td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <input type="submit" value="Save" tabindex="4" />
+                            <input id="btnCancel" type="button" title="No / Cancel" onclick="$('#div_dialog').dialog('close');return false; " value="Cancel" />
+                        </td>
+                    </tr>
+                </table>
+            </form>
+END;
+
+        $response->SetFormRequestResponse($form, 'Add new resolution', '350px', '250px');
+        $response->Respond();
+    }
+
+    function EditForm()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $resolutionID   = Kit::GetParam('resolutionid', _GET, _INT);
+
+        $SQL = sprintf("SELECT resolution, width, height FROM resolution WHERE resolutionID = %d", $resolutionID);
+
+        if (!$result = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            trigger_error('Unable to edit this resolution', E_USER_ERROR);
+        }
+
+        if ($db->num_rows($result) == 0)
+            trigger_error('Incorrect resolution id', E_USER_ERROR);
+
+        $row        = $db->get_assoc_row($result);
+
+        $resolution = Kit::ValidateParam($row['resolution'], _STRING);
+        $width      = Kit::ValidateParam($row['width'], _INT);
+        $height     = Kit::ValidateParam($row['height'], _INT);
+
+        $form = <<<END
+            <form class="XiboForm" method="post" action="index.php?p=resolution&q=Edit">
+                <input type="hidden" name="resolutionid" value="$resolutionID" />
+                <table>
+                    <tr>
+                        <td><label for="resolution" title="A name for this resolution">Resolution<span class="required">*</span></label></td>
+                        <td><input name="resolution" type="text" id="resolution" value="$resolution" tabindex="1" /></td>
+                    </tr>
+                    <tr>
+                        <td><label for="width" title="Width">Width<span class="required">*</span></label></td>
+                        <td><input name="width" type="text" id="width" tabindex="2" value="$width" /></td>
+                    </tr>
+                    <tr>
+                        <td><label for="height" title="Height">Height<span class="required">*</span></label></td>
+                        <td><input name="height" type="text" id="height" tabindex="3" value="$height" /></td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <input type="submit" value="Save" tabindex="4" />
+                            <input id="btnCancel" type="button" title="No / Cancel" onclick="$('#div_dialog').dialog('close');return false; " value="Cancel" />
+                        </td>
+                    </tr>
+                </table>
+            </form>
+END;
+
+        $response->SetFormRequestResponse($form, 'Edit Resolution', '350px', '250px');
+        $response->Respond();
+    }
+
+    function DeleteForm()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $resolutionID   = Kit::GetParam('resolutionid', _GET, _INT);
+
+        // Output the delete form
+        $form = <<<END
+        <form class="XiboForm" method="post" action="index.php?p=resolution&q=Delete">
+            <input type="hidden" name="resolutionid" value="$resolutionid">
+            <p>Are you sure you want to delete this resolution?</p>
+            <input type="submit" value="Yes" tabindex="1">
+            <input type="submit" value="No" onclick="$('#div_dialog').dialog('close');return false; ">
+        </form>
+END;
+    }
+
+    function Add()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $resolution = Kit::GetParam('resolution', _POST, _STRING);
+        $width_old  = Kit::GetParam('width', _POST, _INT);
+        $height_old = Kit::GetParam('height', _POST, _INT);
+
+        if ($resolution == '' || $width_old == '' || $height_old == '')
+        {
+            trigger_error('All fields must be filled in', E_USER_ERROR);
+        }
+
+        // Alter the width / height to fit with 800 px
+        $width          = 800;
+        $height         = 800;
+        $factor         = min ( $width / $width_old, $height / $height_old);
+
+        $final_width    = round ($width_old * $factor);
+        $final_height   = round ($height_old * $factor);
+
+        // Add the resolution
+        $resObject = new Resolution($db);
+
+        if (!$resObject->Add($resolution, $final_width, $final_height))
+        {
+            trigger_error($resObject->GetErrorMessage(), E_USER_ERROR);
+        }
+
+        $response->SetFormSubmitResponse('New resolution added');
+        $response->Respond();
+    }
+
+    function Edit()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $resolutionID = Kit::GetParam('resolutionid', _POST, _INT);
+        $resolution = Kit::GetParam('resolution', _POST, _STRING);
+        $width_old  = Kit::GetParam('width', _POST, _INT);
+        $height_old = Kit::GetParam('height', _POST, _INT);
+
+        if ($resolutionID == '' || $resolution == '' || $height_old == '' || $height_old == '')
+        {
+            trigger_error('All fields must be filled in', E_USER_ERROR);
+        }
+
+        // Alter the width / height to fit with 800 px
+        $width          = 800;
+        $height         = 800;
+        $factor         = min ( $width / $width_old, $height / $height_old);
+
+        $final_width    = round ($width_old * $factor);
+        $final_height   = round ($height_old * $factor);
+
+        // Edit the resolution
+        $resObject = new Resolution($db);
+
+        if (!$resObject->Edit($resolutionID, $resolution, $final_width, $final_height))
+        {
+            trigger_error($resObject->GetErrorMessage(), E_USER_ERROR);
+        }
+
+        $response->SetFormSubmitResponse('Resolution edited');
+        $response->Respond();
+    }
+
+    function Delete()
+    {
+        $db 	=& $this->db;
+        $user 	=& $this->user;
+        $response = new ResponseManager();
+
+        $resolutionID = Kit::GetParam('resolutionid', _POST, _INT);
+
+        // Remove the resolution
+        $resObject = new Resolution($db);
+
+        if (!$resObject->Delete($resolutionID))
+        {
+            trigger_error($resObject->GetErrorMessage(), E_USER_ERROR);
+        }
+
+        $response->SetFormSubmitResponse('Resolution deleted');
+        $response->Respond();
+    }
+}
\ No newline at end of file

=== modified file 'server/lib/xmds.inc.php'
--- server/lib/xmds.inc.php	2009-12-31 11:48:37 +0000
+++ server/lib/xmds.inc.php	2010-02-02 19:48:16 +0000
@@ -20,7 +20,7 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
  
-error_reporting(E_ALL);
+error_reporting(0);
 ini_set('display_errors', 0); //we never want to display errors on the screen
 
 // Required Library Files
@@ -29,7 +29,8 @@
 require_once("lib/app/kit.class.php");
 require_once("lib/data/data.class.php");
 require_once("config/db_config.php");
-require_once("config/config.class.php");
include_once('lib/data/stat.data.class.php');
+require_once("config/config.class.php");
+include_once('lib/data/stat.data.class.php');
 
 // Sort out magic quotes
 if (get_magic_quotes_gpc()) 

=== modified file 'server/modules/embedded.module.php'
--- server/modules/embedded.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/embedded.module.php	2010-02-02 19:48:16 +0000
@@ -51,7 +51,7 @@
 			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
 			<table>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text"></td>	
 				</tr>
 				<tr>
@@ -132,7 +132,7 @@
 			<input type="hidden" id="iRegionId" name="regionid" value="$regionid">
 			<table>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
 				</tr>
 				<tr>

=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/flash.module.php	2010-02-02 19:48:16 +0000
@@ -167,7 +167,7 @@
 		    		<td><input id="name" name="name" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this flash should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this flash should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -314,7 +314,7 @@
 		    		<td><input id="name" name="name" type="text" value="$name"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this flash should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this flash should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>

=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/image.module.php	2010-02-02 19:48:16 +0000
@@ -102,6 +102,8 @@
 		$sessionId 		= session_id();
 		$securityToken 	= CreateFormToken();
 
+                $backgroundImage        = Kit::GetParam('backgroundImage', _GET, _BOOL, false);
+
 		$session->setSecurityToken($securityToken);
 
 		//Get the default value for the shared list
@@ -128,6 +130,14 @@
 			<input class="XiboFormButton" type="button" href="index.php?p=content&q=LibraryAssignForm&layoutid=$layoutid&regionid=$regionid" title="Library" value="Library" />
 END;
 		}
+                elseif ($backgroundImage)
+                {
+                    // Show the save button, and make cancel go back to the background form
+                    $save_button = <<<END
+                    <input id="btnSave" type="submit" value="Save" disabled />
+                    <input class="XiboFormButton" id="btnCancel" type="button" title="Close" href="index.php?p=layout&q=BackgroundForm&modify=true&layoutid=$layoutid" value="Cancel" />
+END;
+                }
 		else
 		{
 			$save_button = <<<END
@@ -159,6 +169,7 @@
 		<form class="XiboForm" method="post" action="index.php?p=module&mod=$this->type&q=Exec&method=AddMedia">
 			<input type="hidden" name="layoutid" value="$layoutid">
 			<input type="hidden" name="regionid" value="$regionid">
+                        <input type="hidden" name="backgroundImage" value="$backgroundImage" />
 			<input type="hidden" id="txtFileName" name="txtFileName" readonly="true" />
 			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
 			<table width="100%">
@@ -167,7 +178,7 @@
 		    		<td><input id="name" name="name" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -314,7 +325,7 @@
 		    		<td><input id="name" name="name" type="text" value="$name"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -495,6 +506,7 @@
 		$regionid 	= $this->regionid;
 		$mediaid	= $this->mediaid;
 		$userid		= Kit::GetParam('userid', _SESSION, _INT);
+                $backgroundImage = Kit::GetParam('backgroundImage', _POST, _BOOL, false);
 
 		// File data
 		$tmpName	= Kit::GetParam('hidFileID', _POST, _STRING);
@@ -607,9 +619,6 @@
 			return true;
 		}
 
-		// Create the thumb nail
-		ResizeImage($databaseDir.$storedAs, $databaseDir."tn_".$storedAs, 80, 80);
-
 		// Required Attributes
 		$this->mediaid	= $mediaid;
 		$this->duration = $duration;
@@ -632,6 +641,12 @@
 		// We want to load a new form
 		$this->response->loadForm	= true;
 
+                // If we just added a background we should load the background form
+                if ($backgroundImage)
+                {
+                    $this->response->loadFormUri = "index.php?p=layout&q=BackgroundForm&modify=true&layoutid=$layoutid&backgroundOveride=$storedAs";
+                }
+
 		return $this->response;
 	}
 
@@ -940,6 +955,11 @@
 
 		return true;
 	}
+
+        public function Preview($width, $height)
+        {
+            // Show the image - scaled to the aspect ratio of this region (get from GET)
+            return sprintf('<div style="text-align:center;"><img src="index.php?p=module&q=GetImage&id=%d&width=%d&height=%d&dynamic" /></div>', $this->mediaid, $width, $height);
+        }
 }
-
 ?>
\ No newline at end of file

=== modified file 'server/modules/module_db_mysql.php'
--- server/modules/module_db_mysql.php	2009-12-31 11:48:37 +0000
+++ server/modules/module_db_mysql.php	2010-02-02 19:48:16 +0000
@@ -57,6 +57,11 @@
 	{
 		//if (!$nolog) Debug::LogEntry($this, 'audit', 'Running SQL: [' . $SQL . ']', '', 'query');
 		// creates a loop!
+        if ($SQL == '')
+        {
+            $this->error_text = 'No SQL provided';
+            return false;
+        }
 		  			
         if(!$result = mysql_query($SQL)) 
 		{
@@ -112,6 +117,54 @@
     	return mysql_real_escape_string($string);
     }
 
+    /**
+     * Gets a Single row using the provided SQL
+     * Returns false if SQL error or no records found
+     * @param <string> $SQL
+     * @param <bool> $assoc
+     */
+    public function GetSingleRow($SQL, $assoc = true)
+    {
+        if (!$result = $this->query($SQL))
+            return false;
+
+        if ($this->num_rows($result) == 0)
+        {
+            $this->error_text = 'No results returned';
+            return false;
+        }
+
+        if ($assoc)
+        {
+            return $this->get_assoc_row($result);
+        }
+        else
+        {
+            return $this->get_row($result);
+        }
+    }
+
+    /**
+     * Gets a single value from the provided SQL
+     * @param <string> $SQL
+     * @param <string> $columnName
+     * @param <int> $dataType
+     * @return <type>
+     */
+    public function GetSingleValue($SQL, $columnName, $dataType)
+    {
+        if (!$row = $this->GetSingleRow($SQL))
+            return false;
+
+        if (!isset($row[$columnName]))
+        {
+            $this->error_text = 'No such column';
+            return false;
+        }
+
+        return Kit::ValidateParam($row[$columnName], $dataType);
+    }
+
     //returns the error text to display
     function error() 
 	{

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2009-12-31 11:48:37 +0000
+++ server/modules/module_user_general.php	2010-02-02 19:48:16 +0000
@@ -105,13 +105,13 @@
 		$results = $db->get_row($result);
 		
 		// there is a result so we store the userID in the session variable
-		$_SESSION['userid']		= Kit::ValidateParam($results[0], _INT);
+		$_SESSION['userid']	= Kit::ValidateParam($results[0], _INT);
 		$_SESSION['username']	= Kit::ValidateParam($results[1], _USERNAME);
 		$_SESSION['usertype']	= Kit::ValidateParam($results[3], _INT);
 		$_SESSION['groupid']	= Kit::ValidateParam($results[4], _INT);
 		
-		$this->usertypeid		= $_SESSION['usertype'];
-		$this->userid			= $_SESSION['userid'];
+		$this->usertypeid	= $_SESSION['usertype'];
+		$this->userid           = $_SESSION['userid'];
 
 		// update the db
 		// write out to the db that the logged in user has accessed the page

=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/powerpoint.module.php	2010-02-02 19:48:16 +0000
@@ -145,7 +145,7 @@
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
 					<tr>
-						<td><label for="file">Powerpoint File<span class="required">*</span></label></td>
+						<td><label for="file">PowerPoint File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
 						</td>
@@ -163,11 +163,11 @@
 			<input type="hidden" name="hidFileID" id="hidFileID" value="" />
 			<table width="100%">
 				<tr>
-		    		<td><label for="name" title="The name of the powerpoint. Leave this blank to use the file name">Name</label></td>
+		    		<td><label for="name" title="The name of the PowerPoint. Leave this blank to use the file name">Name</label></td>
 		    		<td><input id="name" name="name" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this powerpoint should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this PowerPoint should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -187,7 +187,7 @@
 FORM;
 
 		$this->response->html 			= $form;
-		$this->response->dialogTitle 	= 'Add New Powerpoint';
+		$this->response->dialogTitle 	= 'Add New PowerPoint';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
@@ -288,7 +288,7 @@
 				<input type="hidden" name="MAX_FILE_SIZE" value="$this->maxFileSizeBytes" />
 				<table>
 					<tr>
-						<td><label for="file">New Powerpoint File<span class="required">*</span></label></td>
+						<td><label for="file">New PowerPoint File<span class="required">*</span></label></td>
 						<td colspan="3">
 							<input type="file" name="media_file" onchange="fileFormSubmit();this.form.submit();" />
 						</td>
@@ -310,11 +310,11 @@
 			<input type="hidden" id="SecurityToken" value="$securityToken" />
 			<table>
 				<tr>
-		    		<td><label for="name" title="The name of the Powerpoint. Leave this blank to use the file name">Name</label></td>
+		    		<td><label for="name" title="The name of the PowerPoint. Leave this blank to use the file name">Name</label></td>
 		    		<td><input id="name" name="name" type="text" value="$name"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this powerpoint should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this PowerPoint should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -338,7 +338,7 @@
 FORM;
 
 		$this->response->html 			= $form;
-		$this->response->dialogTitle 	= 'Edit Powerpoint';
+		$this->response->dialogTitle 	= 'Edit PowerPoint';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
@@ -476,7 +476,7 @@
 END;
 
 		$this->response->html 			= $form;
-		$this->response->dialogTitle 	= 'Delete Powerpoint';
+		$this->response->dialogTitle 	= 'Delete PowerPoint';
 		$this->response->dialogSize 	= true;
 		$this->response->dialogWidth 	= '450px';
 		$this->response->dialogHeight 	= '280px';
@@ -501,7 +501,7 @@
 
 		if ($tmpName == '')
 		{
-			$this->response->SetError('Cannot save Powerpoint details. <br/> You must have picked a file.');
+			$this->response->SetError('Cannot save PowerPoint details. <br/> You must have picked a file.');
 			$this->response->keepOpen = true;
 			return $this->response;
 		}
@@ -829,7 +829,7 @@
 		else
 		{
 			$this->response->loadFormUri = "index.php?p=content&q=displayForms&sp=add";
-			$this->response->message = 'Edited the Powerpoint.';
+			$this->response->message = 'Edited the PowerPoint.';
 
 		}
 

=== modified file 'server/modules/text.module.php'
--- server/modules/text.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/text.module.php	2010-02-02 19:48:16 +0000
@@ -58,7 +58,7 @@
 				<tr>
 		    		<td><label for="direction" title="The Direction this text should move, if any">Direction<span class="required">*</span></label></td>
 		    		<td>$direction_list</td>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text"></td>		
 				</tr>
 				<tr>
@@ -129,7 +129,7 @@
 				<tr>
 		    		<td><label for="direction" title="The Direction this text should move, if any">Direction<span class="required">*</span></label></td>
 		    		<td>$direction_list</td>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
 				</tr>
 				<tr>
@@ -276,6 +276,42 @@
 		
 		return $this->response;		
 	}
+
+        public function Preview($width, $height)
+        {
+            $regionid   = $this->regionid;
+            $direction  = $this->GetOption('direction');
+
+            // Get the text out of RAW
+            $rawXml = new DOMDocument();
+            $rawXml->loadXML($this->GetRaw());
+
+            // Get the Text Node out of this
+            $textNodes 	= $rawXml->getElementsByTagName('text');
+            $textNode 	= $textNodes->item(0);
+            $text 	= $textNode->nodeValue;
+
+            $textId 	= $regionid.'_text';
+            $innerId 	= $regionid.'_innerText';
+            $timerId	= $regionid.'_timer';
+            $widthPx	= $width.'px';
+            $heightPx	= $height.'px';
+
+            $textWrap = '';
+            if ($direction == "left" || $direction == "right") $textWrap = "white-space:nowrap;";
+
+            //Show the contents of text accordingly
+            $return = <<<END
+            <div id="$textId" style="position:relative; overflow:hidden ;width:$widthPx; height:$heightPx; font-size: 1em;">
+                <div id="$innerId" style="position:absolute; left: 0px; top: 0px; $textWrap">
+                    <div class="article">
+                            $text
+                    </div>
+                </div>
+            </div>
+END;
+            return $return;
+        }
 }
 
 ?>
\ No newline at end of file

=== modified file 'server/modules/ticker.module.php'
--- server/modules/ticker.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/ticker.module.php	2010-02-02 19:48:16 +0000
@@ -64,7 +64,7 @@
 				<tr>
 		    		<td><label for="direction" title="The Direction this text should move, if any">Direction<span class="required">*</span></label></td>
 		    		<td>$direction_list</td>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text"></td>		
 				</tr>
 				<tr>
@@ -145,7 +145,7 @@
 				<tr>
 		    		<td><label for="direction" title="The Direction this text should move, if any">Direction<span class="required">*</span></label></td>
 		    		<td>$direction_list</td>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
 				</tr>
 				<tr>
@@ -321,6 +321,42 @@
 		
 		return $this->response;	
 	}
+
+        public function Preview($width, $height)
+        {
+            $regionid   = $this->regionid;
+            $direction  = $this->GetOption('direction');
+
+            // Get the text out of RAW
+            $rawXml = new DOMDocument();
+            $rawXml->loadXML($this->GetRaw());
+
+            // Get the Text Node out of this
+            $textNodes 	= $rawXml->getElementsByTagName('template');
+            $textNode 	= $textNodes->item(0);
+            $text 	= $textNode->nodeValue;
+
+            $textId 	= $regionid.'_text';
+            $innerId 	= $regionid.'_innerText';
+            $timerId	= $regionid.'_timer';
+            $widthPx	= $width.'px';
+            $heightPx	= $height.'px';
+
+            $textWrap = '';
+            if ($direction == "left" || $direction == "right") $textWrap = "white-space:nowrap;";
+
+            //Show the contents of text accordingly
+            $return = <<<END
+            <div id="$textId" style="position:relative; overflow:hidden ;width:$widthPx; height:$heightPx; font-size: 1em;">
+                <div id="$innerId" style="position:absolute; left: 0px; top: 0px; $textWrap">
+                    <div class="article">
+                            $text
+                    </div>
+                </div>
+            </div>
+END;
+            return $return;
+        }
 }
 
 ?>
\ No newline at end of file

=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/video.module.php	2010-02-02 19:48:16 +0000
@@ -167,7 +167,7 @@
 		    		<td><input id="name" name="name" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this video should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this video should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>
@@ -314,7 +314,7 @@
 		    		<td><input id="name" name="name" type="text" value="$name"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this image should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text" value="$this->duration"></td>
 					<td><label for="permissionid">Sharing<span class="required">*</span></label></td>
 					<td>

=== modified file 'server/modules/webpage.module.php'
--- server/modules/webpage.module.php	2009-12-31 11:48:37 +0000
+++ server/modules/webpage.module.php	2010-02-02 19:48:16 +0000
@@ -59,7 +59,7 @@
 		    		<td><input id="uri" name="uri" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" type="text"></td>		
 				</tr>
 				<tr>
@@ -112,7 +112,7 @@
 		    		<td><input id="uri" name="uri" value="$uri" type="text"></td>
 				</tr>
 				<tr>
-		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration<span class="required">*</span></label></td>
+		    		<td><label for="duration" title="The duration in seconds this webpage should be displayed (may be overridden on each layout)">Duration (s)<span class="required">*</span></label></td>
 		    		<td><input id="duration" name="duration" value="$this->duration" type="text"></td>		
 				</tr>
 				<tr>

=== added file 'server/template/css/ie8.css'
--- server/template/css/ie8.css	1970-01-01 00:00:00 +0000
+++ server/template/css/ie8.css	2010-02-02 19:48:16 +0000
@@ -0,0 +1,23 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#navigation ul li {
+    padding-bottom: 4px; /* Added for IE8 menu */
+}

=== modified file 'server/template/css/xibo.css'
--- server/template/css/xibo.css	2009-12-31 11:48:37 +0000
+++ server/template/css/xibo.css	2010-02-02 19:48:16 +0000
@@ -62,3 +62,40 @@
 	opacity: .75; 
 	filter: alpha(opacity=75);
 }
+
+#aspectRatioOption {
+    padding-bottom: 2px;
+}
+
+.regionInfo {
+    color:#FFF;
+    background-color:#000;
+    z-index:50;
+    padding: 5px;
+    position:absolute;
+    right:15px;
+    top:1px;
+    font-family: Verdana;
+}
+
+.seqInfo, .previewInfo {
+    font-family: Verdana;
+}
+
+.seqInfo span, .previewInfo span {
+    font-family: Verdana;
+}
+
+.preview {
+    position:absolute;
+    top:0px;
+    left:0px;
+    width: 100%;
+    height: 100%;
+}
+
+.preview div, .preview span, .preview object,.preview h1,.preview h2, .preview h3, .preview h4, .preview h5, .preview h6, .preview p, .preview blockquote, .preview pre, .preview a, .preview abbr, .preview acronym, .preview address, .preview big, .preview cite, .preview code, .preview del, .preview dfn, .preview em, .preview img, .preview ins, .preview kbd, .preview q, .preview samp, .preview small, .preview strong, .preview sub, .preview sup, .preview tt, .preview var, .preview dl, .preview dt, .preview dd, .preview ol, .preview ul, .preview li, .preview fieldset, .preview form, .preview label, .preview legend, .preview table, .preview caption, .preview tbody, .preview tfoot,.preview thead, .preview tr, .preview th,.preview td{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;background:transparent;border:none;text-decoration:none}
+.preview b, .preview i, .preview hr, .preview u, .preview center, .preview menu, .preview layer, .preview s, .preview strike, .preview font, .preview xmp{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;font-weight:normal;font-style:normal;background:transparent;border:none;text-decoration:none}
+.preview font{color:#333}
+.preview center{text-align:left}
+.preview p, .preview span {font-family: "Times New Roman"}
\ No newline at end of file

=== modified file 'server/template/header.php'
--- server/template/header.php	2009-12-31 11:48:37 +0000
+++ server/template/header.php	2010-02-02 19:48:16 +0000
@@ -58,6 +58,11 @@
 		
 		<!-- Our own -->
 		<link rel="stylesheet" type="text/css" href="template/css/presentation.css" />
+
+                <!--[if gte IE 8]>
+                <link rel="stylesheet" type="text/css" href="template/css/ie8.css" />
+                <![endif]-->
+
 		<script type="text/javascript" src="lib/js/functions.js"></script>
 		<script type="text/javascript" src="lib/js/core.js"></script>
         <?php

=== added file 'server/template/pages/resolution_view.php'
--- server/template/pages/resolution_view.php	1970-01-01 00:00:00 +0000
+++ server/template/pages/resolution_view.php	2010-02-02 19:48:16 +0000
@@ -0,0 +1,45 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+?>
+<div id="form_container">
+	<div id="form_header">
+		<div id="form_header_left"></div>
+		<div id="form_header_right"></div>
+	</div>
+	
+	<div id="form_body">
+		<div class="SecondNav">
+			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
+			<ul>
+				<li><a title="Add a new Layout" class="XiboFormButton" href="index.php?p=resolution&q=AddForm" ><span>Add Resolution</span></a></li>
+			</ul>
+		</div>
+		<?php $this->ResolutionFilter(); ?>
+	</div>	
+		
+	<div id="form_footer">
+		<div id="form_footer_left">
+		</div>
+		<div id="form_footer_right">
+		</div>
+	</div>
+</div>	
+			
\ No newline at end of file