Merge lp:~alexharrington/xibo/server-150-installer into lp:xibo/1.5

[Dan Garner]

=== modified file 'server/3rdparty/jQuery/css/jquery-ui.css'
--- server/3rdparty/jQuery/css/jquery-ui.css	2012-04-08 10:11:57 +0000
+++ server/3rdparty/jQuery/css/jquery-ui.css	2013-04-11 16:56:27 +0000
@@ -294,7 +294,7 @@
  * http://docs.jquery.com/UI/Resizable#theming
  */
 .ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 999; display: block; }
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
 .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
 .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2013-03-02 13:15:42 +0000
+++ server/config/config.class.php	2013-04-11 16:56:27 +0000
@@ -90,7 +90,7 @@
 	{
 		if (!$results = $db->query("SELECT app_ver, XlfVersion, XmdsVersion, DBVersion FROM version")) 
 		{
-			trigger_error("No Version information - please contact Xibo support", E_USER_WARNING);
+			trigger_error("No Version information - please contact technical support", E_USER_WARNING);
 		}
 		
 		$row 		= $db->get_assoc_row($results);
@@ -138,11 +138,12 @@
 		}
 		else if ($this->CheckPHP() == 2)
 		{
+			$this->envWarning = true;
 			$output .= $imgWarn.$message.'<br />';
 			$output .= <<<END
 			<div class="check_explain">
-			<p>Xibo requires PHP version 5.2.0 or later. It may run on PHP 5.1.0 and we have provided compatibility functions to enable that.</p>
-			<p>However, we recommend upgrading your version of PHP to 5.2.0 or later.</p>
+			<p>Xibo requires PHP version 5.2.4 or later. It may run on PHP 5.1.0 and we have provided compatibility functions to enable that.</p>
+			<p>However, we recommend upgrading your version of PHP to 5.2.4 or later.</p>
 			</div>
 END;
 		}
@@ -151,7 +152,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"> <p>' . __("Xibo requires PHP version 5.2.4 or later.") . '</p></div>';
+			$output .= '<div class="check_explain"> <p>' . __("PHP version 5.2.4 or later required.") . '</p></div>';
 		}
 		
 		// Check for file system permissions
@@ -166,7 +167,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __("Xibo needs to be able to write to the following:");
+			$output .= '<div class="check_explain"><p>' . __("Write access required for the following:");
 			$output .= <<<END
       			<ul>
         			<li> settings.php
@@ -178,7 +179,7 @@
 		}
 		
 		// Check for MySQL
-		$message = __('Xibo requires a MySQL database. Ensure PHP MySQL client extension is installed');
+		$message = __('MySQL database required. Ensure PHP MySQL client extension is installed');
 
 		if ($this->CheckMySQL()) 
 		{
@@ -208,7 +209,7 @@
 			$this->envFault = true;
 
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP JSON extension to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP JSON extension required to function.') . '</p></div>';
 		}
 
                 // Check for SOAP
@@ -223,7 +224,7 @@
 			$this->envFault = true;
 
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP SOAP extension to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP SOAP extension required to function.') . '</p></div>';
 		}
 		
 		// Check for GD (graphics)
@@ -238,7 +239,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP GD extension to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP GD extension to function.') . '</p></div>';
 		}
 
 		// Check for PHP Session
@@ -253,7 +254,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP session support to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP session support to function.') . '</p></div>';
 		}
 		
 		// Check for PHP PCRE
@@ -268,7 +269,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs PHP PCRE support to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP PCRE support to function.') . '</p></div>';
 		}
 		
 		// Check for PHP Gettext
@@ -286,7 +287,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs PHP Gettext support to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP Gettext support to function.') . '</p></div>';
 		}
 	
 		// Check for Calendar
@@ -301,7 +302,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP Calendar extension to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP Calendar extension to function.') . '</p></div>';
 		}
 		
 		// Check for DOM
@@ -316,7 +317,7 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM core functionality enabled.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP DOM core functionality enabled.') . '</p></div>';
 		}
 		
 		// Check for DOM XML
@@ -331,11 +332,26 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
-			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM XML extension to function.') . '</p></div>';
+			$output .= '<div class="check_explain"><p>' . __('PHP DOM XML extension to function.') . '</p></div>';
+		}
+		
+		// Check for Mcrypt
+		$message = __('Mcrypt Extension');
+
+		if ($this->CheckMcrypt()) 
+		{
+			$output .= $imgGood.$message.'<br />';
+		}
+		else
+		{
+			$this->envFault = true;
+			
+			$output .= $imgBad.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('PHP Mcrypt extension to function.') . '</p></div>';
 		}
 		
 		// Check to see if we are allowed to open remote URLs (homecall will not work otherwise)
-		$message = __("Allow PHP to open external URLs");
+		$message = __('Allow PHP to open external URLs');
 
 		if (ini_get('allow_url_fopen')) 
 		{
@@ -363,6 +379,21 @@
 			
 			$output .= $imgWarn.$message.'<br />';
 		}
+		
+		// Check to see if large file uploads enabled
+		$message = 'Large File Uploads';
+
+		if ($this->CheckPHPUploads()) 
+		{
+			$output .= $imgGood.$message.'<br />';
+		}
+		else
+		{
+			$this->envWarning = true;
+			$output .= $imgWarn.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('You probably want to allow larger files to be uploaded than is currently available with your PHP configuration.') . '<br />';
+			$output .= __('We suggest setting your PHP post_max_size and upload_max_size to at least 128M, and also increasing your max_execution_time to at least 120 seconds.') . '</p></div>';
+		}
 				
 		$output .= '</div>';
 		
@@ -412,7 +443,7 @@
 	 */
 	function CheckPHP() 
 	{
-		if (phpversion() >= '5.2.0') 
+		if (phpversion() >= '5.2.4') 
 		{
 			return 1;
 		}
@@ -489,6 +520,15 @@
 	}
 	
 	/**
+	 * Check PHP has the Mcrypt functionality installed
+	 * @return 
+	 */
+	function CheckMcrypt()
+	{
+		return extension_loaded("mcrypt");
+	}
+	
+	/**
 	 * Check PHP has the DOM functionality installed
 	 * @return 
 	 */
@@ -514,6 +554,54 @@
 	{
 		return extension_loaded("pcre");
 	}
+	
+	/**
+	 * Check PHP is setup for large file uploads
+	 * @return
+	 */
+	function CheckPHPUploads()
+	{
+		# Consider 0 - 128M warning / < 120 seconds
+		# Variables to check:
+		#    post_max_size
+		#    upload_max_filesize
+		#    max_execution_time
+		
+		minSize = $this->return_bytes('128M');
+		
+		if ($this->return_bytes(ini_get('post_max_size') < minSize))
+		{
+			return false;
+	        }
+	        
+	        if ($this->return_bytes(ini_get('upload_max_filesize') < minSize))
+	        {
+	        	return false;
+		}
+		
+		if (ini_get('max_execution_time') < 120)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Helper function to convert strings like 8M or 3G into bytes
+	 * by Stas Trefilov. Assumed Public Domain.
+	 * Taken from the PHP Manual (http://www.php.net/manual/en/function.ini-get.php#96996)
+	 * @return
+	 */
+	function return_bytes($size_str)
+	{
+		switch (substr ($size_str, -1))
+		{
+                	case 'M': case 'm': return (int)$size_str * 1048576;
+                        case 'K': case 'k': return (int)$size_str * 1024;
+                        case 'G': case 'g': return (int)$size_str * 1073741824;
+                        default: return $size_str;
+                }
+        }
 }
-
-?>
+?>
\ No newline at end of file

=== modified file 'server/install.php'
--- server/install.php	2013-02-20 20:00:36 +0000
+++ server/install.php	2013-04-11 16:56:27 +0000
@@ -1,6 +1,6 @@
 <?php
 /*
- * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - http://www.xibo.org.uk
  * Copyright (C) 2009-2013 Alex Harrington
  *
  * This file is part of Xibo.

=== modified file 'server/install/database/60.sql'
--- server/install/database/60.sql	2013-03-02 13:15:42 +0000
+++ server/install/database/60.sql	2013-04-11 16:56:27 +0000
@@ -24,9 +24,9 @@
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
 
 INSERT INTO `transition` (`TransitionID`, `Transition`, `Code`, `HasDuration`, `HasDirection`, `AvailableAsIn`, `AvailableAsOut`) VALUES
-(1, 'Fade In', 'fadeIn', 1, 0, 1, 0),
-(2, 'Fade Out', 'fadeOut', 1, 0, 0, 1),
-(3, 'Fly', 'fly', 1, 1, 1, 1);
+(1, 'Fade In', 'fadeIn', 1, 0, 0, 0),
+(2, 'Fade Out', 'fadeOut', 1, 0, 0, 0),
+(3, 'Fly', 'fly', 1, 1, 0, 0);
 
 INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES (NULL, 'GLOBAL_THEME_NAME', 'default', 'text', 'The Theme to apply to all pages by default', NULL, 'general', '1');
 
@@ -36,8 +36,20 @@
 
 UPDATE `menuitem` SET `Img` = REPLACE(Img, 'img/dashboard/', 'dashboard/') WHERE Img IS NOT NULL;
 
-ALTER TABLE  `resolution` ADD  `intended_width` INT NOT NULL ,
-ADD  `intended_height` INT NOT NULL;
+TRUNCATE TABLE `resolution`;
+
+ALTER TABLE  `resolution` ADD  `intended_width` SMALLINT NOT NULL ,
+ADD  `intended_height` SMALLINT NOT NULL;
+
+INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`) VALUES
+(1, '4:3 Monitor', 800, 600, 1024, 768),
+(2, '3:2 Tv', 720, 480, 1440, 960),
+(3, '16:10 Widescreen Mon', 800, 500, 1680, 1050),
+(4, '16:9 HD Widescreen', 800, 450, 1920, 1080),
+(5, '3:4 Monitor', 600, 800, 768, 1024),
+(6, '2:3 Tv', 480, 720, 960, 1440),
+(7, '10:16 Widescreen', 500, 800, 1050, 1680),
+(8, '9:16 HD Widescreen', 450, 800, 1080, 1920);
 
 INSERT INTO `menuitem` (`MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`)
 SELECT 9, `PageID`, NULL, 'Help Links', NULL, NULL, 6

=== added file 'server/install/database/61.sql'
--- server/install/database/61.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/61.sql	2013-04-11 16:56:27 +0000
@@ -0,0 +1,86 @@
+TRUNCATE TABLE `help`;
+
+INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
+(1, 'Layout', 'General', 'manual/content/layout/overview.php'),
+(2, 'Content', 'General', 'manual/content/content/types.php'),
+(4, 'Schedule', 'General', 'manual/content/schedule/schedule_calendar.php'),
+(5, 'Group', 'General', 'manual/content/users/groups.php'),
+(6, 'Admin', 'General', 'manual/content/admin/settings.php'),
+(7, 'Report', 'General', 'manual/content/admin/advanced.php'),
+(8, 'Dashboard', 'General', 'manual/content/dashboard/dashboard.php'),
+(9, 'User', 'General', 'manual/content/users/users.php'),
+(10, 'Display', 'General', 'manual/content/admin/displays.php'),
+(11, 'DisplayGroup', 'General', 'manual/content/admin/displays.php#Display_Group'),
+(12, 'Layout', 'Add', 'manual/content/layout/addlayout.php'),
+(13, 'Layout', 'Background', 'manual/content/layout/layoutdesigner.php#Background'),
+(14, 'Content', 'Assign', 'manual/content/content/types.php'),
+(15, 'Layout', 'RegionOptions', 'manual/content/layout/addregion.php'),
+(16, 'Content', 'AddtoLibrary', 'manual/content/content/adding.php'),
+(17, 'Display', 'Edit', 'manual/content/admin/displays.php#Display_Edit'),
+(18, 'Display', 'Delete', 'manual/content/admin/displays.php#Display_Delete'),
+(19, 'Displays', 'Groups', 'manual/content/admin/displays.php#Display_Group'),
+(20, 'UserGroup', 'Add', 'manual/content/users/groups.php#Adding_Group'),
+(21, 'User', 'Add', 'manual/content/users/users.php#Adding_User'),
+(22, 'User', 'Delete', 'manual/content/users/users.php#Delete_User'),
+(23, 'Content', 'Config', 'manual/content/admin/settings.php#Content'),
+(24, 'LayoutMedia', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
+(25, 'Region', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
+(26, 'Library', 'Assign', 'manual/content/layout/assigncontent.php#Add_From_Library'),
+(27, 'Media', 'Delete', 'manual/content/content/types.php'),
+(28, 'DisplayGroup', 'Add', 'manual/content/admin/displays.php#Display_Group'),
+(29, 'DisplayGroup', 'Edit', 'manual/content/admin/displays.php#Display_Group'),
+(30, 'DisplayGroup', 'Delete', 'manual/content/admin/displays.php#Display_Group'),
+(31, 'DisplayGroup', 'Members', 'manual/content/admin/displays.php#Group_Members'),
+(32, 'DisplayGroup', 'Permissions', 'manual/content/users/user_permissions.php'),
+(34, 'Schedule', 'ScheduleNow', 'manual/content/schedule/schedule_now.php'),
+(35, 'Layout', 'Delete', 'manual/content/layout/addlayout.php#Delete_Layout'),
+(36, 'Layout', 'Copy', 'manual/content/layout/addlayout.php#Copy_Layout'),
+(37, 'Schedule', 'Edit', 'manual/content/schedule/schedule_calendar.php'),
+(38, 'Schedule', 'Add', 'manual/content/schedule/schedule_calendar.php'),
+(39, 'Layout', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
+(40, 'Display', 'MediaInventory', 'manual/content/admin/displays.php#Media_Inventory'),
+(41, 'User', 'ChangePassword', 'manual/content/dashboard/navbar.php#Navigation_Top'),
+(42, 'Schedule', 'Delete', 'manual/content/schedule/schedule_event.htm'),
+(43, 'Layout', 'Edit', 'manual/content/layout/addlayout.php#Edit_Layout'),
+(44, 'Media', 'Permissions', 'manual/content/users/user_permissions.php'),
+(45, 'Display', 'DefaultLayout', 'manual/content/admin/displays.php'),
+(46, 'UserGroup', 'Edit', 'manual/content/users/groups.php#Edit_Group'),
+(47, 'UserGroup', 'Members', 'manual/content/users/groups.php#Group_Member'),
+(48, 'User', 'PageSecurity', 'manual/content/users/menu_page_security.php#Page_Security'),
+(49, 'User', 'MenuSecurity', 'manual/content/users/menu_page_security.php#Menu_Security'),
+(50, 'UserGroup', 'Delete', 'manual/content/users/groups.php#Delete_Group'),
+(51, 'User', 'Edit', 'manual/content/users/users.php#Edit_User'),
+(52, 'User', 'Applications', 'manual/content/users/menu_page_security.php'),
+(53, 'User', 'SetHomepage', 'manual/content/dashboard/dashboard.php#Media_Dashboard'),
+(54, 'DataSet', 'General', 'manual/content/layout/content_datasets.php'),
+(55, 'DataSet', 'Add', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(56, 'DataSet', 'Edit', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(57, 'DataSet', 'Delete', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(58, 'DataSet', 'AddColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(59, 'DataSet', 'EditColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(60, 'DataSet', 'DeleteColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(61, 'DataSet', 'Data', 'manual/content/layout/content_datasets.php#Dataset_Row'),
+(62, 'DataSet', 'Permissions', 'manual/content/users/user_permissions.php'),
+(63, 'Fault', 'General', 'manual/content/admin/advanced.php'),
+(64, 'Report', 'General', 'manual/content/admin/advanced.php'),
+(65, 'Stats', 'General', 'manual/content/admin/displays.php#Display_Statistic'),
+(66, 'Resolution', 'General', 'manual/content/templates/template_resolution.php'),
+(67, 'Template', 'General', 'manual/content/templates/overview.php'),
+(68, 'Services', 'Register', 'manual/content/admin/api.php'),
+(69, 'OAuth', 'General', 'manual/content/admin/api.php'),
+(70, 'Services', 'Log', 'manual/content/admin/advanced.php'),
+(71, 'Module', 'Edit', 'manual/content/admin/modules.php'),
+(72, 'Module', 'General', 'manual/content/admin/modules.php'),
+(73, 'Campaign', 'General', 'manual/content/layout/campaign_layout.php'),
+(74, 'License', 'General', 'manual/content/license/licenses.php'),
+(75, 'DataSet', 'ViewColumns', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(76, 'Campaign', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
+(77, 'Transition', 'Edit', 'manual/content/transitions/transitions.php#Edit');
+
+ALTER TABLE  `menuitem` ADD  `External` TINYINT NOT NULL DEFAULT '0';
+
+UPDATE `menuitem` SET External = 1 WHERE Class = 'help_button' AND PageID = (SELECT PageID FROM `pages` WHERE name = 'manual');
+
+UPDATE `version` SET `app_ver` = '1.5.0', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '61';

=== added file 'server/install/database/62.sql'
--- server/install/database/62.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/62.sql	2013-04-11 16:56:27 +0000
@@ -0,0 +1,7 @@
+
+ALTER TABLE  `user` ADD `CSPRNG` TINYINT NOT NULL DEFAULT 0;
+ALTER TABLE  `user` CHANGE  `UserPassword`  `UserPassword` VARCHAR( 128 ) NOT NULL;
+
+UPDATE `version` SET `app_ver` = '1.5.0', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '62';

=== modified file 'server/install/footer.inc'
--- server/install/footer.inc	2009-02-18 10:06:15 +0000
+++ server/install/footer.inc	2013-04-11 16:56:27 +0000
@@ -1,5 +1,5 @@
 				<br />
-				<p><a href="http://www.xibo.org.uk"><img src='img/login/complogo.png'></a></p>	
+				<p><a href="http://www.xibo.org.uk"><img src='theme/default/img/login/complogo.png'></a></p>	
 			</div>
 
 			

=== modified file 'server/install/header.inc'
--- server/install/header.inc	2009-05-30 15:45:36 +0000
+++ server/install/header.inc	2013-04-11 16:56:27 +0000
@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<link rel="stylesheet" type="text/css" href="install/install.css" />
 	
-	<link rel="shortcut icon" href="img/favicon.ico" />
+	<link rel="shortcut icon" href="theme/default/img/favicon.ico" />
 	
 	<script type="text/javascript">
 		$(document).ready(function(){

=== modified file 'server/install/header_upgrade.inc'
--- server/install/header_upgrade.inc	2010-09-11 14:04:46 +0000
+++ server/install/header_upgrade.inc	2013-04-11 16:56:27 +0000
@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<link rel="stylesheet" type="text/css" href="install/install.css" />
 	
-	<link rel="shortcut icon" href="img/favicon.ico" />
+	<link rel="shortcut icon" href="theme/default/img/favicon.ico" />
 	
 	<script type="text/javascript">
 		$(document).ready(function(){

=== modified file 'server/install/install.css'
--- server/install/install.css	2009-12-31 11:38:50 +0000
+++ server/install/install.css	2013-04-11 16:56:27 +0000
@@ -20,7 +20,7 @@
 body {
 	font-size:76.1%;
 	font-family:Verdana, Arial, Helvetica, sans-serif;
-	background: url(../img/headerback.png) repeat-x;
+	background: url(../theme/default/img/headerback.png) repeat-x;
 }
 
 img {
@@ -48,7 +48,7 @@
 	float:left;
 	width: 10px;
 	height: 10px;
-	background:url(../img/login/login_topleft.png) no-repeat;
+	background:url(../theme/default/img/login/login_topleft.png) no-repeat;
 	
 }
 
@@ -56,7 +56,7 @@
 	float:right;
 	width: 10px;
 	height: 10px;
-	background:url(../img/login/login_topright.png) no-repeat;
+	background:url(../theme/default/img/login/login_topright.png) no-repeat;
 	
 }
 
@@ -67,11 +67,11 @@
 
 
 .install_body {
-	background: url(../img/login/login_body.png) repeat-x #e5f0ff;
+	background: url(../theme/default/img/login/login_body.png) repeat-x #e5f0ff;
 	padding: 25px 0 15px 10px;
 }
 .install_foot{
-	background: url(../img/login/login_foot.png) repeat-x;
+	background: url(../theme/default/img/login/login_foot.png) repeat-x;
 	height: 19px;
 	width: 500px;
 }
@@ -80,7 +80,7 @@
 	float:left;
 	width: 11px;
 	height: 19px;
-	background:url(../img/login/login_bottomleft.png) no-repeat;
+	background:url(../theme/default/img/login/login_bottomleft.png) no-repeat;
 	
 }
 
@@ -88,7 +88,7 @@
 	float:right;
 	width: 11px;
 	height: 19px;
-	background:url(../img/login/login_bottomright.png) no-repeat;
+	background:url(../theme/default/img/login/login_bottomright.png) no-repeat;
 	
 }
 .install_box form {

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2013-02-02 15:29:45 +0000
+++ server/install/master/data.sql	2013-04-11 16:56:27 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.4.2', 3, 1, 52);
+('1.5.0', 3, 1, 62);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),
@@ -7,76 +7,81 @@
 (3, 'xibo_admin', 1, 0);
 
 INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
-(1, 'Layout', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts'),
-(2, 'Content', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Media#The_Library'),
-(4, 'Schedule', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling'),
-(5, 'Group', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Groups'),
-(6, 'Admin', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Settings'),
-(7, 'Report', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Log'),
-(8, 'Dashboard', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Overview#Dashboard'),
-(9, 'User', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users'),
-(10, 'Display', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays'),
-(11, 'DisplayGroup', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Groups'),
-(12, 'Layout', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Adding_Layouts'),
-(13, 'Layout', 'Background', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Changing_the_Background'),
-(14, 'Content', 'Assign', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Library'),
-(15, 'Layout', 'RegionOptions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Assigning_Media'),
-(16, 'Content', 'AddtoLibrary', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Add_Media'),
-(17, 'Display', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Edit'),
-(18, 'Display', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Delete'),
-(19, 'Displays', 'Groups', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Groups'),
-(20, 'UserGroup', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Add_Group'),
-(21, 'User', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Add'),
-(22, 'User', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Delete'),
-(23, 'Content', 'Config', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Settings'),
-(24, 'LayoutMedia', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Permissions'),
-(25, 'Region', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#Region_Permissions'),
-(26, 'Library', 'Assign', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Design#AssigningFromLibrary'),
-(27, 'Media', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Retire_Media'),
-(28, 'DisplayGroup', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Add'),
-(29, 'DisplayGroup', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Edit'),
-(30, 'DisplayGroup', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Delete'),
-(31, 'DisplayGroup', 'Members', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#Members'),
-(32, 'DisplayGroup', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:DisplayGroups#GroupSecurity'),
-(34, 'Schedule', 'ScheduleNow', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling#Schedule_Now'),
-(35, 'Layout', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Deleting_or_Retiring_Layouts'),
-(36, 'Layout', 'Copy', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Copying_Layouts'),
-(37, 'Schedule', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling#Editing_Schedules'),
-(38, 'Schedule', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling#Scheduling_Layouts'),
-(39, 'Layout', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Layout_Permissions'),
-(40, 'Display', 'MediaInventory', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Client_Media_Inventory'),
-(41, 'User', 'ChangePassword', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Changing_Password'),
-(42, 'Schedule', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Scheduling#Deleting_Events'),
-(43, 'Layout', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Management#Editing_Layouts'),
-(44, 'Media', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Permissions'),
-(45, 'Display', 'DefaultLayout', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Default_Layout'),
-(46, 'UserGroup', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Edit_Group'),
-(47, 'UserGroup', 'Members', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Group_Membership'),
-(48, 'User', 'PageSecurity', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Page_Security'),
-(49, 'User', 'MenuSecurity', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Menu_Security'),
-(50, 'UserGroup', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Group_Delete'),
-(51, 'User', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Edit'),
-(52, 'User', 'Applications', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Applications'),
-(53, 'User', 'SetHomepage', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Users#Set_Homepage'),
-(54, 'DataSet', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets'),
-(55, 'DataSet', 'Add', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Adding_DataSets'),
-(56, 'DataSet', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Editing_Datasets'),
-(57, 'DataSet', 'Delete', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Deleting_DataSets'),
-(58, 'DataSet', 'AddColumn', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Adding_Columns'),
-(59, 'DataSet', 'EditColumn', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Editing_Columns'),
-(60, 'DataSet', 'DeleteColumn', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Deleting_Columns'),
-(61, 'DataSet', 'Data', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Adding_Data'),
-(62, 'DataSet', 'Permissions', 'http://wiki.xibo.org.uk/wiki/Manual:Media:DataSets#Permissions'),
-(63, 'Fault', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Debug#ReportFault'),
-(64, 'Report', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Debug#ReportFault'),
-(65, 'Stats', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Displays#Stats'),
-(66, 'Resolution', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Administration:Resolutions'),
-(67, 'Template', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Layouts:Templates'),
-(68, 'Services', 'Register', 'http://wiki.xibo.org.uk/wiki/Manual:Applications#Adding_Applications'),
-(69, 'OAuth', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Applications'),
-(70, 'Services', 'Log', 'http://wiki.xibo.org.uk/wiki/Manual:Applications#View_Log'),
-(71, 'Module', 'Edit', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Module_Config'),
-(72, 'Module', 'General', 'http://wiki.xibo.org.uk/wiki/Manual:Media#Editing_Module_Config');
+(1, 'Layout', 'General', 'manual/content/layout/overview.php'),
+(2, 'Content', 'General', 'manual/content/content/types.php'),
+(4, 'Schedule', 'General', 'manual/content/schedule/schedule_calendar.php'),
+(5, 'Group', 'General', 'manual/content/users/groups.php'),
+(6, 'Admin', 'General', 'manual/content/admin/settings.php'),
+(7, 'Report', 'General', 'manual/content/admin/advanced.php'),
+(8, 'Dashboard', 'General', 'manual/content/dashboard/dashboard.php'),
+(9, 'User', 'General', 'manual/content/users/users.php'),
+(10, 'Display', 'General', 'manual/content/admin/displays.php'),
+(11, 'DisplayGroup', 'General', 'manual/content/admin/displays.php#Display_Group'),
+(12, 'Layout', 'Add', 'manual/content/layout/addlayout.php'),
+(13, 'Layout', 'Background', 'manual/content/layout/layoutdesigner.php#Background'),
+(14, 'Content', 'Assign', 'manual/content/content/types.php'),
+(15, 'Layout', 'RegionOptions', 'manual/content/layout/addregion.php'),
+(16, 'Content', 'AddtoLibrary', 'manual/content/content/adding.php'),
+(17, 'Display', 'Edit', 'manual/content/admin/displays.php#Display_Edit'),
+(18, 'Display', 'Delete', 'manual/content/admin/displays.php#Display_Delete'),
+(19, 'Displays', 'Groups', 'manual/content/admin/displays.php#Display_Group'),
+(20, 'UserGroup', 'Add', 'manual/content/users/groups.php#Adding_Group'),
+(21, 'User', 'Add', 'manual/content/users/users.php#Adding_User'),
+(22, 'User', 'Delete', 'manual/content/users/users.php#Delete_User'),
+(23, 'Content', 'Config', 'manual/content/admin/settings.php#Content'),
+(24, 'LayoutMedia', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
+(25, 'Region', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
+(26, 'Library', 'Assign', 'manual/content/layout/assigncontent.php#Add_From_Library'),
+(27, 'Media', 'Delete', 'manual/content/content/types.php'),
+(28, 'DisplayGroup', 'Add', 'manual/content/admin/displays.php#Display_Group'),
+(29, 'DisplayGroup', 'Edit', 'manual/content/admin/displays.php#Display_Group'),
+(30, 'DisplayGroup', 'Delete', 'manual/content/admin/displays.php#Display_Group'),
+(31, 'DisplayGroup', 'Members', 'manual/content/admin/displays.php#Group_Members'),
+(32, 'DisplayGroup', 'Permissions', 'manual/content/users/user_permissions.php'),
+(34, 'Schedule', 'ScheduleNow', 'manual/content/schedule/schedule_now.php'),
+(35, 'Layout', 'Delete', 'manual/content/layout/addlayout.php#Delete_Layout'),
+(36, 'Layout', 'Copy', 'manual/content/layout/addlayout.php#Copy_Layout'),
+(37, 'Schedule', 'Edit', 'manual/content/schedule/schedule_calendar.php'),
+(38, 'Schedule', 'Add', 'manual/content/schedule/schedule_calendar.php'),
+(39, 'Layout', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
+(40, 'Display', 'MediaInventory', 'manual/content/admin/displays.php#Media_Inventory'),
+(41, 'User', 'ChangePassword', 'manual/content/dashboard/navbar.php#Navigation_Top'),
+(42, 'Schedule', 'Delete', 'manual/content/schedule/schedule_event.htm'),
+(43, 'Layout', 'Edit', 'manual/content/layout/addlayout.php#Edit_Layout'),
+(44, 'Media', 'Permissions', 'manual/content/users/user_permissions.php'),
+(45, 'Display', 'DefaultLayout', 'manual/content/admin/displays.php'),
+(46, 'UserGroup', 'Edit', 'manual/content/users/groups.php#Edit_Group'),
+(47, 'UserGroup', 'Members', 'manual/content/users/groups.php#Group_Member'),
+(48, 'User', 'PageSecurity', 'manual/content/users/menu_page_security.php#Page_Security'),
+(49, 'User', 'MenuSecurity', 'manual/content/users/menu_page_security.php#Menu_Security'),
+(50, 'UserGroup', 'Delete', 'manual/content/users/groups.php#Delete_Group'),
+(51, 'User', 'Edit', 'manual/content/users/users.php#Edit_User'),
+(52, 'User', 'Applications', 'manual/content/users/menu_page_security.php'),
+(53, 'User', 'SetHomepage', 'manual/content/dashboard/dashboard.php#Media_Dashboard'),
+(54, 'DataSet', 'General', 'manual/content/layout/content_datasets.php'),
+(55, 'DataSet', 'Add', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(56, 'DataSet', 'Edit', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(57, 'DataSet', 'Delete', 'manual/content/layout/content_datasets.php#Create_Dataset'),
+(58, 'DataSet', 'AddColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(59, 'DataSet', 'EditColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(60, 'DataSet', 'DeleteColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(61, 'DataSet', 'Data', 'manual/content/layout/content_datasets.php#Dataset_Row'),
+(62, 'DataSet', 'Permissions', 'manual/content/users/user_permissions.php'),
+(63, 'Fault', 'General', 'manual/content/admin/advanced.php'),
+(64, 'Report', 'General', 'manual/content/admin/advanced.php'),
+(65, 'Stats', 'General', 'manual/content/admin/displays.php#Display_Statistic'),
+(66, 'Resolution', 'General', 'manual/content/templates/template_resolution.php'),
+(67, 'Template', 'General', 'manual/content/templates/overview.php'),
+(68, 'Services', 'Register', 'manual/content/admin/api.php'),
+(69, 'OAuth', 'General', 'manual/content/admin/api.php'),
+(70, 'Services', 'Log', 'manual/content/admin/advanced.php'),
+(71, 'Module', 'Edit', 'manual/content/admin/modules.php'),
+(72, 'Module', 'General', 'manual/content/admin/modules.php'),
+(73, 'Campaign', 'General', 'manual/content/layout/campaign_layout.php'),
+(74, 'License', 'General', 'manual/content/license/licenses.php'),
+(75, 'DataSet', 'ViewColumns', 'manual/content/layout/content_datasets.php#Dataset_Column'),
+(76, 'Campaign', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
+(77, 'Transition', 'Edit', 'manual/content/transitions/transitions.php#Edit');
 
 INSERT INTO `menu` (`MenuID`, `Menu`) VALUES
 (8, 'Administration Menu'),
@@ -88,19 +93,19 @@
 (1, 'Top Nav');
 
 INSERT INTO `module` (`ModuleID`, `Module`, `Name`, `Enabled`, `RegionSpecific`, `Description`, `ImageUri`, `SchemaVersion`, `ValidExtensions`, `PreviewEnabled`) VALUES
-(1, 'Image', 'Image', 1, 0, 'Images. PNG, JPG, BMP, GIF', 'img/forms/image.gif', 1, 'jpg,jpeg,png,bmp,gif', 1),
-(2, 'Video', 'Video', 1, 0, 'Videos. WMV.', 'img/forms/video.gif', 1, 'wmv,avi,mpg,mpeg', 1),
-(3, 'Flash', 'Flash', 1, 0, 'Flash', 'img/forms/flash.gif', 1, 'swf', 1),
-(4, 'PowerPoint', 'PowerPoint', 1, 0, 'Powerpoint. PPT, PPS', 'img/forms/powerpoint.gif', 1, 'ppt,pps,pptx', 1),
-(5, 'Webpage', 'Webpage', 1, 1, 'Webpages.', 'img/forms/webpage.gif', 1, NULL, 1),
-(6, 'Ticker', 'Ticker', 1, 1, 'RSS Ticker.', 'img/forms/ticker.gif', 1, NULL, 1),
-(7, 'Text', 'Text', 1, 1, 'Text. With Directional Controls.', 'img/forms/text.gif', 1, NULL, 1),
-(8, 'Embedded', 'Embedded', 1, 1, 'Embedded HTML', 'img/forms/webpage.gif', 1, NULL, 1),
-(9, 'MicroBlog', 'MicroBlog', 1, 1, NULL, 'img/forms/microblog.gif', 1, NULL, 1),
-(10, 'Counter', 'Counter', 1, 1, 'Customer Counter connected to a Remote Control', 'img/forms/counter.gif', 1, NULL, 1),
-(11, 'datasetview', 'Data Set', 1, 1, 'A view on a DataSet', 'img/forms/datasetview.gif', 1, NULL, 1),
-(12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'img/forms/shellcommand.gif', 1, NULL, 1),
-(13, 'localvideo', 'Local Video', 0, 1, 'Play a video locally stored on the client', 'img/forms/video.gif', 1, NULL, 1);
+(1, 'Image', 'Image', 1, 0, 'Images. PNG, JPG, BMP, GIF', 'forms/image.gif', 1, 'jpg,jpeg,png,bmp,gif', 1),
+(2, 'Video', 'Video', 1, 0, 'Videos. WMV.', 'forms/video.gif', 1, 'wmv,avi,mpg,mpeg', 1),
+(3, 'Flash', 'Flash', 1, 0, 'Flash', 'forms/flash.gif', 1, 'swf', 1),
+(4, 'PowerPoint', 'PowerPoint', 1, 0, 'Powerpoint. PPT, PPS', 'forms/powerpoint.gif', 1, 'ppt,pps,pptx', 1),
+(5, 'Webpage', 'Webpage', 1, 1, 'Webpages.', 'forms/webpage.gif', 1, NULL, 1),
+(6, 'Ticker', 'Ticker', 1, 1, 'RSS Ticker.', 'forms/ticker.gif', 1, NULL, 1),
+(7, 'Text', 'Text', 1, 1, 'Text. With Directional Controls.', 'forms/text.gif', 1, NULL, 1),
+(8, 'Embedded', 'Embedded', 1, 1, 'Embedded HTML', 'forms/webpage.gif', 1, NULL, 1),
+(9, 'MicroBlog', 'MicroBlog', 1, 1, NULL, 'forms/microblog.gif', 1, NULL, 1),
+(10, 'Counter', 'Counter', 1, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1),
+(11, 'datasetview', 'Data Set', 1, 1, 'A view on a DataSet', 'forms/datasetview.gif', 1, NULL, 1),
+(12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'forms/shellcommand.gif', 1, NULL, 1),
+(13, 'localvideo', 'Local Video', 0, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1);
 
 INSERT INTO `pagegroup` (`pagegroupID`, `pagegroup`) VALUES
 (1, 'Schedule'),
@@ -126,7 +131,7 @@
 (12, 'update', 11),
 (14, 'admin', 10),
 (15, 'group', 8),
-(16, 'report', 9),
+(16, 'log', 9),
 (17, 'user', 8),
 (18, 'license', 10),
 (19, 'index', 2),
@@ -143,51 +148,57 @@
 (34, 'help', 2),
 (35, 'clock', 2),
 (36, 'dataset', 14),
-(37, 'campaign', 3);
-
-INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`) VALUES
-(1, 1, 2, NULL, 'Schedule', NULL, NULL, 1),
-(2, 1, 5, NULL, 'Design', NULL, NULL, 2),
-(3, 1, 7, NULL, 'Library', NULL, NULL, 3),
-(4, 1, 17, NULL, 'Administration', NULL, NULL, 5),
-(7, 7, 11, NULL, 'Displays', NULL, NULL, 1),
-(8, 8, 15, NULL, 'User Groups', NULL, NULL, 2),
-(9, 8, 17, NULL, 'Users', NULL, NULL, 1),
-(10, 9, 16, 'sp=log', 'Log', NULL, NULL, 1),
-(11, 9, 18, NULL, 'License', NULL, NULL, 4),
-(12, 9, 16, 'sp=sessions', 'Sessions', NULL, NULL, 2),
-(13, 8, 14, NULL, 'Settings', NULL, NULL, 3),
-(14, 2, 2, 'sp=month', 'Schedule', 'schedule_button', 'img/dashboard/scheduleview.png', 1),
-(15, 2, 5, NULL, 'Layouts', 'playlist_button', 'img/dashboard/presentations.png', 2),
-(16, 2, 7, NULL, 'Library', 'content_button', 'img/dashboard/content.png', 3),
-(17, 2, 25, NULL, 'Templates', 'layout_button', 'img/dashboard/layouts.png', 4),
-(18, 2, 17, NULL, 'Users', 'user_button', 'img/dashboard/users.png', 5),
-(19, 2, 14, NULL, 'Settings', 'settings_button', 'img/dashboard/settings.png', 6),
-(20, 2, 18, NULL, 'License', 'license_button', 'img/dashboard/license.png', 7),
-(22, 9, 26, NULL, 'Report Fault', NULL, NULL, 3),
-(23, 7, 27, NULL, 'Statistics', NULL, NULL, 3),
-(24, 2, 28, 'http://wiki.xibo.org.uk/wiki/Manual:TOC', 'Manual', 'help_button', 'img/dashboard/help.png', 10),
-(25, 6, 29, NULL, 'Resolutions', NULL, NULL, 4),
-(26, 6, 25, NULL, 'Templates', NULL, NULL, 3),
-(27, 7, 32, NULL, 'Display Groups', NULL, NULL, 2),
-(28, 8, 33, NULL, 'Applications', NULL, NULL, 4),
-(29, 5, 36, NULL, 'DataSets', NULL, NULL, 2),
-(30, 5, 7, NULL, 'Media', NULL, NULL, 1),
-(33, 6, 5, NULL, 'Layouts', NULL, NULL, 2),
-(34, 1, 11, NULL, 'Displays', NULL, NULL, 4),
-(35, 1, 16, 'sp=log', 'Advanced', NULL, NULL, 6),
-(36, 8, 24, NULL, 'Modules', NULL, NULL, 5),
-(37, 6, 37, NULL, 'Campaigns', NULL, NULL, 1);
-
-INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`) VALUES
-(1, '4:3 Monitor', 800, 600),
-(2, '3:2 Tv', 720, 480),
-(3, '16:10 Widescreen Mon', 800, 500),
-(4, '16:9 HD Widescreen', 800, 450),
-(5, '3:4 Monitor', 600, 800),
-(6, '2:3 Tv', 480, 720),
-(7, '10:16 Widescreen', 500, 800),
-(8, '9:16 HD Widescreen', 450, 800);
+(37, 'campaign', 3),
+(38, 'transition', 4),
+(39, 'timeline', 3),
+(40, 'sessions', 9);
+
+INSERT INTO `menuitem` (`MenuItemID`, `MenuID`, `PageID`, `Args`, `Text`, `Class`, `Img`, `Sequence`, `External`) VALUES
+(1, 1, 2, NULL, 'Schedule', NULL, NULL, 1, 0),
+(2, 1, 5, NULL, 'Design', NULL, NULL, 2, 0),
+(3, 1, 7, NULL, 'Library', NULL, NULL, 3, 0),
+(4, 1, 17, NULL, 'Administration', NULL, NULL, 5, 0),
+(7, 7, 11, NULL, 'Displays', NULL, NULL, 1, 0),
+(8, 8, 15, NULL, 'User Groups', NULL, NULL, 2, 0),
+(9, 8, 17, NULL, 'Users', NULL, NULL, 1, 0),
+(10, 9, 16, NULL, 'Log', NULL, NULL, 1, 0),
+(11, 9, 18, NULL, 'About', NULL, NULL, 4, 0),
+(12, 9, 40, NULL, 'Sessions', NULL, NULL, 2, 0),
+(13, 8, 14, NULL, 'Settings', NULL, NULL, 3, 0),
+(14, 2, 2, 'sp=month', 'Schedule', 'schedule_button', 'dashboard/scheduleview.png', 1, 0),
+(15, 2, 5, NULL, 'Layouts', 'playlist_button', 'dashboard/presentations.png', 2, 0),
+(16, 2, 7, NULL, 'Library', 'content_button', 'dashboard/content.png', 3, 0),
+(17, 2, 25, NULL, 'Templates', 'layout_button', 'dashboard/layouts.png', 4, 0),
+(18, 2, 17, NULL, 'Users', 'user_button', 'dashboard/users.png', 5, 0),
+(19, 2, 14, NULL, 'Settings', 'settings_button', 'dashboard/settings.png', 6, 0),
+(20, 2, 18, NULL, 'About', 'license_button', 'dashboard/license.png', 7, 0),
+(22, 9, 26, NULL, 'Report Fault', NULL, NULL, 3, 0),
+(23, 7, 27, NULL, 'Statistics', NULL, NULL, 3, 0),
+(24, 2, 28, 'manual/index.php', 'Manual', 'help_button', 'dashboard/help.png', 10, 1),
+(25, 6, 29, NULL, 'Resolutions', NULL, NULL, 4, 0),
+(26, 6, 25, NULL, 'Templates', NULL, NULL, 3, 0),
+(27, 7, 32, NULL, 'Display Groups', NULL, NULL, 2, 0),
+(28, 8, 33, NULL, 'Applications', NULL, NULL, 4, 0),
+(29, 5, 36, NULL, 'DataSets', NULL, NULL, 2, 0),
+(30, 5, 7, NULL, 'Media', NULL, NULL, 1, 0),
+(33, 6, 5, NULL, 'Layouts', NULL, NULL, 2, 0),
+(34, 1, 11, NULL, 'Displays', NULL, NULL, 4, 0),
+(35, 1, 16, NULL, 'Advanced', NULL, NULL, 6, 0),
+(36, 8, 24, NULL, 'Modules', NULL, NULL, 5, 0),
+(37, 6, 37, NULL, 'Campaigns', NULL, NULL, 1, 0),
+(38, 8, 38, NULL, 'Transitions', NULL, NULL, 6, 0),
+(39, 9, 30, NULL, 'Help Links', NULL, NULL, 6, 0);
+
+
+INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`) VALUES
+(1, '4:3 Monitor', 800, 600, 1024, 768),
+(2, '3:2 Tv', 720, 480, 1440, 960),
+(3, '16:10 Widescreen Mon', 800, 500, 1680, 1050),
+(4, '16:9 HD Widescreen', 800, 450, 1920, 1080),
+(5, '3:4 Monitor', 600, 800, 768, 1024),
+(6, '2:3 Tv', 480, 720, 960, 1440),
+(7, '10:16 Widescreen', 500, 800, 1050, 1680),
+(8, '9:16 HD Widescreen', 450, 800, 1080, 1920);
 
 INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) VALUES
 (1, 'MEDIA_DEFAULT', 'private', 'dropdown', 'Media will be created with these settings. If public everyone will be able to view and use this media.', 'private|public', 'default', 1),
@@ -234,8 +245,9 @@
 (58, 'MODULE_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the module config locked? Useful for Service providers.', 'Checked|Unchecked', 'general', 0),
 (59, 'LIBRARY_SIZE_LIMIT_KB', '0', 'text', 'The Limit for the Library Size in KB', NULL, 'content', 0),
 (60, 'MONTHLY_XMDS_TRANSFER_LIMIT_KB', '0', 'text', 'XMDS Transfer Limit in KB/month', NULL, 'general', 0),
-(61, 'DEFAULT_LANGUAGE', 'en_GB', 'text', 'The default language to use', NULL, 'general', 1);
-
+(61, 'DEFAULT_LANGUAGE', 'en_GB', 'text', 'The default language to use', NULL, 'general', 1),
+(62, 'TRANSITION_CONFIG_LOCKED_CHECKB', 'Unchecked', 'dropdown', 'Is the Transition config locked?', 'Checked|Unchecked', 'general', 0),
+(63, 'GLOBAL_THEME_NAME', 'default', 'text', 'The Theme to apply to all pages by default', NULL, 'general', 1);
 
 INSERT INTO `usertype` (`usertypeid`, `usertype`) VALUES
 (1, 'Super Admin'),
@@ -299,3 +311,8 @@
 
 INSERT INTO `lkusergroup` (`LkUserGroupID`, `GroupID`, `UserID`) VALUES
 (10, 3, 1);
+
+INSERT INTO `transition` (`TransitionID`, `Transition`, `Code`, `HasDuration`, `HasDirection`, `AvailableAsIn`, `AvailableAsOut`) VALUES
+(1, 'Fade In', 'fadeIn', 1, 0, 0, 0),
+(2, 'Fade Out', 'fadeOut', 1, 0, 0, 0),
+(3, 'Fly', 'fly', 1, 1, 1, 0);
\ No newline at end of file

=== modified file 'server/install/master/structure.sql'
--- server/install/master/structure.sql	2013-02-02 15:29:45 +0000
+++ server/install/master/structure.sql	2013-04-11 16:56:27 +0000
@@ -117,7 +117,7 @@
   `Category` varchar(254) NOT NULL DEFAULT 'General',
   `Link` varchar(254) NOT NULL,
   PRIMARY KEY (`HelpID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=73 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=78 ;
 
 CREATE TABLE IF NOT EXISTS `layout` (
   `layoutID` int(11) NOT NULL AUTO_INCREMENT,
@@ -329,10 +329,11 @@
   `Class` varchar(50) DEFAULT NULL,
   `Img` varchar(254) DEFAULT NULL,
   `Sequence` smallint(6) NOT NULL DEFAULT '1',
+  `External` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`MenuItemID`),
   KEY `PageID` (`PageID`),
   KEY `MenuID` (`MenuID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=38 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=40 ;
 
 CREATE TABLE IF NOT EXISTS `module` (
   `ModuleID` int(11) NOT NULL AUTO_INCREMENT,
@@ -434,13 +435,15 @@
   `pagegroupID` int(11) NOT NULL,
   PRIMARY KEY (`pageID`),
   KEY `pagegroupID` (`pagegroupID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Available Pages' AUTO_INCREMENT=38 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Available Pages' AUTO_INCREMENT=40 ;
 
 CREATE TABLE IF NOT EXISTS `resolution` (
   `resolutionID` int(11) NOT NULL AUTO_INCREMENT,
   `resolution` varchar(20) NOT NULL,
   `width` smallint(6) NOT NULL,
   `height` smallint(6) NOT NULL,
+  `intended_width` smallint(6) NOT NULL,
+  `intended_height` smallint(6) NOT NULL,
   PRIMARY KEY (`resolutionID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Supported Resolutions' AUTO_INCREMENT=9 ;
 
@@ -532,16 +535,28 @@
   KEY `userID` (`userID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Templates for use on Layouts' AUTO_INCREMENT=9 ;
 
+CREATE TABLE IF NOT EXISTS `transition` (
+  `TransitionID` int(11) NOT NULL AUTO_INCREMENT,
+  `Transition` varchar(254) NOT NULL,
+  `Code` varchar(50) NOT NULL,
+  `HasDuration` tinyint(4) NOT NULL,
+  `HasDirection` tinyint(4) NOT NULL,
+  `AvailableAsIn` tinyint(4) NOT NULL,
+  `AvailableAsOut` tinyint(4) NOT NULL,
+  PRIMARY KEY (`TransitionID`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
+
 CREATE TABLE IF NOT EXISTS `user` (
   `UserID` int(11) NOT NULL AUTO_INCREMENT,
   `usertypeid` int(8) NOT NULL,
-  `UserName` varchar(15) CHARACTER SET latin1 NOT NULL,
-  `UserPassword` varchar(32) CHARACTER SET latin1 NOT NULL,
+  `UserName` varchar(15) NOT NULL,
+  `UserPassword` varchar(128) NOT NULL,
   `loggedin` tinyint(1) NOT NULL DEFAULT '0',
   `lastaccessed` datetime DEFAULT NULL,
-  `email` varchar(50) CHARACTER SET latin1 DEFAULT NULL COMMENT 'The users email address',
+  `email` varchar(50) DEFAULT NULL COMMENT 'The users email address',
   `homepage` varchar(254) NOT NULL DEFAULT 'dashboard.php' COMMENT 'The users homepage',
   `Retired` tinyint(4) NOT NULL DEFAULT '0',
+  `CSPRNG` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`UserID`),
   KEY `usertypeid` (`usertypeid`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;

=== modified file 'server/lib/app/app_functions.php'
--- server/lib/app/app_functions.php	2013-03-04 22:01:30 +0000
+++ server/lib/app/app_functions.php	2013-04-11 16:56:27 +0000
@@ -40,6 +40,14 @@
 	$_SESSION['message'] = $message;
 }
 
+function getMessage() {
+	$message = Kit::GetParam('message', _SESSION, _STRING, '');
+
+	unset($_SESSION['message']);
+
+	return $message;
+}
+
 // Returns a drop down list based on the provided SQL - the ID should be the first field, and the name the second
 function dropdownlist($SQL, $list_name, $selected = "", $callback = "", $flat_list = false, $checkPermissions = false, $userid = "", $permissionLevel = "see", $useQueryId = false) {
 	global $db;
@@ -285,7 +293,7 @@
             for($k=0; $k<6; $k++) 
 			{
                 $c = $cs[$i] .$cs[$j] .$cs[$k];
-				$colors[] = array('colorid' => $c, 'color' => '#' . $c);
+				$colors[] = array('colorid' => $c, 'color' => '#' . $c, 'style' => 'background-color:#' . $c . ';color:#' . $c);
 			}
         }
     }

=== modified file 'server/lib/app/debug.class.php'
--- server/lib/app/debug.class.php	2010-05-11 19:50:54 +0000
+++ server/lib/app/debug.class.php	2013-04-11 16:56:27 +0000
@@ -118,7 +118,7 @@
 		$from = Config::GetSetting($db, "mail_from");
 		if ($from == "") return true;
 		
-		$subject = "Error message from Xibo";
+		$subject = "Error message from Digital Signage System";
 		$message = wordwrap("$errmsg\n$err");
 
 		$headers = "From: $from" . "\r\n" . "Reply-To: $from" . "\r\n" .

=== modified file 'server/lib/app/responsemanager.class.php'
--- server/lib/app/responsemanager.class.php	2013-02-24 18:52:30 +0000
+++ server/lib/app/responsemanager.class.php	2013-04-11 16:56:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner
+ * Copyright (C) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -32,9 +32,9 @@
 	
 	public $sortable;
 	public $sortingDiv;
-        public $paging;
-        public $pageSize;
-        public $pageNumber;
+    public $paging;
+    public $pageSize;
+    public $pageNumber;
     public $initialSortColumn;
     public $initialSortOrder;
 	
@@ -50,12 +50,13 @@
 	public $refresh;
 	public $refreshLocation;
 	public $focusInFirstInput;
-        public $appendHiddenSubmit;
+    public $appendHiddenSubmit;
+    public $modal;
 	
 	public $login;
 	public $clockUpdate;
 
-        public $uniqueReference;
+    public $uniqueReference;
 	
 	public function __construct()
 	{		
@@ -73,6 +74,7 @@
         $this->pageNumber = 0;
         $this->initialSortColumn = 1;
         $this->initialSortOrder = 1;
+        $this->modal = false;
 		
 		return true;
 	}
@@ -259,6 +261,7 @@
 			$response['refresh']		= $this->refresh;
 			$response['refreshLocation']= $this->refreshLocation;
 			$response['focusInFirstInput']= $this->focusInFirstInput;
+			$response['modal'] = $this->modal;
 			
 			// Login
 			$response['login']			= $this->login;

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2012-09-27 14:04:35 +0000
+++ server/lib/app/session.class.php	2013-04-11 16:56:27 +0000
@@ -76,11 +76,10 @@
 		$this->gc($this->max_lifetime);
 		
 		// Get this session		
-		$SQL  = " SELECT session_data, IsExpired, SecurityToken FROM session ";
+		$SQL  = " SELECT session_data, IsExpired, SecurityToken, UserAgent FROM session ";
 		$SQL .= " WHERE session_id = '%s' ";
-		$SQL .= " AND UserAgent = '%s' ";
 		
-		$SQL 	= sprintf($SQL, $db->escape_string($key), $db->escape_string($userAgent));
+		$SQL 	= sprintf($SQL, $db->escape_string($key));
 		
 		$result = $db->query($SQL);
 		
@@ -88,6 +87,15 @@
 		{
 			// Get the row
 			$row = $db->get_row($result);
+
+			// What happens if the UserAgent has changed?
+			if ($row[3] != $userAgent) {
+				// Make sure we are logged out (delete all data)
+				$db->query(sprintf("DELETE FROM session WHERE session_id = '%s' ", $db->escape_string($key)));
+
+				$empty = '';
+				return settype($empty, "string");
+			}
 			
 			// We have the Key and the Remote Address.
 			if ($securityToken == null)

=== modified file 'server/lib/app/thememanager.class.php'
--- server/lib/app/thememanager.class.php	2013-03-04 20:20:04 +0000
+++ server/lib/app/thememanager.class.php	2013-04-11 16:56:27 +0000
@@ -31,6 +31,7 @@
 	private $name = '';
 	private $pageName = '';
 	private $vars = null;
+	private $config = null;
 	
 	public function __construct(database $db, user $user) {
 
@@ -52,17 +53,24 @@
 		// Store the theme name for later
 		$this->name = $globalTheme;
 
-		static::$instance = $this;
+		// Get config
+		if (!file_exists('theme/' . $this->name . '/config.php'))
+			throw new Exception(__('The theme "%s" config file does not exist', $globalTheme));
+
+		require_once('theme/' . $this->name . '/config.php');
+		$this->config = $config;
+
+		self::$instance = $this;
 	}
 
 	/**
 	 * GetInstance of Theme
 	 */
 	private static function GetInstance() {
-		if (!isset(static::$instance))
+		if (!isset(self::$instance))
 			throw new Exception(__("Theme not initialised"));
 
-		return static::$instance;
+		return self::$instance;
 	}
 
 	/**
@@ -113,11 +121,31 @@
 		
 		// See if we have the requested file in the theme folder
 		if (file_exists('theme/' . $theme->name . '/img/' . $item)) {
-			return '<img ' . (($class != '') ? $class : '') . ' src="theme/' . $theme->name . '/img/' . $item . '" />';
-		}
-		// If not, then use the default folder
-		elseif (file_exists('theme/default/img/' . $item)) {
-			return '<img ' . (($class != '') ? $class : '') . ' src="theme/default/img/' . $item . '" />';
+			return '<img ' . (($class != '') ? 'class="' . $class . '"' : '') . ' src="theme/' . $theme->name . '/img/' . $item . '" />';
+		}
+		// If not, then use the default folder
+		elseif (file_exists('theme/default/img/' . $item)) {
+			return '<img ' . (($class != '') ? 'class="' . $class . '"' : '') . ' src="theme/default/img/' . $item . '" />';
+		}
+		else
+			return '';
+	}
+
+	/**
+	 * Get an image URL
+	 * @param [string] $item the image
+	 */
+	public static function ImageUrl($item) {
+
+		$theme = Theme::GetInstance();
+		
+		// See if we have the requested file in the theme folder
+		if (file_exists('theme/' . $theme->name . '/img/' . $item)) {
+			return 'theme/' . $theme->name . '/img/' . $item;
+		}
+		// If not, then use the default folder
+		elseif (file_exists('theme/default/img/' . $item)) {
+			return 'theme/default/img/' . $item;
 		}
 		else
 			return '';
@@ -171,6 +199,27 @@
 		return Theme::GetInstance()->dateManager->GetClock();
 	}
 
+	public static function ApplicationName() {
+		return Theme::GetInstance()->config['app_name'];
+	}
+
+	public static function ThemeName() {
+		return Theme::GetInstance()->config['theme_name'];
+	}
+
+	public static function ThemeFolder() {
+		return Theme::GetInstance()->name;
+	}
+
+	public static function GetConfig($settingName) {
+		$theme = Theme::GetInstance();
+
+		if (isset($theme->config[$settingName]))
+			return $theme->config[$settingName];
+		else
+			return '';
+	}
+
 	/**
 	 * Get Menu
 	 * @param string $menu The Name of the Menu
@@ -191,9 +240,17 @@
 			$item['class'] = Kit::ValidateParam($menuItem['Class'], _WORD);
 			$item['title'] = __(Kit::ValidateParam($menuItem['Text'], _STRING));
 			$item['img'] = Kit::ValidateParam($menuItem['Img'], _STRING);
+			$item['external'] = Kit::ValidateParam($menuItem['External'], _INT);
 
 			$item['selected'] = ($item['page'] == $theme->pageName);
-			$item['link'] = 'index.php?p=' . $item['page'] . '&' . $item['args'];
+
+			if ($item['external'] == 0) {
+				$item['link'] = 'index.php?p=' . $item['page'] . '&' . $item['args'];
+			}
+			else {
+				$item['link'] = $item['args'];
+			}
+
 			$item['li'] = '<li class="' . $item['class'] . '"><a href="' . $item['link'] . '" class="' . $item['class'] . (($item['selected']) ? ' current' : '') . '">' . $item['title'] . '</a></li>';
 
 			$array[] = $item;
@@ -213,14 +270,15 @@
      * @param string Key for item class
      * @return string
      */
-    public static function SelectList($listName, $listValues, $idColumn, $nameColumn, $selectedId = '', $callBack = '', $classColumn = '')
+    public static function SelectList($listName, $listValues, $idColumn, $nameColumn, $selectedId = null, $callBack = '', $classColumn = '', $styleColumn = '')
     {
     	$list = '<select name="' . $listName . '" id="' . $listName . '"' . $callBack . '>';
 
         foreach ($listValues as $listItem)
         {
             $class = ($classColumn == '') ? '' : 'class="' . $listItem[$classColumn] . '"';
-            $list .= '<option ' . $class . ' value="' . $listItem[$idColumn] . '" ' . (($listItem[$idColumn] === $selectedId) ? 'selected' : '') . '>' . $listItem[$nameColumn] . '</option>';
+            $style = ($styleColumn == '') ? '' : 'style="' . $listItem[$styleColumn] . '"';
+            $list .= '<option ' . $style . ' ' . $class . ' value="' . $listItem[$idColumn] . '" ' . (($listItem[$idColumn] == $selectedId) ? 'selected' : '') . '>' . $listItem[$nameColumn] . '</option>';
         }
 
         $list .= '</select>';

=== modified file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	2013-02-02 16:22:59 +0000
+++ server/lib/data/dataset.data.class.php	2013-04-11 16:56:27 +0000
@@ -231,7 +231,14 @@
             foreach ($filter as $filterPair)
             {
                 $filterPair = explode('=', $filterPair);
-                $where .= sprintf(" AND %s = '%s' ", $filterPair[0], $db->escape_string($filterPair[1]));
+
+                // Validate filter pair 1 doesn't contain any disallowed words
+                $disallowedKeywords = array('AND', 'OR');
+
+                if (in_array($filterPair[1], $disallowedKeywords))
+                    continue;
+
+                $where .= sprintf(" AND %s = %s ", $filterPair[0], $filterPair[1]);
             }
 
             $SQL .= $where . ' ';

=== modified file 'server/lib/data/datasetcolumn.data.class.php'
--- server/lib/data/datasetcolumn.data.class.php	2013-02-02 16:22:59 +0000
+++ server/lib/data/datasetcolumn.data.class.php	2013-04-11 16:56:27 +0000
@@ -22,12 +22,12 @@
 
 class DataSetColumn extends Data
 {
-    public function Add($dataSetId, $heading, $dataTypeId, $listContent, $columnOrder = '')
+    public function Add($dataSetId, $heading, $dataTypeId, $listContent, $columnOrder = 0)
     {
         $db =& $this->db;
 
         // Is the column order provided?
-        if ($columnOrder == '')
+        if ($columnOrder == 0)
         {
             $SQL  = "";
             $SQL .= "SELECT IFNULL(MAX(ColumnOrder), 1) AS ColumnOrder ";

=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/data/layout.data.class.php	2013-04-11 16:56:27 +0000
@@ -230,7 +230,7 @@
         // Notify (dont error)
         Kit::ClassLoader('display');
         $displayObject = new Display($db);
-        $displayObject->NotifyDisplays($layoutId);
+        $displayObject->NotifyDisplays($campaignId);
 
         return true;
     }
@@ -777,7 +777,7 @@
         
         $region = new region($db);
         
-        if (!$region->EditBackground($layoutId, '#' . $color, $bg_image, $width, $height))
+        if (!$region->EditBackground($layoutId, '#' . $color, $bg_image, $width, $height, $resolutionId))
         {
             //there was an ERROR
             $response->SetError($region->errorMsg);

=== modified file 'server/lib/data/region.data.class.php'
--- server/lib/data/region.data.class.php	2013-02-16 15:03:26 +0000
+++ server/lib/data/region.data.class.php	2013-04-11 16:56:27 +0000
@@ -75,11 +75,16 @@
 			return false;
 		}
 
-                // Notify (dont error)
-                Kit::ClassLoader('display');
-                $displayObject = new Display($db);
-                $displayObject->NotifyDisplays($layoutid);
-		
+		// Get the Campaign ID
+        Kit::ClassLoader('campaign');
+        $campaign = new Campaign($db);
+        $campaignId = $campaign->GetCampaignId($layoutid);
+
+        // Notify (dont error)
+        Kit::ClassLoader('display');
+        $displayObject = new Display($db);
+        $displayObject->NotifyDisplays($campaignId);
+
 		return true;
 	}
 	
@@ -470,7 +475,7 @@
 		return true;
 	}
 	
-	public function EditBackground($layoutid, $bg_color, $bg_image, $width, $height)
+	public function EditBackground($layoutid, $bg_color, $bg_image, $width, $height, $resolutionId)
 	{
 		$db =& $this->db;
 		
@@ -483,6 +488,7 @@
 		$xml->documentElement->setAttribute("bgcolor", $bg_color);
 		$xml->documentElement->setAttribute('width', $width);
 		$xml->documentElement->setAttribute('height', $height);
+		$xml->documentElement->setAttribute('resolutionid', $resolutionId);
 		$xml->documentElement->setAttribute("schemaVersion", Config::Version($db, 'XlfVersion'));
 		
 		//Convert back to XML		

=== modified file 'server/lib/data/userdata.data.class.php'
--- server/lib/data/userdata.data.class.php	2012-04-16 12:05:26 +0000
+++ server/lib/data/userdata.data.class.php	2013-04-11 16:56:27 +0000
@@ -20,6 +20,18 @@
  */
 defined('XIBO') or die(__('Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.'));
 
+// These constants may be changed without breaking existing hashes.
+define("PBKDF2_HASH_ALGORITHM", "sha256");
+define("PBKDF2_ITERATIONS", 1000);
+define("PBKDF2_SALT_BYTES", 24);
+define("PBKDF2_HASH_BYTES", 24);
+
+define("HASH_SECTIONS", 4);
+define("HASH_ALGORITHM_INDEX", 0);
+define("HASH_ITERATION_INDEX", 1);
+define("HASH_SALT_INDEX", 2);
+define("HASH_PBKDF2_INDEX", 3);
+
 class Userdata extends Data
 {
     public function __construct(database $db)
@@ -37,12 +49,20 @@
      */
     public function ChangePassword($userId, $oldPassword, $newPassword, $retypedNewPassword, $forceChange = false)
     {
+        // Validate
+        if ($userId == 0)
+            return $this->SetError(26001, __('User not selected'));
+
         // We can force the users password to change without having to provide the old one.
         // Is this a potential security hole - we must have validated that we are an admin to get to this point
         if (!$forceChange)
         {
+            // Get the stored hash
+            if (!$good_hash = $this->db->GetSingleValue(sprintf("SELECT UserPassword FROM `user` WHERE UserID = %d", $userId), 'UserPassword', _STRING))
+                return $this->SetError(26000, __('Incorrect Password Provided'));
+
             // Check the Old Password is correct
-            if ($this->db->GetCountOfRows(sprintf("SELECT UserId FROM `user` WHERE UserID = %d AND UserPassword = '%s'", $userId, md5($oldPassword))) == 0)
+            if ($this->validate_password($oldPassword, $good_hash) === false)
                 return $this->SetError(26000, __('Incorrect Password Provided'));
         }
         
@@ -54,8 +74,15 @@
         if (!$this->TestPasswordAgainstPolicy($newPassword))
             return false;
 
+        // Generate a new SALT and Password
+        $hash = $this->create_hash($newPassword);
+
+        $SQL = sprintf("UPDATE `user` SET UserPassword = '%s', CSPRNG = 1 WHERE UserID = %d", $hash, $userId);
+
+        Debug::LogEntry($this->db, 'audit', $SQL);
+
         // Run the update
-        if (!$this->db->query(sprintf("UPDATE `user` SET UserPassword = '%s' WHERE UserID = %d", md5($newPassword), $userId)))
+        if (!$this->db->query($SQL))
         {
             trigger_error($this->db->error());
             return $this->SetError(25000, __('Could not edit Password'));
@@ -84,5 +111,100 @@
 
         return true;
     }
+
+    /*
+     * Password hashing with PBKDF2.
+     * Author: havoc AT defuse.ca
+     * www: https://defuse.ca/php-pbkdf2.htm
+     */
+    public function create_hash($password)
+    {
+        // format: algorithm:iterations:salt:hash
+        $salt = base64_encode(mcrypt_create_iv(PBKDF2_SALT_BYTES, MCRYPT_DEV_URANDOM));
+        return PBKDF2_HASH_ALGORITHM . ":" . PBKDF2_ITERATIONS . ":" .  $salt . ":" .
+            base64_encode($this->pbkdf2(
+                PBKDF2_HASH_ALGORITHM,
+                $password,
+                $salt,
+                PBKDF2_ITERATIONS,
+                PBKDF2_HASH_BYTES,
+                true
+            ));
+    }
+
+    public function validate_password($password, $good_hash)
+    {
+        $params = explode(":", $good_hash);
+        if(count($params) < HASH_SECTIONS)
+           return false;
+        $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
+        return $this->slow_equals(
+            $pbkdf2,
+            $this->pbkdf2(
+                $params[HASH_ALGORITHM_INDEX],
+                $password,
+                $params[HASH_SALT_INDEX],
+                (int)$params[HASH_ITERATION_INDEX],
+                strlen($pbkdf2),
+                true
+            )
+        );
+    }
+
+    // Compares two strings $a and $b in length-constant time.
+    public function slow_equals($a, $b)
+    {
+        $diff = strlen($a) ^ strlen($b);
+        for($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
+        {
+            $diff |= ord($a[$i]) ^ ord($b[$i]);
+        }
+        return $diff === 0;
+    }
+
+    /*
+     * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
+     * $algorithm - The hash algorithm to use. Recommended: SHA256
+     * $password - The password.
+     * $salt - A salt that is unique to the password.
+     * $count - Iteration count. Higher is better, but slower. Recommended: At least 1000.
+     * $key_length - The length of the derived key in bytes.
+     * $raw_output - If true, the key is returned in raw binary format. Hex encoded otherwise.
+     * Returns: A $key_length-byte key derived from the password and salt.
+     *
+     * Test vectors can be found here: https://www.ietf.org/rfc/rfc6070.txt
+     *
+     * This implementation of PBKDF2 was originally created by https://defuse.ca
+     * With improvements by http://www.variations-of-shadow.com
+     */
+    public function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
+    {
+        $algorithm = strtolower($algorithm);
+        if(!in_array($algorithm, hash_algos(), true))
+            die('PBKDF2 ERROR: Invalid hash algorithm.');
+        if($count <= 0 || $key_length <= 0)
+            die('PBKDF2 ERROR: Invalid parameters.');
+
+        $hash_length = strlen(hash($algorithm, "", true));
+        $block_count = ceil($key_length / $hash_length);
+
+        $output = "";
+        for($i = 1; $i <= $block_count; $i++) {
+            // $i encoded as 4 bytes, big endian.
+            $last = $salt . pack("N", $i);
+            // first iteration
+            $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
+            // perform the other $count - 1 iterations
+            for ($j = 1; $j < $count; $j++) {
+                $xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
+            }
+            $output .= $xorsum;
+        }
+
+        if($raw_output)
+            return substr($output, 0, $key_length);
+        else
+            return bin2hex(substr($output, 0, $key_length));
+    }
 }
 ?>

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2013-03-04 22:01:30 +0000
+++ server/lib/include.php	2013-04-11 16:56:27 +0000
@@ -20,6 +20,8 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+define('WEBSITE_VERSION', 62);
+
 // No errors reported until we read the settings from the DB
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
@@ -92,12 +94,12 @@
 
 if (!$db->connect_db($dbhost, $dbuser, $dbpass))
 {
-    die('Xibo has a database connection problem.');
+    die('Database connection problem.');
 }
 
 if (!$db->select_db($dbname))
 {
-    die('Xibo has a database connection problem.');
+    die('Database connection problem.');
 }
 
 date_default_timezone_set(Config::GetSetting($db, "defaultTimezone"));
@@ -109,8 +111,8 @@
 Config::Version($db);
 
 // Does the version in the DB match the version of the code?
-if (DBVERSION != '60')
-    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 60));
+if (DBVERSION != WEBSITE_VERSION)
+    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have database %d and website %d', DBVERSION, WEBSITE_VERSION));
 
 // What is the production mode of the server?
 if(Config::GetSetting($db, 'SERVER_MODE') == 'Test') ini_set('display_errors', 1);

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/modules/module.class.php	2013-04-11 16:56:27 +0000
@@ -487,7 +487,7 @@
 
             // Messages
             $msgTitle = __('Return to the Region Options');
-            $msgWarn = __('Are you sure you want to remove this item from Xibo?');
+            $msgWarn = __('Are you sure you want to remove this item?');
             $msgWarnLost = __('It will be lost');
             $msgYes = __('Yes');
             $msgNo = __('No');
@@ -502,7 +502,7 @@
                         <p>$msgWarn <span class="required">$msgWarnLost</span>.</p>
                 </form>
 END;
-                $this->response->AddButton(__('No'), 'XiboFormRender("index.php?p=layout&layoutid=' . $layoutid . '&regionid=' . $regionid . '&q=RegionOptions")');
+                $this->response->AddButton(__('No'), 'XiboFormRender("index.php?p=timeline&layoutid=' . $layoutid . '&regionid=' . $regionid . '&q=RegionOptions")');
                 $this->response->AddButton(__('Yes'), '$("#MediaDeleteForm").submit()');
             }
             else
@@ -1689,7 +1689,7 @@
         $response->AddButton(__('Help'), 'XiboHelpRender("' . (($this->layoutid != 0) ? $helpManager->Link('LayoutMedia', 'Permissions') : $helpManager->Link('Media', 'Permissions')) . '")');
         
         if ($this->assignedMedia) {
-        	$response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=layout&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
+        	$response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=timeline&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
     	}
     	else {
 			$response->AddButton(__('Cancel'), 'XiboDialogClose()');
@@ -1938,7 +1938,7 @@
         
         // Decide where the cancel button will take us
         if ($this->showRegionOptions)
-            $this->response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=layout&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
+            $this->response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=timeline&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions")');
         else
             $this->response->AddButton(__('Cancel'), 'XiboDialogClose()');
 
@@ -2001,7 +2001,7 @@
         {
             // We want to load a new form
             $this->response->loadForm = true;
-            $this->response->loadFormUri = 'index.php?p=layout&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions';
+            $this->response->loadFormUri = 'index.php?p=timeline&layoutid=' . $this->layoutid . '&regionid=' . $this->regionid . '&q=RegionOptions';
         }
 
         return $this->response;

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/pages/admin.class.php	2013-04-11 16:56:27 +0000
@@ -101,7 +101,7 @@
 				
 				if (!is_writable($value . 'temp'))
 				{
-					trigger_error(__('The Library Location you have picked is not writable to the Xibo Server.'), E_USER_ERROR);
+					trigger_error(__('The Library Location you have picked is not writable'), E_USER_ERROR);
 				}
 			}
 			
@@ -560,7 +560,7 @@
         $mail_to        = Kit::ValidateParam(Config::GetSetting($db, "mail_to"),_PASSWORD);
         $mail_from      = Kit::ValidateParam(Config::GetSetting($db, "mail_from"),_PASSWORD);
         $subject        = __('Email Test');
-        $body           = __('Test email sent from Xibo');
+        $body           = __('Test email sent');
         $headers        = sprintf("From: %s",$mail_from);
         		
         $output  = sprintf(__('Sending test email to %s.'),$mail_to);
@@ -593,7 +593,7 @@
 
         $form = '';
         $form .= '<p>' . __('This will create a dump file of your database that you can restore later using the import functionality.') . '</p>';
-        $form .= '<p>' . __('You should also manually take a backup of your Xibo library.') . '</p>';
+        $form .= '<p>' . __('You should also manually take a backup of your library.') . '</p>';
         $form .= '<p>' . __('Please note: The folder location for mysqldump must be available in your path environment variable for this to work and the php "exec" command must be enabled.') . '</p>';
         $form .= '<a href="index.php?p=admin&q=BackupDatabase" title="' . __('Export Database. Right click to save as.') . '">' . __('Click here to Export') . '</a>';
         

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2013-03-04 20:20:04 +0000
+++ server/lib/pages/content.class.php	2013-04-11 16:56:27 +0000
@@ -206,82 +206,37 @@
      */
     function LibraryAssignForm()
     {
-        $db 			=& $this->db;
-        $user			=& $this->user;
-        $response		= new ResponseManager();
-        $formMgr 		= new FormManager($db, $user);
-        $helpManager            = new HelpManager($db, $user);
-
-        $mediatype              = '';
-        $name                   = '';
-
-        if (isset($_SESSION['content']['mediatype'])) $mediatype = $_SESSION['content']['mediatype'];
-
-        //Media Type drop down list
-        $sql = "SELECT 'all', 'all' ";
-        $sql .= "UNION ";
-        $sql .= "SELECT type, type ";
-        $sql .= "FROM media WHERE 1=1 ";
-        $sql .= "  GROUP BY type ";
-
-        $type_list 	= $formMgr->DropDown($sql, 'type', $mediatype);
-
-        //Input vars
+        $db =& $this->db;
+        $user =& $this->user;
+        $response = new ResponseManager();
+
+        $id = uniqid();
+        Theme::Set('id', $id);
+        Theme::Set('form_meta', '<input type="hidden" name="p" value="content"><input type="hidden" name="q" value="LibraryAssignView">');
+        Theme::Set('pager', ResponseManager::Pager($id));
+        
+        // Module types filter
+        $types = $db->GetArray("SELECT Module AS moduleid, Name AS module FROM `module` WHERE RegionSpecific = 0 AND Enabled = 1 ORDER BY 2");
+        array_unshift($types, array('moduleid' => '', 'module' => 'All'));
+        Theme::Set('module_field_list', $types);
+
+        // Call to render the template
+        $output = Theme::RenderReturn('library_form_assign');
+
+        // Input vars
         $layoutId = Kit::GetParam('layoutid', _REQUEST, _INT);
         $regionId = Kit::GetParam('regionid', _REQUEST, _STRING);
 
-        // Messages
-        $msgName	= __('Name');
-        $msgType	= __('Type');
-
-        $form = <<<HTML
-        <form>
-            <input type="hidden" name="p" value="content">
-            <input type="hidden" name="q" value="LibraryAssignView">
-            <table>
-                <tr>
-                    <td>$msgName</td>
-                    <td><input type="text" name="name" id="name" value="$name"></td>
-                    <td>$msgType</td>
-                    <td>$type_list</td>
-                </tr>
-            </table>
-        </form>
-HTML;
-		
-        $id = uniqid();
-
-        $msgAssignBox = __('Media to Assign');
-        $msgInfoMessage = __('Drag or double click to move items between lists');
-
-        $xiboGrid = <<<HTML
-        <div class="XiboGrid LibraryAssign" id="$id">
-            <div class="XiboFilter">
-                $form
-            </div>
-            <center>$msgInfoMessage</center>
-            <div class="XiboData LibraryAssignLeftSortableList connectedlist">
-
-            </div>
-            <div class="LibraryAssignRightSortableList connectedlist">
-                <h3>$msgAssignBox</h3>
-                <ul id="LibraryAssignSortable" class="connectedSortable">
-
-                </ul>
-            </div>
-        </div>
-HTML;
-		
         // Construct the Response
-        $response->html         = $xiboGrid;
-        $response->success	= true;
-        $response->dialogSize	= true;
-        $response->dialogWidth	= '780px';
+        $response->html = $output;
+        $response->success = true;
+        $response->dialogSize = true;
+        $response->dialogWidth = '780px';
         $response->dialogHeight = '580px';
-        $response->dialogTitle	= __('Assign an item from the Library');
+        $response->dialogTitle = __('Assign an item from the Library');
 
-        $response->AddButton(__('Help'), 'XiboHelpRender("' . $helpManager->Link('Library', 'Assign') . '")');
-        $response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=layout&layoutid=' . $layoutId . '&regionid=' . $regionId . '&q=RegionOptions")');
+        $response->AddButton(__('Help'), 'XiboHelpRender("' . HelpManager::Link('Library', 'Assign') . '")');
+        $response->AddButton(__('Cancel'), 'XiboSwapDialog("index.php?p=timeline&layoutid=' . $layoutId . '&regionid=' . $regionId . '&q=RegionOptions")');
         $response->AddButton(__('Assign'), 'LibraryAssignSubmit("' . $layoutId . '","' . $regionId . '")');
 
         $response->Respond();
@@ -298,73 +253,27 @@
         $response = new ResponseManager();
 
         //Input vars
-        $mediatype = Kit::GetParam('type', _POST, _STRING, 'all');
-        $name = Kit::GetParam('name', _POST, _STRING, 'all');
-
-        setSession('content', 'mediatype', $mediatype);
-        setSession('content', 'name', $name);
-
-        // query to get all media that is in the database ready to display
-        $SQL  = "";
-        $SQL .= "SELECT media.mediaID, ";
-        $SQL .= "       media.name, ";
-        $SQL .= "       media.type, ";
-        $SQL .= "       media.duration ";
-        $SQL .= "  FROM media ";
-        $SQL .= " WHERE retired = 0 AND isEdited = 0 ";
-
-        // Filter on media type
-        if($mediatype != 'all') 
-            $SQL.= sprintf(" AND media.type = '%s'", $mediatype);
-            
-        // Filter on name
-        if ($name != 'all') 
-        {
-            // convert into a space delimited array
-            $names = explode(' ', $name);
-
-            foreach($names as $searchName)
-            {
-                // Not like, or like?
-                if (substr($searchName, 0, 1) == '-')
-                    $SQL.= " AND  (media.name NOT LIKE '%" . sprintf('%s', ltrim($db->escape_string($searchName), '-')) . "%') ";
-                else
-                    $SQL.= " AND  (media.name LIKE '%" . sprintf('%s', $db->escape_string($searchName)) . "%') ";
-            }
-        }
-
-        $SQL .= " ORDER BY media.name ";
-
-        if(!$results = $db->query($SQL)) 
-        {
-            trigger_error($db->error());
-            trigger_error(__('Cannot get list of media in the library'), E_USER_ERROR);			
-        }
-
-        $response->html  = '<h3>' . __('Library') . '</h3>';
-        $response->html .= '<ul id="LibraryAvailableSortable" class="connectedSortable">';
-
-        // while loop
-        while ($row = $db->get_row($results)) 
-        {			
-            $mediaId = Kit::ValidateParam($row[0], _INT);
-            $media = Kit::ValidateParam($row[1], _STRING);
-            $mediatype = Kit::ValidateParam($row[2], _WORD);
-            $length = sec2hms(Kit::ValidateParam($row[3], _DOUBLE));
-            
-            // Permissions
-            $auth = $this->user->MediaAuth($mediaId, true);
-            
-            // Is this user allowed to see this
-            if ($auth->view) 
-                $response->html .= '<li class="li-sortable" id="MediaID_' . $mediaId . '">' . $media . ' (' . $mediatype . ') - Duration (sec): ' . $length . '</li>';
-        }
-
-        //table ending
-        $response->html .= '</ul>';
-
-        // Construct the Response
-        $response->success = true;
+        $mediatype = Kit::GetParam('filter_type', _POST, _STRING);
+        $name = Kit::GetParam('filter_name', _POST, _STRING);
+
+        // Get a list of media
+        $mediaList = $user->MediaList($mediatype, $name);
+
+        $rows = array();
+
+        // Add some extra information
+        foreach ($mediaList as $row) {
+
+            $row['duration_text'] = sec2hms($row['duration']);
+            $row['list_id'] = 'MediaID_' . $row['mediaid'];
+
+            $rows[] = $row;
+        }
+
+        Theme::Set('table_rows', $rows);
+
+        // Render the Theme
+        $response->SetGridResponse(Theme::RenderReturn('library_form_assign_list'));
         $response->callBack = 'LibraryAssignCallback';
         $response->Respond();
     }

=== modified file 'server/lib/pages/dashboard.class.php'
--- server/lib/pages/dashboard.class.php	2013-02-20 21:02:28 +0000
+++ server/lib/pages/dashboard.class.php	2013-04-11 16:56:27 +0000
@@ -34,7 +34,7 @@
 	function displayPage() 
 	{
 		// Render the Theme and output
-        Theme::Render('dashboard_page');
+        Theme::Render('homepage_dashboard');
 	}
 }
 ?>
\ No newline at end of file

=== modified file 'server/lib/pages/dataset.class.php'
--- server/lib/pages/dataset.class.php	2013-03-03 21:53:46 +0000
+++ server/lib/pages/dataset.class.php	2013-04-11 16:56:27 +0000
@@ -374,15 +374,15 @@
         if (!$auth->edit)
             trigger_error(__('Access Denied'));
 
-        $heading = Kit::GetParam('heading', _POST, _WORD);
+        $heading = Kit::GetParam('heading', _POST, _STRING);
         $listContent = Kit::GetParam('listcontent', _POST, _STRING);
         $columnOrder = Kit::GetParam('columnorder', _POST, _INT);
 
         $dataSetObject = new DataSetColumn($db);
-        if (!$dataSetObject->Add($dataSetId, $heading, 1, $listContent))
+        if (!$dataSetObject->Add($dataSetId, $heading, 1, $listContent, $columnOrder))
             trigger_error($dataSetObject->GetErrorMessage(), E_USER_ERROR);
 
-        $response->SetFormSubmitResponse(__('Column Edited'));
+        $response->SetFormSubmitResponse(__('Column Added'));
         $response->hideMessage = true;
         $response->loadForm = true;
         $response->loadFormUri = 'index.php?p=dataset&q=DataSetColumnsForm&datasetid=' . $dataSetId . '&dataset=' . $dataSet;
@@ -414,7 +414,7 @@
         if (!$row = $db->GetSingleRow($SQL))
             trigger_error(__('Unabled to get Data Column information'), E_USER_ERROR);
 
-        Theme::Set('heading',  Kit::ValidateParam($row['Heading'], _WORD));
+        Theme::Set('heading',  Kit::ValidateParam($row['Heading'], _STRING));
         Theme::Set('listcontent',  Kit::ValidateParam($row['ListContent'], _STRING));
         Theme::Set('columnorder',  Kit::ValidateParam($row['ColumnOrder'], _INT));
 
@@ -441,7 +441,7 @@
             trigger_error(__('Access Denied'));
             
         $dataSetColumnId = Kit::GetParam('datasetcolumnid', _POST, _INT);
-        $heading = Kit::GetParam('heading', _POST, _WORD);
+        $heading = Kit::GetParam('heading', _POST, _STRING);
         $listContent = Kit::GetParam('listcontent', _POST, _STRING);
         $columnOrder = Kit::GetParam('columnorder', _POST, _INT);
 

=== modified file 'server/lib/pages/group.class.php'
--- server/lib/pages/group.class.php	2013-02-24 18:52:30 +0000
+++ server/lib/pages/group.class.php	2013-04-11 16:56:27 +0000
@@ -291,7 +291,7 @@
 		
 		if ($db->num_rows($results) == 0) 
 		{
-			echo "";
+			echo '';
 			exit;
 		}
 		
@@ -305,7 +305,7 @@
 			$row['assigned'] = (($row['AssignedID'] == 1) ? Theme::Image('act.gif') : Theme::Image('disact.gif'));
 			$row['assignedid'] = $row['AssignedID'];
 			$row['checkbox_value'] = $row['AssignedID'] . ',' . $row['pagegroupID'];
-			$row['checkbox_ticked'] = (($row['AssignedID'] == 1) ? ' checked' : '');
+			$row['checkbox_ticked'] = '';
 			
 			$rows[] = $row;
 		}
@@ -552,7 +552,7 @@
 			$row['assigned'] = (($row['AssignedID'] == 1) ? Theme::Image('act.gif') : Theme::Image('disact.gif'));
 			$row['assignedid'] = $row['AssignedID'];
 			$row['checkbox_value'] = $row['AssignedID'] . ',' . $row['MenuItemID'];
-			$row['checkbox_ticked'] = (($row['AssignedID'] == 1) ? ' checked' : '');
+			$row['checkbox_ticked'] = '';
 			
 			$rows[] = $row;
 		}

=== modified file 'server/lib/pages/index.class.php'
--- server/lib/pages/index.class.php	2013-03-02 13:15:42 +0000
+++ server/lib/pages/index.class.php	2013-04-11 16:56:27 +0000
@@ -38,11 +38,10 @@
 		global $session;
 
 		//this page must be called from a form therefore we expect POST variables		
-		$username 		= Kit::GetParam('username', _POST, _USERNAME);
-		$password 		= Kit::GetParam('password', _POST, _PASSWORD);
-		$password		= md5($password);
+		$username = Kit::GetParam('username', _POST, _USERNAME);
+		$password = Kit::GetParam('password', _POST, _PASSWORD);
 		
-		$referingpage 	= Kit::GetParam('referingPage', _GET, _WORD);
+		$referingpage = Kit::GetParam('referingPage', _GET, _WORD);
 		
 		if (isset($_REQUEST['ajax'])) 
 		{
@@ -88,7 +87,6 @@
 				
 			setMessage($username . ' logged in');
 			$session->set_user(session_id(), $userid, 'user');
-			
 		}
 		
 		Debug::LogEntry($db, 'audit', 'Login with refering page: ' . $referingpage);
@@ -261,7 +259,7 @@
 		// Render the Theme and output
         $output = Theme::RenderReturn('about_text');
 		
-		$response->SetFormRequestResponse($output, __('About Xibo'), '500', '500');
+		$response->SetFormRequestResponse($output, __('About'), '500', '500');
 		$response->AddButton(__('Close'), 'XiboDialogClose()');
 		$response->Respond();
 	}

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2013-03-04 20:20:04 +0000
+++ server/lib/pages/layout.class.php	2013-04-11 16:56:27 +0000
@@ -104,7 +104,7 @@
 		        if (Kit::IsFilterPinned('layout', 'LayoutFilter')) {
 		            Theme::Set('filter_pinned', 'checked');
 		            Theme::Set('layout', Session::Get('layout', 'filter_layout'));
-		            Theme::Set('retired', Session::Get('layout', 'retired'));
+		            Theme::Set('retired', Session::Get('layout', 'filter_retired'));
 		            Theme::Set('filter_userid', Session::Get('layout', 'filter_userid'));
 		            Theme::Set('filter_tags', Session::Get('layout', 'filter_tags'));
 		        }
@@ -487,6 +487,7 @@
 		$backgroundColor    = (string) $xml['bgcolor'];
 		$width              = (string) $xml['width'];
 		$height             = (string) $xml['height'];
+		$resolutionid = (int)$xml['resolutionid'];
         $bgImageId          = 0;
 
         // Do we need to override the background with one passed in?
@@ -528,14 +529,16 @@
 		Theme::Set('background_color_list', gwsc());
 		
 		// Get the ID of the current resolution
-		$SQL = sprintf("SELECT resolutionID FROM resolution WHERE width = %d AND height = %d", $width, $height);
+		if ($resolutionid == 0) {
+			$SQL = sprintf("SELECT resolutionID FROM resolution WHERE width = %d AND height = %d", $width, $height);
+			
+			if (!$resolutionid = $db->GetSingleValue($SQL, 'resolutionID', _INT)) 
+			{
+				trigger_error($db->error());
+				trigger_error(__("Unable to get the Resolution information"), E_USER_ERROR);
+			}
+		}
 		
-		if (!$resolutionid = $db->GetSingleValue($SQL, 'resolutionID', _INT)) 
-		{
-			trigger_error($db->error());
-			trigger_error(__("Unable to get the Resolution information"), E_USER_ERROR);
-		}
-
 		Theme::Set('resolutionid', $resolutionid);
 		Theme::Set('resolution_field_list', $db->GetArray('SELECT resolutionid, resolution FROM resolution ORDER BY resolution'));
 		
@@ -591,8 +594,32 @@
 		$xml->loadXML($this->xml);
 		
 		// get the width and the height
+		$resolutionid = (int)$xml->documentElement->getAttribute('resolutionid');
 		$width 	= $xml->documentElement->getAttribute('width');
 		$height = $xml->documentElement->getAttribute('height');
+
+		// Get the display width / height
+		if ($resolutionid != 0) {
+			$SQL = sprintf("SELECT intended_width, intended_height FROM `resolution` WHERE resolutionid = %d", $resolutionid);
+		}
+		else {
+			$SQL = sprintf("SELECT intended_width, intended_height FROM `resolution`  WHERE width = %d AND height = %d", $width, $height);
+		}
+
+		if (!$resolution = $db->GetSingleRow($SQL)) {
+			trigger_error(__('Unable to determine display resolution'));
+
+			$intended_width = $width;
+			$intended_height = $height;
+		}
+		else {
+			$intended_width = $resolution['intended_width'];
+			$intended_height = $resolution['intended_height'];
+		}
+
+		// Work out the scaling factor for the tip
+		// _scaleFactor = Math.Min(_clientSize.Width / _layoutWidth, _clientSize.Height / _layoutHeight);
+		$scaleFactor = min($intended_width / $width, $intended_height / $height);
 		
 		// do we have a background? Or a background color (or both)
 		$bgImage = $xml->documentElement->getAttribute('background');
@@ -626,10 +653,10 @@
 		foreach ($regionNodeList as $region)
 		{
 			// get dimensions
-            $tipWidth       = $region->getAttribute('width');
-            $tipHeight      = $region->getAttribute('height');
-            $tipTop         = $region->getAttribute('top');
-            $tipLeft        = $region->getAttribute('left');
+            $tipWidth       = round($region->getAttribute('width') * $scaleFactor, 0);
+            $tipHeight      = round($region->getAttribute('height') * $scaleFactor, 0);
+            $tipTop         = round($region->getAttribute('top') * $scaleFactor, 0);
+            $tipLeft        = round($region->getAttribute('left') * $scaleFactor, 0);
 
 			$regionWidth 	= $region->getAttribute('width') . "px";
 			$regionHeight 	= $region->getAttribute('height') . "px";
@@ -650,7 +677,7 @@
 			$regionTransparency  = '<div class="regionTransparency ' . $regionAuthTransparency . '" style="width:100%; height:100%;"></div>';
 			$doubleClickLink = ($regionAuth->edit) ? "XiboFormRender($(this).attr('href'))" : '';
 
-			$regionHtml .= "<div id='region_$regionid' regionEnabled='$regionAuth->edit' regionid='$regionid' layoutid='$this->layoutid' href='index.php?p=timeline&layoutid=$this->layoutid&regionid=$regionid&q=Timeline' ondblclick=\"$doubleClickLink\"' class='$regionDisabledClass $regionPreviewClass' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft;\">
+			$regionHtml .= "<div id='region_$regionid' regionEnabled='$regionAuth->edit' regionid='$regionid' layoutid='$this->layoutid' scale='$scaleFactor' width='$regionWidth' height='$regionHeight' href='index.php?p=timeline&layoutid=$this->layoutid&regionid=$regionid&q=Timeline' ondblclick=\"$doubleClickLink\"' class='$regionDisabledClass $regionPreviewClass' style=\"position:absolute; width:$regionWidth; height:$regionHeight; top: $regionTop; left: $regionLeft;\">
 					  $regionTransparency";
                                           
 			if ($regionAuth->view)
@@ -731,7 +758,7 @@
         $copyMediaChecked = (Config::GetSetting($db, 'LAYOUT_COPY_MEDIA_CHECKB') == 'Checked') ? 'checked' : '';
 
         Theme::Set('form_id', 'LayoutCopyForm');
-        Theme::Set('form_url', 'index.php?p=layout&q=Copy');
+        Theme::Set('form_action', 'index.php?p=layout&q=Copy');
         Theme::Set('form_meta', '<input type="hidden" name="layoutid" value="' . $layoutid . '">');
         Theme::Set('copy_media_checked', $copyMediaChecked);
         Theme::Set('new_layout_default', $oldLayout . ' 2');

=== modified file 'server/lib/pages/log.class.php'
--- server/lib/pages/log.class.php	2013-03-04 20:20:04 +0000
+++ server/lib/pages/log.class.php	2013-04-11 16:56:27 +0000
@@ -54,23 +54,23 @@
             Theme::Set('filter_seconds', Session::Get('user', 'filter_seconds'));
         }
         else {
-            Theme::Set('filter_type', 0);
+            Theme::Set('filter_type', '0');
             Theme::Set('filter_seconds', 120);
-            Theme::Set('filter_page', 0);
-            Theme::Set('filter_function', 0);
+            Theme::Set('filter_page', '0');
+            Theme::Set('filter_function', '0');
 			Theme::Set('filter_display', 0);
         }
 
         // Lists
-        $types = array(array('typeid' => 0, 'type' => 'All'), array('typeid' => 'audit', 'type' => 'Audit'), array('typeid' => 'error', 'type' => 'Error'));
+        $types = array(array('typeid' => '0', 'type' => 'All'), array('typeid' => 'audit', 'type' => 'Audit'), array('typeid' => 'error', 'type' => 'Error'));
         Theme::Set('type_field_list', $types);
 
 		$pages = $db->GetArray("SELECT DISTINCT IFNULL(page, '-1') AS pageid, page FROM log ORDER BY 2");
-        array_unshift($pages, array('pageid' => 0, 'page' => 'All'));
+        array_unshift($pages, array('pageid' => '0', 'page' => 'All'));
         Theme::Set('page_field_list', $pages);
 
         $functions = $db->GetArray("SELECT DISTINCT IFNULL(function, '-1') AS functionid, function FROM log ORDER BY 2");
-        array_unshift($functions, array('functionid' => 0, 'function' => 'All'));
+        array_unshift($functions, array('functionid' => '0', 'function' => 'All'));
         Theme::Set('function_field_list', $functions);
 
         $displays = $db->GetArray('SELECT displayid, display FROM display WHERE licensed = 1 ORDER BY 2');

=== modified file 'server/lib/pages/mediamanager.class.php'
--- server/lib/pages/mediamanager.class.php	2011-10-05 20:05:31 +0000
+++ server/lib/pages/mediamanager.class.php	2013-04-11 16:56:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2011 Daniel Garner
+ * Copyright (C) 2011-2013 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -31,72 +31,32 @@
         $this->user =& $user;
     }
 
-    function on_page_load()
-    {
-        return "";
-    }
-
-    function echo_page_heading()
-    {
-        global $user;
-
-        $userid = Kit::GetParam('userid', _SESSION, _INT);
-        $uid 	= $user->getNameFromID($userid);
-
-        echo "$uid's " . __('Dashboard');
-        return true;
-    }
-
-    function displayPage()
+    public function displayPage()
     {
         $db =& $this->db;
-        $user =& $this->user;
-
-        include_once("template/pages/mediamanager.php");
-    }
-
-    public function MediaManagerFilter()
-    {
-        $msgLayout = __('Layout');
-        $msgRegion = __('Region');
-        $msgMedia = __('Media');
-        $msgMediaType = __('Type');
-
-        $modules = $this->db->GetArray("SELECT Module, Name FROM module WHERE Enabled = 1 ORDER BY 2", true);
-        $modules[] = array('Module' => 'all', 'Name' => 'All');
-
-        $mediaTypeList = Kit::SelectList('filterMediaType', $modules, 'Module', 'Name', 'all');
-
+        
+        // Default options
+        if (Kit::IsFilterPinned('mediamanager', 'Filter')) {
+            Theme::Set('filter_pinned', 'checked');
+            Theme::Set('filter_layout_name', Session::Get('mediamanager', 'filter_layout_name'));
+            Theme::Set('filter_region_name', Session::Get('mediamanager', 'filter_region_name'));
+            Theme::Set('filter_media_name', Session::Get('mediamanager', 'filter_media_name'));
+            Theme::Set('filter_type', Session::Get('mediamanager', 'filter_type'));
+        }
+        
         $id = uniqid();
-
-        $xiboGrid = <<<HTML
-        <div class="XiboGrid" id="$id">
-                <div class="XiboFilter">
-                        <form onsubmit="return false">
-				<input type="hidden" name="p" value="mediamanager">
-				<input type="hidden" name="q" value="MediaManagerGrid">
-                            <table class="mediamanager_filterform">
-                                <tr>
-                                    <td>$msgLayout</td>
-                                    <td><input type="text" name="filterLayout"></td>
-                                    <td>$msgMedia</td>
-                                    <td><input type="text" name="filterMediaName"></td>
-				</tr>
-                                <tr>
-                                    <td>$msgRegion</td>
-                                    <td><input type="text" name="filterRegion"></td>
-                                    <td>$msgMediaType</td>
-                                    <td>$mediaTypeList</td>
-				</tr>
-                            </table>
-                        </form>
-                </div>
-                <div class="XiboData">
-
-                </div>
-        </div>
-HTML;
-        echo $xiboGrid;
+        Theme::Set('id', $id);
+        Theme::Set('filter_id', 'XiboFilterPinned' . uniqid('filter'));
+        Theme::Set('pager', ResponseManager::Pager($id));
+        Theme::Set('form_meta', '<input type="hidden" name="p" value="mediamanager"><input type="hidden" name="q" value="MediaManagerGrid">');
+        
+        // Module types filter
+        $types = $db->GetArray("SELECT Module AS moduleid, Name AS module FROM `module` WHERE Enabled = 1 ORDER BY 2");
+        array_unshift($types, array('moduleid' => '', 'module' => 'All'));
+        Theme::Set('module_field_list', $types);
+
+        // Call to render the template
+        Theme::Render('homepage_mediamanager');
     }
 
     public function MediaManagerGrid()
@@ -105,40 +65,22 @@
         $user =& $this->user;
         $response = new ResponseManager();
 
-        $filterLayout = Kit::GetParam('filterLayout', _POST, _STRING);
-        $filterRegion = Kit::GetParam('filterRegion', _POST, _STRING);
-        $filterMediaName = Kit::GetParam('filterMediaName', _POST, _STRING);
-        $filterMediaType = Kit::GetParam('filterMediaType', _POST, _STRING);
+        $filterLayout = Kit::GetParam('filter_layout_name', _POST, _STRING);
+        $filterRegion = Kit::GetParam('filter_region_name', _POST, _STRING);
+        $filterMediaName = Kit::GetParam('filter_media_name', _POST, _STRING);
+        $filterMediaType = Kit::GetParam('filter_type', _POST, _STRING);
+
+        setSession('mediamanager', 'filter_layout_name', $filterLayout);
+        setSession('mediamanager', 'filter_region_name', $filterRegion);
+        setSession('mediamanager', 'filter_media_name', $filterMediaName);
+        setSession('mediamanager', 'filter_type', $filterMediaType);
+        setSession('mediamanager', 'Filter', Kit::GetParam('XiboFilterPinned', _REQUEST, _CHECKBOX, 'off'));
         
         // We would like a list of all layouts, media and media assignments that this user
         // has access to.
         $layouts = $user->LayoutList($filterLayout);
 
-        $msgLayout = __('Layout');
-        $msgRegion = __('Region');
-        $msgMedia = __('Media');
-        $msgMediaType = __('Type');
-        $msgSeq = __('Sequence');
-
-        $msgAction = __('Action');
-        $msgEdit = __('Edit');
-        $msgDelete = __('Delete');
-
-        $output = <<<END
-        <div class="info_table">
-        <table style="width:100%">
-            <thead>
-                <tr>
-                    <th>$msgLayout</th>
-                    <th>$msgRegion</th>
-                    <th>$msgMedia</th>
-                    <th>$msgMediaType</th>
-                    <th>$msgSeq</th>
-                    <th>$msgAction</th>
-                </tr>
-            </thead>
-            <tbody>
-END;
+        $rows = array();
 
         foreach ($layouts as $layout)
         {
@@ -146,8 +88,6 @@
             if (!$layout['edit'])
                 continue;
 
-            Debug::LogEntry($db, 'audit', 'Permission to edit layout ' . $layout['layout'], 'mediamanager', 'MediaManagerGrid');
-
             // Every layout this user has access to.. get the regions
             $layoutXml = new DOMDocument();
             $layoutXml->loadXML($layout['xml']);
@@ -174,15 +114,13 @@
                 if ($filterRegion != '' && !stristr($regionName, $filterRegion))
                     continue;
 
-                Debug::LogEntry($db, 'audit', 'Permissions granted for ' . $regionId . ' owned by ' . $ownerId, 'mediamanager', 'MediaManagerGrid');
-
                 // Media
                 $xpath = new DOMXPath($layoutXml);
-		$mediaNodes = $xpath->query("//region[@id='$regionId']/media");
+                $mediaNodes = $xpath->query("//region[@id='$regionId']/media");
                 $mediaNodeSequence = 0;
 
-		foreach ($mediaNodes as $mediaNode)
-		{
+        		foreach ($mediaNodes as $mediaNode)
+        		{
                     $mediaId = $mediaNode->getAttribute('id');
                     $lkId = $mediaNode->getAttribute('lkid');
                     $mediaOwnerId = ($mediaNode->getAttribute('userId') == '') ? $layout['ownerid'] : $mediaNode->getAttribute('userId');
@@ -202,30 +140,35 @@
                     if ($filterMediaName != '' && !stristr($mediaName, $filterMediaName))
                         continue;
 
-                            Debug::LogEntry($db, 'audit', $filterMediaType . ' ' . $mediaType);
-
-                    if ($filterMediaType != 'all' && $mediaType != strtolower($filterMediaType))
+                    if ($filterMediaType != '' && $mediaType != strtolower($filterMediaType))
                         continue;
                     
-                    $editLink = '<button class="XiboFormButton" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=EditForm&showRegionOptions=0&layoutid=' . $layout['layoutid'] . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '">' . $msgEdit . '</button>';
                     $mediaNodeSequence++;
 
-                    $output .= '<tr>';
-                    $output .= '    <td>' . $layout['layout'] . '</td>';
-                    $output .= '    <td>' . $regionName . '</td>';
-                    $output .= '    <td>' . $mediaName . '</td>';
-                    $output .= '    <td>' . $mediaType . '</td>';
-                    $output .= '    <td>' . $mediaNodeSequence . '</td>';
-                    $output .= '    <td>' . $editLink . '</td>';
-                    $output .= '</tr>';
+                    $layout['region'] = $regionName;
+                    $layout['media'] = $mediaName;
+                    $layout['mediatype'] = $mediaType;
+                    $layout['seq'] = $mediaNodeSequence;
+                    $layout['buttons'] = array();
+
+                    // Edit
+                    $layout['buttons'][] = array(
+                            'id' => 'homepage_mediamanager_edit_button',
+                            'url' => 'index.php?p=module&mod=' . $mediaType . '&q=Exec&method=EditForm&showRegionOptions=0&layoutid=' . $layout['layoutid'] . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId,
+                            'text' => __('Edit')
+                        );
+
+                    $rows[] = $layout;
                 }
             }
         }
 
-        $output .= '</tbody></table></div>';
+        Theme::Set('table_rows', $rows);
+        
+        $output = Theme::RenderReturn('homepage_mediamanager_grid');
 
         $response->SetGridResponse($output);
         $response->Respond();
     }
 }
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/pages/module.class.php'
--- server/lib/pages/module.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/pages/module.class.php	2013-04-11 16:56:27 +0000
@@ -213,6 +213,7 @@
         $validExtensions = Kit::GetParam('ValidExtensions', _POST, _STRING, '');
         $imageUri = Kit::GetParam('ImageUri', _POST, _STRING);
         $enabled = Kit::GetParam('Enabled', _POST, _CHECKBOX);
+        $previewEnabled = Kit::GetParam('PreviewEnabled', _POST, _CHECKBOX);
 
         // Validation
         if ($moduleId == 0 || $moduleId == '')
@@ -222,8 +223,8 @@
             trigger_error(__('Image Uri is a required field.'), E_USER_ERROR);
 
         // Deal with the Edit
-        $SQL = "UPDATE `module` SET ImageUri = '%s', ValidExtensions = '%s', Enabled = %d WHERE ModuleID = %d";
-        $SQL = sprintf($SQL, $db->escape_string($imageUri), $db->escape_string($validExtensions), $enabled, $moduleId);
+        $SQL = "UPDATE `module` SET ImageUri = '%s', ValidExtensions = '%s', Enabled = %d, PreviewEnabled = %d WHERE ModuleID = %d";
+        $SQL = sprintf($SQL, $db->escape_string($imageUri), $db->escape_string($validExtensions), $enabled, $previewEnabled, $moduleId);
 
         if (!$db->query($SQL))
         {

=== modified file 'server/lib/pages/oauth.class.php'
--- server/lib/pages/oauth.class.php	2013-03-02 10:30:43 +0000
+++ server/lib/pages/oauth.class.php	2013-04-11 16:56:27 +0000
@@ -115,9 +115,9 @@
 
         foreach($list as $row)
         {
-            $row['received'] = Kit::ValidateParam($logEntry['received'], _STRING);
-            $row['notes'] = Kit::ValidateParam($logEntry['notes'], _STRING);
-            $row['timestamp'] = Kit::ValidateParam($logEntry['timestamp'], _STRING);
+            $row['received'] = Kit::ValidateParam($row['received'], _STRING);
+            $row['notes'] = Kit::ValidateParam($row['notes'], _STRING);
+            $row['timestamp'] = Kit::ValidateParam($row['timestamp'], _STRING);
 
             $rows[] = $row;
         }
@@ -263,16 +263,16 @@
 
         foreach ($list as $app)
         {
-            $row['application_title'] = Kit::ValidateParam($app['application_title'], _STRING);
-            $row['enabled'] = Kit::ValidateParam($app['enabled'], _STRING);
-            $row['status'] = Kit::ValidateParam($app['status'], _STRING);
+            $app['application_title'] = Kit::ValidateParam($app['application_title'], _STRING);
+            $app['enabled'] = Kit::ValidateParam($app['enabled'], _STRING);
+            $app['status'] = Kit::ValidateParam($app['status'], _STRING);
 
             $rows[] = $app;
         }
 
         Theme::Set('table_rows', $rows);
 
-        $output = Theme::RenderReturn('applications_form_view_log');
+        $output = Theme::RenderReturn('application_form_user_applications');
 
         $response->SetFormRequestResponse($output, __('Authorized applications for user'), '650', '450');
         $response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Schedule&Category=General')");

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/pages/schedule.class.php	2013-04-11 16:56:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner
+ * Copyright (C) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -26,42 +26,71 @@
     private $user;
     
     private $lastEventID;
-        private $eventsList;
+    private $eventsList;
 
     /**
      * Constructor
-     * @return 
-     * @param $db Object
      */
     function __construct(database $db, user $user) 
     {
-        $this->db           =& $db;
-        $this->user         =& $user;
+        $this->db =& $db;
+        $this->user =& $user;
         
         require_once('lib/data/schedule.data.class.php');
                 
         return true;
     }
-    
-    function on_page_load() 
-    {
-        return '';
-    }
-    
-    function echo_page_heading() 
-    {
-        echo 'Schedule';
-        return true;
-    }
-    
+
     function displayPage() 
     {
         $db     =& $this->db;
-        $user   =& $this->user;
-        
-        include_once("template/pages/schedule_view.php");
-        
-        return false;
+        
+        // Configure the theme
+        $id = uniqid();
+        Theme::Set('id', $id);
+        Theme::Set('form_meta', '<input type="hidden" name="p" value="schedule"><input type="hidden" name="q" value="DisplayList">');
+        Theme::Set('filter_id', 'XiboFilterPinned' . uniqid('filter'));
+        Theme::Set('pager', ResponseManager::Pager($id));
+
+        // Render the Theme and output
+        Theme::Render('schedule_page');
+    }
+    
+    /**
+     * Shows a list of displays
+     */
+    public function DisplayList()
+    {
+        $user =& $this->user;
+
+        $response = new ResponseManager();
+        $displayGroupIDs = Kit::GetParam('DisplayGroupIDs', _SESSION, _ARRAY);
+
+        // Build 2 lists
+        $groups = array();
+        $displays = array();
+
+        foreach ($user->DisplayGroupList() as $display) {
+
+            $display['checked_text'] = (in_array($display['displaygroupid'], $displayGroupIDs)) ? 'checked' : '';
+
+            if ($display['isdisplayspecific'] == 1) {
+                $displays[] = $display;
+            }
+            else {
+                $groups[] = $display;
+            }
+        }
+
+        Theme::Set('id', 'DisplayList');
+        Theme::Set('group_list_items', $groups);
+        Theme::Set('display_list_items', $displays);
+
+        $output = Theme::RenderReturn('schedule_page_display_list');
+
+        $response->SetGridResponse($output);
+        $response->callBack = 'DisplayListRender';
+        $response->Respond();
     }
     
     /**
@@ -74,7 +103,7 @@
         $displayGroupIDs    = Kit::GetParam('DisplayGroupIDs', _GET, _ARRAY);
         
         // if we have some displaygroupids then add them to the session info so we can default everything else.
-                Session::Set('DisplayGroupIDs', $displayGroupIDs);
+        Session::Set('DisplayGroupIDs', $displayGroupIDs);
         
         if ($view == 'month')
         {
@@ -1015,56 +1044,7 @@
         return $events;
     }
     
-    /**
-     * Shows a list of display groups and displays
-     * @return 
-     */
-    public function DisplayFilter()
-    {
-        $db             =& $this->db;
-        $user           =& $this->user;
-        
-        $filterForm = <<<END
-        <div id="DisplayListFilter">
-            <form onsubmit="return false">
-                <input type="hidden" name="p" value="schedule">
-                <input type="hidden" name="q" value="DisplayList">
-                <input class="DisplayListInput" type="text" name="name" />
-            </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;
-    }
     
-    /**
-     * Shows a list of displays
-     * @return 
-     */
-    public function DisplayList()
-    {
-        $response = new ResponseManager();
-        $displayGroupIDs = Kit::GetParam('DisplayGroupIDs', _SESSION, _ARRAY);
-        $output = '';
-        $output .= '<div id="checkAllForDisplayList" class="scheduleFormCheckAll"><label for="checkAll">' . __('Check All') . '</label><input type="checkbox" name="checkAll"></div>';
-        $output .= $this->UnorderedListofDisplays(true, $displayGroupIDs);
-
-        $response->SetGridResponse($output);
-        $response->callBack = 'DisplayListRender';
-        $response->Respond();
-    }
     
     /**
      * Outputs an unordered list of displays optionally with a form
@@ -1431,7 +1411,7 @@
         <tr>
             <td><label for="rec_range" title="When should this event stop repeating?">Until</label></td>
             <td>$rec_range
-                <input id="repeatTime" type="text" size="12" name="repeatTime" value="00:00" />
+                <input id="repeatTime" class="time-pick" type="text" size="12" name="repeatTime" value="00:00" />
             </td>
         </tr>
 END;
@@ -1578,7 +1558,7 @@
         <tr>
             <td><label for="rec_range" title="When should this event stop repeating?">Until</label></td>
             <td>$rec_range
-                <input id="repeatTime" type="text" size="12" name="repeatTime" value="$recToDtText" />
+                <input id="repeatTime" class="time-pick" type="text" size="12" name="repeatTime" value="$recToTimeText" />
             </td>
         </tr>
 END;
@@ -1630,16 +1610,15 @@
         Debug::LogEntry($db, 'audit', 'To DT: ' . $toDT);
         
         // Validate the times
-        if (!strstr($fromTime, ':') || !strstr($toTime, ':'))
-        {
+        $regEx = '/([01]?[0-9]|2[0-3]):([0-5][0-9])/';
+        if (!preg_match($regEx, $fromTime) || !preg_match($regEx, $toTime) || ($repeatTime != '' && !preg_match($regEx, $repeatTime)))
             trigger_error(__('Times must be in the format 00:00'), E_USER_ERROR);
-        }
         
         $fromDT     = $datemanager->GetDateFromUS($fromDT, $fromTime);
         $toDT       = $datemanager->GetDateFromUS($toDT, $toTime);
 
-                if ($recToDT != '')
-                    $recToDT = $datemanager->GetDateFromUS($recToDT, $repeatTime);
+        if ($recToDT != '')
+            $recToDT = $datemanager->GetDateFromUS($recToDT, $repeatTime);
         
         // Validate layout
         if ($campaignId == 0)
@@ -1719,10 +1698,9 @@
         Debug::LogEntry($db, 'audit', 'To DT: ' . $toDT);
         
         // Validate the times
-        if (!strstr($fromTime, ':') || !strstr($toTime, ':'))
-        {
+        $regEx = '/([01]?[0-9]|2[0-3]):([0-5][0-9])/';
+        if (!preg_match($regEx, $fromTime) || !preg_match($regEx, $toTime) || ($repeatTime != '' && !preg_match($regEx, $repeatTime)))
             trigger_error(__('Times must be in the format 00:00'), E_USER_ERROR);
-        }
         
         $fromDT     = $datemanager->GetDateFromUS($fromDT, $fromTime);
         $toDT       = $datemanager->GetDateFromUS($toDT, $toTime);

=== modified file 'server/lib/pages/template.class.php'
--- server/lib/pages/template.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/pages/template.class.php	2013-04-11 16:56:27 +0000
@@ -61,9 +61,9 @@
         
         // Field list for a "retired" dropdown list
         Theme::Set('is_system_field_list', array(
-                    array('is_systemid' => '-1', 'is_system' => 'All'), 
-                    array('is_systemid' => '1', 'is_system' => 'Yes'),
-                    array('is_systemid' => '0', 'is_system' => 'No')
+                    array('is_systemid' => -1, 'is_system' => 'All'), 
+                    array('is_systemid' => 1, 'is_system' => 'Yes'),
+                    array('is_systemid' => 0, 'is_system' => 'No')
                 )
             );
 

=== modified file 'server/lib/pages/timeline.class.php'
--- server/lib/pages/timeline.class.php	2013-02-16 15:03:26 +0000
+++ server/lib/pages/timeline.class.php	2013-04-11 16:56:27 +0000
@@ -122,12 +122,13 @@
 
         $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);
+        $top 	= Kit::GetParam('top', _GET, _DOUBLE);
+        $left 	= Kit::GetParam('left', _GET, _DOUBLE);
+        $width 	= Kit::GetParam('width', _GET, _DOUBLE);
+        $height 	= Kit::GetParam('height', _GET, _DOUBLE);
         $layoutWidth = Kit::GetParam('layoutWidth', _GET, _INT);
         $layoutHeight = Kit::GetParam('layoutHeight', _GET, _INT);
+        $scale = Kit::GetParam('scale', _GET, _DOUBLE);
 
         Kit::ClassLoader('region');
         $region = new region($db);
@@ -137,18 +138,30 @@
         $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutid, $regionid, true);
         if (!$regionAuth->edit)
             trigger_error(__('You do not have permissions to edit this region'), E_USER_ERROR);
+
+        // Scale the layout width/height
+        $layoutWidth = round($layoutWidth * $scale, 0);
+        $layoutHeight = round($layoutHeight * $scale, 0);
+
+        // Set some information about the form
+        Theme::Set('form_id', 'RegionProperties');
+        Theme::Set('form_action', 'index.php?p=timeline&q=ManualRegionPosition');
+        Theme::Set('form_meta', '<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 . '"><input type="hidden" name="scale" value="' . $scale .'">');
         
-        // Include some logic for the region exit transition?
-        $transition = $region->GetOption($layoutid, $regionid, 'transOut', '');
-        $duration = $region->GetOption($layoutid, $regionid, 'transOutDuration', 0);
-        $direction = $region->GetOption($layoutid, $regionid, 'transOutDirection', '');
+        // Theme Variables
+        Theme::Set('width', round($width * $scale, 0));
+        Theme::Set('height', round($height * $scale, 0));
+        Theme::Set('top', round($top * $scale, 0));
+        Theme::Set('left', round($left * $scale, 0));
+        Theme::Set('transition', $region->GetOption($layoutid, $regionid, 'transOut', ''));
+        Theme::Set('duration', $region->GetOption($layoutid, $regionid, 'transOutDuration', 0));
+        Theme::Set('direction', $region->GetOption($layoutid, $regionid, 'transOutDirection', ''));
         
         // Add none to the list
         $transitions = $this->user->TransitionAuth('out');
         $transitions[] = array('code' => '', 'transition' => 'None', 'class' => '');
-        
-        // Prepare a list of options
-        $transitionDropdown = Kit::SelectList('transitionType', $transitions, 'code', 'transition', $transition, '', 'class');
+
+        Theme::Set('transition_field_list', $transitions);
         
         // Compass points for direction
         $compassPoints = array(
@@ -161,60 +174,18 @@
             array('id' => 'W', 'name' => __('West')),
             array('id' => 'NW', 'name' => __('North West'))
         );
-        
-        // Prepare a list of compass points
-        $directionDropdown = Kit::SelectList('transitionDirection', $compassPoints, 'id', 'name', $direction);
-        
-        // Some messages for the form
-        $msgTransition = __('What transition should be applied when this region is finished?');
-        $msgDuration = __('The duration for this transition, in milliseconds.');
-        $msgDirection = __('The direction for this transtion.');
-        
-        // Construct the form
-        $form = <<<END
-            <form id="RegionProperties" 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="name" title="Name of the Region">Name</label></td>
-                        <td><input name="name" type="text" id="name" value="$regionName" tabindex="1" /></td>
-                    </tr>
-                    <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="2" /></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="3" /></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="4" /></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="5" /></td>
-                    </tr>
-                    <tr>
-                        <td><label for="tranisitionType" title="$msgTransition">$msgTransition</label></td>
-                        <td>$transitionDropdown</td>
-                    </tr>
-                    <tr class="transitionDuration">
-                        <td><label for="transitionDuration">$msgDuration</label></td>
-                        <td><input type="text" class="numeric" name="transitionDuration" id="transitionDuration" value="$duration" /></td>
-                    </tr>
-                    <tr class="transitionDirection">
-                        <td><label for="transitionDirection">$msgDirection</label></td>
-                        <td>$directionDropdown</td>
-                    </tr>
-                </table>
-            </form>
-END;
-
-        $response->SetFormRequestResponse($form, __('Manual Region Positioning'), '350px', '275px', 'transitionFormLoad');
+
+        Theme::Set('direction_field_list', $compassPoints);
+
+        if (count($this->user->TransitionAuth('out')) > 0) {
+            $form = Theme::RenderReturn('region_form_options');
+        }
+        else {
+            $form = Theme::RenderReturn('region_form_options_no_transition');
+        }
+
+        
+        $response->SetFormRequestResponse($form, __('Region Options'), '350px', '275px', 'transitionFormLoad');
         $response->AddButton(__('Cancel'), 'XiboDialogClose()');
         $response->AddButton(__('Save'), '$("#RegionProperties").submit()');
         $response->AddButton(__('Set Full Screen'), 'setFullScreenLayout()');
@@ -234,6 +205,13 @@
         $left       = Kit::GetParam('left', _POST, _INT);
         $width      = Kit::GetParam('width', _POST, _INT);
         $height 	= Kit::GetParam('height', _POST, _INT);
+        $scale = Kit::GetParam('scale', _POST, _DOUBLE);
+
+        // Adjust the dimensions
+        $top = $top / $scale;
+        $left = $left / $scale;
+        $width = $width / $scale;
+        $height = $height / $scale;
         
         // Transitions?
         $transitionType = Kit::GetParam('transitionType', _POST, _WORD);
@@ -344,7 +322,7 @@
 
         //we can delete
         $form = <<<END
-        <form id="RegionDeleteForm" class="XiboForm" method="post" action="index.php?p=layout&q=DeleteRegion">
+        <form id="RegionDeleteForm" class="XiboForm" method="post" action="index.php?p=timeline&q=DeleteRegion">
                 <input type="hidden" name="layoutid" value="$layoutid">
                 <input type="hidden" name="regionid" value="$regionid">
                 <p>$msgDelete $msgDelete2</p>
@@ -445,7 +423,7 @@
         // We want to load a new form
         $response->SetFormSubmitResponse(sprintf(__('%d Media Items Assigned'), count($mediaList)));
         $response->loadForm = true;
-        $response->loadFormUri = "index.php?p=layout&layoutid=$layoutId&regionid=$regionId&q=RegionOptions";
+        $response->loadFormUri = "index.php?p=timeline&layoutid=$layoutId&regionid=$regionId&q=Timeline";
         $response->Respond();
     }
 
@@ -554,7 +532,7 @@
             trigger_error(__("You do not have permissions to edit this regions permissions"), E_USER_ERROR);
 
         // Form content
-        $form = '<form id="RegionPermissionsForm" class="XiboForm" method="post" action="index.php?p=layout&q=RegionPermissions">';
+        $form = '<form id="RegionPermissionsForm" class="XiboForm" method="post" action="index.php?p=timeline&q=RegionPermissions">';
 	$form .= '<input type="hidden" name="layoutid" value="' . $layoutid . '" />';
 	$form .= '<input type="hidden" name="regionid" value="' . $regionid . '" />';
         $form .= '<div class="dialog_table">';
@@ -624,7 +602,7 @@
         $region = new region($db);
         $ownerId = $region->GetOwnerId($layoutId, $regionId);
 
-        $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutid, $regionId, true);
+        $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutId, $regionId, true);
         if (!$regionAuth->modifyPermissions)
             trigger_error(__('You do not have permissions to edit this regions permissions'), E_USER_ERROR);
 
@@ -748,7 +726,7 @@
 
             $response->html .= '<li class="timelineModuleListItem">';
             $response->html .= '    <a class="XiboFormButton timelineModuleButtonAnchor" title="' . $title . '" href="' . $uri . '">';
-            $response->html .= '        <img class="timelineModuleButtonImage" src="' . $img . '" alt="' . __('Module Image') . '" />';
+            $response->html .= Theme::Image($img, 'timelineModuleButtonImage');
             $response->html .= '        <span class="timelineModuleButtonText">' . $caption . '</span>';
             $response->html .= '    </a>';
             $response->html .= '</li>';
@@ -829,9 +807,11 @@
             if ($auth->modifyPermissions)
                 $response->html .= '<li><a class="XiboFormButton timelineMediaBarLink" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=PermissionsForm&layoutid=' . $layoutId . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '" title="Click to change permissions for this media">' . __('Permissions') . '</a></li>';
 
-            $response->html .= '<li><a class="XiboFormButton timelineMediaBarLink" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=TransitionEditForm&type=in&layoutid=' . $layoutId . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '" title="' . __('Click to edit this transition') . '">' . __('In Transition') . '</a></li>';
-            $response->html .= '<li><a class="XiboFormButton timelineMediaBarLink" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=TransitionEditForm&type=out&layoutid=' . $layoutId . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '" title="' . __('Click to edit this transition') . '">' . __('Out Transition') . '</a></li>';
-
+            if (count($this->user->TransitionAuth('in')) > 0)
+                $response->html .= '<li><a class="XiboFormButton timelineMediaBarLink" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=TransitionEditForm&type=in&layoutid=' . $layoutId . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '" title="' . __('Click to edit this transition') . '">' . __('In Transition') . '</a></li>';
+            
+            if (count($this->user->TransitionAuth('out')) > 0)
+                $response->html .= '<li><a class="XiboFormButton timelineMediaBarLink" href="index.php?p=module&mod=' . $mediaType . '&q=Exec&method=TransitionEditForm&type=out&layoutid=' . $layoutId . '&regionid=' . $regionId . '&mediaid=' . $mediaId . '&lkid=' . $lkId . '" title="' . __('Click to edit this transition') . '">' . __('Out Transition') . '</a></li>';
             
             $response->html .= '        </ul>';
 

=== modified file 'server/lib/pages/user.class.php'
--- server/lib/pages/user.class.php	2013-03-02 12:38:40 +0000
+++ server/lib/pages/user.class.php	2013-04-11 16:56:27 +0000
@@ -666,7 +666,6 @@
         // Set some information about the form
         Theme::Set('form_id', 'ChangePasswordForm');
         Theme::Set('form_action', 'index.php?p=user&q=ChangePassword');
-        Theme::Set('form_meta', '<input type="hidden" name="UserId" value="' . $userId . '" />');
 
         $form = Theme::RenderReturn('user_form_change_password');
 
@@ -717,7 +716,7 @@
 
         $form = Theme::RenderReturn('user_form_set_password');
 
-        $response->SetFormRequestResponse($form, __('Change Password'), '450', '300');
+        $response->SetFormRequestResponse($form, __('Set Password'), '450', '300');
         $response->AddButton(__('Help'), 'XiboHelpRender("' . HelpManager::Link('User', 'SetPassword') . '")');
         $response->AddButton(__('Close'), 'XiboDialogClose()');
         $response->AddButton(__('Save'), '$("#SetPasswordForm").submit()');
@@ -735,7 +734,7 @@
         $newPassword = Kit::GetParam('newPassword', _POST, _STRING);
         $retypeNewPassword = Kit::GetParam('retypeNewPassword', _POST, _STRING);
 
-        $userId = Kit::GetParam('userId', _GET, _INT);
+        $userId = Kit::GetParam('UserId', _POST, _INT);
         
         // Check we are an admin
         if ($this->user->usertypeid != 1)

=== modified file 'server/lib/service/service.wsdl'
--- server/lib/service/service.wsdl	2011-09-01 20:42:49 +0000
+++ server/lib/service/service.wsdl	2013-04-11 16:56:27 +0000
@@ -102,7 +102,7 @@
     </message>
     <portType name="xmdsPortType">
         <operation name="RegisterDisplay">
-            <documentation>Registered the Display on the Xibo Network</documentation>
+            <documentation>Register the Display with the CMS</documentation>
             <input message="tns:RegisterDisplayRequest"/>
             <output message="tns:RegisterDisplayResponse"/>
         </operation>

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2013-03-04 22:01:30 +0000
+++ server/lib/service/xmdssoap.class.php	2013-04-11 16:56:27 +0000
@@ -59,7 +59,7 @@
 
 	// Make sure we are talking the same language
 	if (!$this->CheckVersion($version))
-            throw new SoapFault('Sender', 'Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk');
+            throw new SoapFault('Sender', 'Your client is not of the correct version for communication with this server.');
 
 	Debug::LogEntry($db, "audit", "[IN]", "xmds", "RegisterDisplay");
 	Debug::LogEntry($db, "audit", "serverKey [$serverKey], hardwareKey [$hardwareKey], displayName [$displayName]", "xmds", "RegisterDisplay");
@@ -144,7 +144,7 @@
 
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
-            throw new SoapFault('Sender', 'Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk');
+            throw new SoapFault('Sender', 'Your client is not of the correct version for communication with this server.');
 
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
@@ -403,7 +403,7 @@
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
         {
-            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
         }
 
         // Make sure we are sticking to our bandwidth limit
@@ -485,7 +485,7 @@
 
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
-            throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server.");
 
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
@@ -615,7 +615,7 @@
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
         {
-                throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+                throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.", $serverKey);
         }
 
         // Make sure we are sticking to our bandwidth limit
@@ -699,7 +699,7 @@
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
         {
-            throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server.");
         }
 
         // Make sure we are sticking to our bandwidth limit
@@ -815,7 +815,7 @@
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
         {
-            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
         }
 
         // Make sure we are sticking to our bandwidth limit
@@ -909,7 +909,7 @@
 
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
-            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
 
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
@@ -981,7 +981,7 @@
 
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
-            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
 
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
@@ -989,9 +989,7 @@
 
         // Auth this request...
         if (!$this->AuthDisplay($hardwareKey))
-        {
             throw new SoapFault('Receiver', "This display client is not licensed");
-        }
 
         // What type of module is this?
         Kit::ClassLoader('region');
@@ -1001,6 +999,11 @@
         if ($type == '')
             throw new SoapFault('Receiver', 'Unable to get the media node type');
 
+        // Dummy User Object
+        $user = new User($db);
+        $user->userid = 0;
+        $user->usertypeid = 1;
+
         // Get the resource from the module
         require_once('modules/' . $type . '.module.php');
         $module = new $type($db, $user, $mediaId, $layoutId, $regionId);
@@ -1053,7 +1056,7 @@
             $msgTo    = Kit::ValidateParam(Config::GetSetting($db, "mail_to"),_PASSWORD);
             $msgFrom  = Kit::ValidateParam(Config::GetSetting($db, "mail_from"),_PASSWORD);
 
-            $subject  = sprintf(__("Xibo Recovery for Display %s"),$row[7]);
+            $subject  = sprintf(__("Recovery for Display %s"),$row[7]);
             $body     = sprintf(__("Display %s with ID %d is now back online."), $row[7], $row[3]);
 
             Kit::SendEmail($msgTo, $msgFrom, $subject, $body);

=== modified file 'server/maintenance.php'
--- server/maintenance.php	2012-04-12 06:41:56 +0000
+++ server/maintenance.php	2013-04-11 16:56:27 +0000
@@ -93,10 +93,9 @@
 print '<html>';
 print '  <head>';
 print '    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
-print '    <title>Xibo Open Source Digital Signage - Maintenance</title>';
+print '    <title>Open Source Digital Signage - Maintenance</title>';
 print '  </head>';
 print '<body>';
-print '  <!-- Copyright 2010 - Alex Harrington, part of Xibo Open Source Digital Signage -->';
 
 // Should the Scheduled Task script be running at all?
 if(Config::GetSetting($db, "MAINTENANCE_ENABLED")=="Off")
@@ -195,7 +194,7 @@
                 {
                     if ((($email_alert == 1) && $alwaysAlert) || (($loggedin == 1) && ($email_alert == 1)))
                     {
-                        $subject  = sprintf(__("Xibo Email Alert for Display %s"),$display_name);
+                        $subject  = sprintf(__("Email Alert for Display %s"),$display_name);
                         $body     = sprintf(__("Display %s with ID %d was last seen at %s."),$display_name,$displayid,$last_seen);
 
                         if (Kit::SendEmail($msgTo, $msgFrom, $subject, $body))

=== added directory 'server/manual'
=== added directory 'server/manual/content'
=== added directory 'server/manual/content/admin'
=== added file 'server/manual/content/admin/advanced.php'
--- server/manual/content/admin/advanced.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/advanced.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+		<link rel=stylesheet type="text/css" href="../../css/doc.css">
+		<meta http-equiv="Content-Type" content="text/html" />
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+
+		<link href="img/favicon.ico" rel="shortcut icon"/>
+		<!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+	</head>
+	<body>
+
+		<h1>Advanced</h1>
+		<p>The Advanced page is mainly used by system administrator to help troubleshooting system problem or reporting fault 
+		to the <?php echo PRODUCT_NAME; ?> xstreamedia team for assistance</p>
+    	<p>Click Advanced from the Navigation Bar. System loads the Log page by default.</p>
+
+ 	<blockquote>
+  		<a name="Error_Log_Help" id="Error_Log_Help"></a><h3>System Log</h3>
+		 
+    	<p><img alt="SA Advanced" src="sa_advanced.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="803" height="161"></p>
+
+    	<p>The system log is used to help troubleshoot problems with <?php echo PRODUCT_NAME; ?>. When you encounter an error it will be logged
+    	and listed in the system here. These error messages can help the xstreamedia team solve your problem.</p>
+   	 	<p>Truncating the log helps you to troubleshoot a problem by clearing the current error messages</p>
+    	<p>The page and sub page items helps locate where the error has been generated from.</p>
+    	<ul>
+    		<li><strong>Log Date</strong><p> states the date and time the error message was logged.</p></li>
+    		<li><strong>Page</strong><p> states the page that the error has been generated from.</p></li>
+    		<li><strong>Function</strong><p>state function that the error message has been generated from.</p></li>
+    		<li><strong>Message</strong><p> gives details of what error has occurred in the system.</p></li>
+    	</ul>
+   		<a name="Session" id="Session"></a><h3>Sessions</h3>
+   		<p>Sessions provide details of the current user activity on the network</p>
+    	<p><img alt="SA Advanced Session" src="sa_advanced_sessions.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="805" height="208"></p>
+
+   		<a name="Report_Fault" id="Report_Fault"></a><h3>Report Fault</h3>
+   		<p>Simple instruaction on the collection of system error and report fault to <?php echo PRODUCT_NAME; ?> xsteamedia team.</p>
+
+   		<a name="License" id="License"></a><h3>License Information</h3>
+   		<p>The license page provides details of all the relevant licenses for the system.</p>
+ </blockquote>
+
+		<?php include('../../template/footer.php'); ?>
+	</body>
+</html>

=== added file 'server/manual/content/admin/api.php'
--- server/manual/content/admin/api.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,396 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+		<link rel=stylesheet type="text/css" href="../../css/doc.css">
+		<meta http-equiv="Content-Type" content="text/html" />
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+
+		<link href="img/favicon.ico" rel="shortcut icon"/>
+		<!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+	</head>
+	<body>
+	<h1><?php echo PRODUCT_NAME; ?> API</h1>
+
+    <p><img alt="SA <?php echo PRODUCT_NAME; ?> API" src="sa_api.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="805" height="149"></p>
+
+    <a name="Authorization" id="Authorization"></a><h2>Authorization</h2>
+    <p>OAuth will be used to provide authorization for access to the <?php echo PRODUCT_NAME; ?> API.</p>
+ 
+<blockquote>    
+    <a name="OAuth_Information" id="OAuth_Information"></a><h3>OAuth Information</h3>
+    <p>Service location: services.php</p>
+    <p>OAuth methods:</p>
+
+    <ul>
+	    <li> XRDS: services.php?xrds</li>
+	    <li> Request Token: services.php?service=oauth&amp;method=request_token</li>
+	    <li> Authorize Token: index.php?p=oauth&amp;q=authorize</li>
+	    <li> Access Token: services.php?service=oauth&amp;method=access_token</li>
+    </ul>
+
+    <a name="XRDS" id="XRDS"></a><h3>XRDS</h3>
+    <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+      &lt;XRDS xmlns="xri://$xrds"&gt;
+      &lt;XRD xmlns:simple="<a href="http://xrds-simple.net/core/1.0" class="external free" title="http://xrds-simple.net/core/1.0" 
+      rel="nofollow">http://xrds-simple.net/core/1.0</a>"
+      xmlns="xri://$XRD*($v*2.0)"  xmlns:openid="<a href="http://openid.net/xmlns/1.0" class="external free" title="http://openid.net/xmlns/1.0" rel="nofollow">http://openid.net/xmlns/1.0</a>" version="2.0" xml:id="main"&gt; 
+      &lt;Type&gt;xri://$xrds*simple&lt;/Type&gt;
+    &lt;Service&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/discovery/1.0" class="external free" title="http://oauth.net/discovery/1.0" rel="nofollow">http://oauth.net/discovery/1.0</a>&lt;/Type&gt;
+	    &lt;URI&gt;#main&lt;/URI&gt;
+    &lt;/Service&gt;
+    &lt;Service&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/request" class="external free" title="http://oauth.net/core/1.0/endpoint/request" rel="nofollow">http://oauth.net/core/1.0/endpoint/request</a>&lt;/Type&gt;
+ 	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
+	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=request_token&lt;/URI&gt;
+	&lt;/Service&gt;
+	&lt;Service&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/authorize" class="external free" title="http://oauth.net/core/1.0/endpoint/authorize" rel="nofollow">http://oauth.net/core/1.0/endpoint/authorize</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
+	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/index.php?p=oauth&amp;q=authorize&lt;/URI&gt;
+	&lt;/Service&gt;
+	&lt;Service&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/access" class="external free" title="http://oauth.net/core/1.0/endpoint/access" rel="nofollow">http://oauth.net/core/1.0/endpoint/access</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
+	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
+	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=access_token&lt;/URI&gt;
+	&lt;/Service&gt;
+    &lt;/XRD&gt;
+  &lt;/XRDS&gt;
+  </pre>
+
+  	<a name="Registered_Applications" id="Registered_Applications"></a><h3>Registered Applications</h3>
+  	<p>You must obtain a consumer_key and consumer_secret for your application. Keys for "Supported" applications 
+  	will be shipped with <?php echo PRODUCT_NAME; ?> meaning no extra steps are required. If you have made your own application you will need
+ 	to register it with your <?php echo PRODUCT_NAME; ?> Server using the following address:</p>
+  	<p>Register Service: index.php?p=oauth</p>
+  	<p>You will be asked for:</p>
+  	<ul>
+  		<li>Your Name</li>
+ 	 	<li> Your email address</li>
+  		<li> A URL for your Application</li>
+  		<li> A Callback URL</li>
+ 	</ul>
+  	<p><?php echo PRODUCT_NAME; ?> will (at a later date) have a UI for displaying all registered applications.</p>
+
+  	<a name="Callback_URL" id="Callback_URL"></a><h3>Callback URL</h3>
+   	<p>The Callback URL will be automatically called by <?php echo PRODUCT_NAME; ?> on a completely Authorize request. It will be called regardless 
+   	of whether the authorization was successful and will contain an OAuth message indicating the authorize success.</p>
+   	<p>If you do not specify a Callback URL <?php echo PRODUCT_NAME; ?> will show a message requesting the user return to the application once authorized.</p>
+</blockquote>    
+
+    <a name="Request_Formats" id="Request_Formats"></a><h2>Request Formats</h2>
+    <p><?php echo PRODUCT_NAME; ?> supports the following request formats</p>
+
+    <ul><li>REST</li></ul>
+
+<blockquote>    
+    <a name="REST" id="REST"></a><h3>REST</h3>
+    <p>A simple POST or GET.</p>
+    <p>To request the <?php echo PRODUCT_NAME; ?> Version method:</p>
+    <pre>services.php?service=rest&amp;method=version</pre>
+    <p>By default the response type is xml. To get a different response type send "&amp;response="</p>
+</blockquote>    
+
+    <a name="Response_Types" id="Response_Types"></a><h2>Response Types</h2>
+    <p><?php echo PRODUCT_NAME; ?> supports the following response types</p>
+
+    <blockquote>    
+    <ul><li>JSON</li>
+    	<li> XML</li></ul>
+  
+    <a name="JSON" id="JSON"></a><h3>JSON</h3>
+    <p>To return a JSON object specify the response to be JSON (response="json")</p>
+    <p>A method call returns:</p>
+    <pre><?php echo PRODUCT_NAME; ?>Api({
+      "stat":"ok",
+      "response": {...}
+    })
+    </pre>
+  
+    <p>A failure call returns:</p>
+    <pre><?php echo PRODUCT_NAME; ?>Api({
+    "stat":"error",
+    "error": {
+       "code": "[error-code]",
+       "message": "[error-message]"
+     }
+    })
+    </pre>
+
+      <a name="XML" id="XML"></a><h3>XML</h3>
+      <p>A successful call returns this:</p>
+      <pre>&lt;?xml version="1.0" encoding="utf-8"&nbsp;?&gt;
+        &lt;rsp status="ok"&gt;
+        	[xml-payload-here]
+        &lt;/rsp&gt;
+      </pre>
+      <p>A failure call returns this:</p>
+      <pre>&lt;?xml version="1.0" encoding="utf-8"&nbsp;?&gt;
+      &lt;rsp status="error"&gt;
+      &lt;error code="[error-code]" message="[error-message]"
+      &lt;/rsp&gt;
+      </pre>
+</blockquote>    
+
+      <a name="Error_Codes" id="Error_Codes"></a><h2>Error Codes</h2>
+      <p>A complete list of error codes can be found here: <a href="http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes" 
+      class="external free" title="http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes" rel="nofollow">http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes</a></p>
+      <p>A list of the potential error codes from each method call can be found with the documentation of that call.</p>
+
+      <a name="Methods" id="Methods"></a><h2>Methods</h2>
+      <p>Transactions supported by <?php echo PRODUCT_NAME; ?></p>
+
+  <blockquote>    
+      <a name="Displays" id="Displays"></a><h3>Displays</h3>
+      <ul><li>DisplayList</li>
+	      <li>DisplayEdit</li>
+	      <li>DisplayRetire</li>
+	      <li>DisplayDelete</li>
+	      <li>DisplayUserGroupSecurity</li>
+	      <li>DisplayUserGroupEdit</li>
+      </ul>
+
+      <a name="DisplayGroups" id="DisplayGroups"></a><h3>DisplayGroups</h3>
+      <ul><li> DisplayGroupList</li>
+	      <li> DisplayGroupAdd</li>
+	      <li> DisplayGroupEdit</li>
+	      <li> DisplayGroupDelete</li>
+	      <li> DisplayGroupMembersList</li>
+	      <li> DisplayGroupMembersEdit</li>
+	      <li> DisplayGroupUserGroupList</li>
+	      <li> DisplayGroupUserGroupEdit</li></ul>
+
+      <a name="Layout" id="Layout"></a><h3>Layout</h3>
+      <ul><li> LayoutList</li>
+	      <li> LayoutAdd</li>
+	      <li> LayoutEdit</li>
+	      <li> LayoutCopy</li>
+	      <li> LayoutDelete</li>
+	      <li> LayoutRetire</li>
+	      <li> LayoutBackgroundList</li>
+	      <li> LayoutBackgroundEdit</li>
+	      <li> LayoutGetXlf</li>
+	      <li> LayoutRegionList</li>
+	      <li> LayoutRegionAdd</li><li> LayoutRegionEdit</li>
+	      <li> LayoutRegionPosition</li><li> LayoutRegionTimelineList</li>
+	      <li> LayoutRegionMediaAdd</li>
+	      <li> LayoutRegionMediaReorder</li>
+	      <li> LayoutRegionMediaDelete</li>
+	      <li> LayoutRegionLibraryAdd</li>
+	      <li> LayoutRegionMediaEdit</li>
+	      <li> LayoutRegionMediaDetails</li></ul>
+      
+      <a name="Library" id="Library"></a><h3>Library</h3>
+      <ul><li> LibraryMediaFileUpload</li>
+	      <li> LibraryMediaFileRevise</li>
+	      <li> LibraryMediaAdd</li>
+	      <li> LibraryMediaEdit</li>
+	      <li> LibraryMediaRetire</li>
+	      <li> LibraryMediaDownload</li>
+	      <li> LibraryMediaList</li></ul>
+
+      <a name="Schedule" id="Schedule"></a><h3>Schedule</h3>
+      <ul><li> ScheduleList</li>
+	      <li> ScheduleAdd</li>
+	      <li> ScheduleEdit</li>
+	      <li> ScheduleDelete</li></ul>
+      
+      <a name="Template" id="Template"></a><h3>Template</h3>
+      <ul><li> TemplateList</li>
+      		<li> TemplateDelete</li></ul>
+
+      <a name="Resolution" id="Resolution"></a><h3>Resolution</h3>
+      <ul><li> ResolutionList</li></ul>
+
+      <a name="Modules" id="Modules"></a><h3>Modules</h3>
+      <ul><li> ModuleList</li></ul>
+
+      <a name="Other" id="Other"></a><h3>Other</h3>
+      <ul><li> Version</li>
+      	<li> ServerStatus</li></ul>
+	</blockquote>    
+
+    <a name="Method_Calls" id="Method_Calls"></a><h2>Method Calls</h2>
+
+    <blockquote>    
+    <a name="LayoutAdd" id="LayoutAdd"></a><h3>LayoutAdd</h3>
+    <p>Parameters</p>
+	<ul><li> layout - The Name of the Layout</li>
+		<li> description - The Description of the Layout</li>
+		<li> permissionid - PermissionID for the layout</li>
+		<li> tags - Tags for the Layout</li>
+		<li> templateid - Template for the Layout</li>
+	</ul>
+
+	<p>Response</p>
+	<ul><li> layout - The ID of the layout</li></ul>
+	
+	<p>Errors</p>
+	<ul><li> Code 1 - Access Denied</li>
+		<li> Code 25001 - Layout Name must be between 1 and 50 characters</li>
+		<li> Code 25002 - Description must be less than 254 characters</li>
+		<li> Code 25003 - All tags combined must be less that 254 characters</li>
+		<li> Code 25004 - User already has a layout with this name</li>
+		<li> Code 25005 - Database error adding layout</li>
+		<li> Code 25006 - Failed to Parse Tags</li>
+		<li> Code 25007 - Unable to update layout xml</li>
+		<li> Code 25008 - Unable to Delete layout on failure</li>
+	</ul>
+
+	<a name="LayoutEdit" id="LayoutEdit"></a><h3> <span class="mw-headline"> LayoutEdit </span></h3>
+	<p>Not implemented</p>
+
+	<a name="LayoutUpdateXlf" id="LayoutUpdateXlf"></a><h3> <span class="mw-headline"> LayoutUpdateXlf </span></h3>
+	<p>Not Implemented</p>
+
+	<a name="LayoutBackground" id="LayoutBackground"></a><h3> <span class="mw-headline"> LayoutBackground </span></h3>
+	<p>Not Implemented</p>
+
+	<a name="LayoutDelete" id="LayoutDelete"></a><h3> <span class="mw-headline"> LayoutDelete </span></h3>
+	<p>Parameters</p>
+	<ul><li> layoutId - The ID of the layout to delete</li></ul>
+	<p>Response</p>
+	<ul><li> success = true</li></ul>
+	<p>Errors</p>
+	<ul><li> Code 1 - Access Denied</li><li> Code 25008 - Unable to delete layout</li></ul>
+
+	<a name="TemplateDelete" id="TemplateDelete"></a><h3> <span class="mw-headline"> TemplateDelete </span></h3>
+	<p>Parameters</p>
+	<ul><li> templateId - The ID of the template to delete</li></ul>
+	<p>Response</p>
+	<ul><li> success = true</li></ul>
+	<p>Errors</p>
+	<ul><li> Code 1 - Access Denied</li><li> Code 25105 - Unable to delete template</li></ul>
+
+	<a name="LibraryMediaFileUpload" id="LibraryMediaFileUpload"></a><h3> <span class="mw-headline"> LibraryMediaFileUpload </span></h3>
+	<p>Parameters</p>
+	<ul>
+		<li> FileID - Null for 1st call</li><li> Chunk Offset</li>
+		<li> Check Sum (MD5)</li></ul>
+		<p>Response</p>
+	<ul><li> FileID</li>
+		<li> Offset (file length)</li></ul>
+		<p>Errors</p>
+	<ul><li> 1 - Access Denied</li>
+		<li> 2 - Payload Checksum doesn't match provided checksum</li>
+		<li> 3 - Unable to add File record to the Database</li>
+		<li> 4 - Library location does not exist</li>
+		<li> 5 - Unable to create file in the library location</li>
+		<li> 6 - Unable to write to file in the library location</li>
+		<li> 7 - File does not exist</li></ul>
+
+	<a name="LibraryMediaAdd" id="LibraryMediaAdd"></a><h3> <span class="mw-headline"> LibraryMediaAdd </span></h3>
+	<p>Parameters	</p>
+	<ul><li> fileId</li>
+		<li>type (image|video|flash|ppt)</li>
+		<li> name</li>
+		<li>duration</li>
+		<li> permissionId (1|2|3)</li>
+		<li> fileName (including extension)</li></ul>
+		<p>Response</p>
+		<ul><li> MediaID</li></ul>
+	<p>Errors</p>
+	<ul><li> Code 1 - Access Denied</li>
+		<li> Code 10 - The Name cannot be longer than 100 characters</li>
+		<li> Code 11 - You must enter a duration</li>
+		<li> Code 12 - This user already owns media with this name</li>
+		<li> Code 13 - Error inserting media into the database</li>
+		<li> Code 14 - Cannot clean up after failure</li>
+		<li> Code 15 - Cannot store file</li>
+		<li> Code 16 - Cannot update stored file location</li>
+		<li> Code 18 - Invalid File Extension</li></ul>
+
+	<a name="LibraryMediaEdit" id="LibraryMediaEdit"></a><h3> <span class="mw-headline"> LibraryMediaEdit </span></h3>
+	<p>Parameters</p>
+	<ul><li> mediaId</li>
+		<li> name</li>
+		<li>duration</li>
+		<li> permissionId (1|2|3)</li>
+		</ul>
+		<p>Response</p>
+	<ul><li> success</li></ul>
+	<p>Errors</p>
+	<ul><li> 1 - Access Denied</li>
+		<li> 10 - The Name cannot be longer than 100 characters</li>
+		<li> 11 - You must enter a duration</li>
+		<li> 12 - This user already owns media with this name</li>
+		<li> 30 - Database failure updating media</li>
+		</ul>
+
+	<a name="LibraryMediaFileRevise" id="LibraryMediaFileRevise"></a><h3> <span class="mw-headline"> LibraryMediaFileRevise </span></h3>
+	<p>Parameters</p>
+	<ul><li> mediaId</li>
+		<li> fileId</li>
+		<li> fileName (including extension)</li></ul>
+	<p>Response</p>
+	<ul><li> mediaId</li></ul>
+	<p>Errors</p>
+	<ul><li> 1 - Access Denied</li>
+		<li> 13 - Error inserting media into the database</li>
+		<li> 14 - Cannot clean up after failure</li>
+		<li> 15 - Cannot store file</li>
+		<li> 16 - Cannot update stored file location</li>
+		<li> 18 - Invalid File Extension</li>
+		<li> 31 - Unable to get information about existing media record</li>
+		<li> 32 - Unable to update existing media record</li>
+		</ul>
+
+	<a name="LibraryMediaRetire" id="LibraryMediaRetire"></a><h3> <span class="mw-headline"> LibraryMediaRetire </span></h3>
+	<p>Parameters</p>
+	<ul><li> mediaId</li></ul>
+	<p>Response</p>
+	<ul><li> success</li></ul>
+	<p>Error Codes</p>
+	<ul><li> 1 - Access Denied</li>
+		<li> 19 - Error retiring media</li></ul>
+
+	<a name="LibraryMediaDelete" id="LibraryMediaDelete"></a><h3> <span class="mw-headline"> LibraryMediaDelete </span></h3>
+	<p>Parameters</p>
+	<ul><li> mediaId</li></ul>
+	<p>Response</p>
+	<ul><li> Success = True</li></ul>
+	<p>Error Codes</p>
+	<ul><li> 1 - Access Denied</li>
+		<li> 20 - Cannot check if media is assigned to layouts</li>
+		<li> 21 - Media is in use</li>
+		<li> 22 - Cannot locate stored files, unable to delete</li>
+		<li> 23 - Database error deleting media</li>
+	</ul>
+
+	<a name="ModuleList" id="ModuleList"></a><h3> <span class="mw-headline"> ModuleList </span></h3>
+	<p>Response A list of modules with the following attributes:</p>
+	<ul><li> module - The Module Name</li>
+		<li> layoutOnly- Whether the module is a library based module or only available for layouts</li>
+		<li> description - A description of the module</li>
+		<li> extensions - Extensions allowed by this module</li>
+	</ul>
+	<p>Error Codes</p>
+	<ul><li> 40 - Unable to query for modules</li></ul>
+
+	<a name="Version" id="Version"></a><h3> <span class="mw-headline"> Version </span></h3>
+	<p>Response</p>
+	<pre>&lt;?xml version="1.0"?&gt;
+		&lt;rsp status="ok"&gt;
+	    &lt;version app_ver="1.1.1" XlfVersion="1" XmdsVersion="2" DBVersion="22"/&gt;
+		&lt;/rsp&gt;
+	</pre>
+	</blockquote>    
+
+	<?php include('../../template/footer.php'); ?>
+	</body>
+</html>

=== added file 'server/manual/content/admin/displays.php'
--- server/manual/content/admin/displays.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/displays.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,189 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+		<link rel=stylesheet type="text/css" href="../../css/doc.css">
+		<meta http-equiv="Content-Type" content="text/html" />
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+
+		<link href="img/favicon.ico" rel="shortcut icon"/>
+		<!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+	</head>
+	<body>
+	<a name="Displays" id="Displays"></a><h1>Displays</h1>
+    
+    <p>Displays are how you output your layouts with <?php echo PRODUCT_NAME; ?>.</p>
+    <p>Each client application registered with the server creates a new display record in <?php echo PRODUCT_NAME; ?> server. You can then choose a 
+    default layout for that display, schedule further layouts on the display and control who has access to the display, 
+    as well as monitor its status from the Display Management page.</p>
+     
+    <p>The Display Manamagement page is accessed from the Nagivation Bar by clicking on "Displays > Displays"</p>
+
+    <p><img alt="SA Displays" src="sa_displays.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="820" height="262"></p>
+    <blockquote>	   
+		<a name="Display_Edit" id="Display_Edit"></a><h3>Display Edit</h3>
+		<p>After a new display client is registered with <?php echo PRODUCT_NAME; ?> server, you need to perform Edit granting license to the client 
+    	to work.</p>
+    	<p> Click on the 'Edit" button of the Display loads its editing window. You can then proceed to change the settings for
+    	the chosen Display. </p>                                                                                         
+
+	   <p><img alt="Display Edit" src="sa_display_edit.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="493" height="231"></p> 
+
+		<a name="Display_Delete" id="Display_Delete"></a><h3>Display Delete</h3>
+		<p>After a display client is registered and licensed with <?php echo PRODUCT_NAME; ?> server, you can "unlicense" a client which will prevent it from connecting
+			to the server.</p>
+    	<p> Click on the 'Delete" button of the Display you want to unlicense; and the below form is loaded. </p>                                                                                         
+
+	   <p><img alt="Display Delete" src="sa_display_delete.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="357" height="217"></p>
+	   
+	   <p>Note: Delete a display cannot be undone. The client needs to re-regisiter and liscense before it is allowed to connect to the server again.</p>
+	   
+    	<a name="Media_Inventory" id="Media_Inventory"></a><h3>Media Inventory</h3>
+    	<p>When you schedule new content, or change existing content, it is helpful to know that the displays have updated with the new 
+    	information. In a <?php echo PRODUCT_NAME; ?> server and client system, the client applications will connect in to the server periodically 
+    	and update itself on the media items that they have stored locally. Media Inventory allows you to look at a glance to check if 
+    	your updates were pulled by the clients yet.</p>
+    	<p>On the display management page, you'll see a column "Status". The status light can be one of either green, amber or red.</p>
+    	<p>When you make a change that affects the output of the server to a given client (for example if you modify a layout scheduled 
+    	on that client, schedule a new layout or change the default layout), the status light will immediately goes red. That signifies 
+    	that as far as the server is aware there are updates pending for that client and it has not received them yet.</p>
+    	<p>The client will then connect up to the server on a schedule and will read the new information that is available. If there 
+    	are new files to download (for example if you modified a layout or scheduled something completely new), the status light will 
+    	turn amber while the files are being downloaded.</p>
+    	<p>Once the client is satisfied that all files have been downloaded, it will send an inventory of all the files it has active 
+    	in it is cache back to the server, and the server will change the status light to green.</p>
+    	<p>If you are curious to see what files the client is actively monitoring, you can click the "Media Inventory" button and a popup 
+    	will appear showing the status of each file, along with the last time the client checked it was still stored correctly on disk. 
+    	You will also see any files that the client is in the process of downloading. (Note here that what you will not see is files 
+    	that the client needs to download, but that it is unaware of at the present time. For example. If you schedule a new layout 
+    	and immediately go to the Media Inventory before the client has connected up to the server, you'll see the status light is red, 
+   	 	but the content of the media inventory will not show the new files that are required. Once the client connects, those new files 
+    	will be included in the inventory automatically.)</p>	   
+
+     	<p><img alt="Display Media Inventory" src="sa_display_media_inventory.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="418" height="268"></p>
+
+   		<a name="Display_Group_Member" id="Display_Group_Member"></a><h3>Group Members</h3>
+    	<p>To find the Group that the Display is belonged to, click on the "Group Members" on the corresponding row.</p>
+		 
+    	<p><img alt="SA Display Group Edit" src="sa_display_groups_edit.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="408" height="218"></p>
+    </blockquote>
+
+	<h2>Wake On LAN (WOL)</h2>
+    <blockquote>
+    	<h3>Introducing Wake On Lan for Display Clients</h3>
+ 		<p>This section will look at the Wake On Lan (WOL) feature of <?php echo PRODUCT_NAME; ?>.</p>
+
+   	 	<p>There has been a lot of interest over the years <?php echo PRODUCT_NAME; ?> has been running for a solution to be "green", "save power" and 
+    	generally not have the <?php echo PRODUCT_NAME; ?> display screen solution on unnecessarily.</p>
+
+    	<p>The WOL function is intended to be used for display clients that are addressable by the server, by this we mean that there 
+    	has to be a clear addressable network route between the server and the client that needs to wake up. It is also required that
+    	WOL is turned on in any necessary settings on the client PC.</p>
+
+    	<p>The WOL configuration happens on a display by display basis from the Edit Display form. Each display has new settings for:</p>
+    	<ul>
+      		<li><strong>Enable Wake On LAN</strong> - (Turn WOL on/off for the display)</li>
+      		<li><strong>Wake On LAN Time</strong> - (Specify a time for this display to wake, using the 24 hr clock)</li>
+      		<li><strong>BroadCast Address</strong> - (The BroadCast address of the client, if unknown use the IP address and fill in the CIDR field)</li>
+      		<li><strong>Wake On LAN Secure On</strong> - (The SecureOn password for the client, if supported)</li>
+      		<li><strong>Wake On LAN CIDR</strong> - (The CIDR subnet mask, if the BroadCast Address is unknown)</li>
+    	</ul>
+
+    	<p>Once the display has these settings it can be woken up in 2 ways:</p>
+    	<h3>Wake On LAN Now</h3>
+    
+   		<p><img alt="SA Display WOL" src="sa_display_wol.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="308" height="158"></p>
+     
+    	<p>Each display has the "Wake On LAN" button which can be used to send a wake on LAN command on demand. Clicking the button displays 
+    	a form for confirmation, once this is pressed the command is send immediately to the client.</p>
+
+    	<h3>Wake On LAN Time - Maintenance Script</h3>
+    	<p>In addition to the WOL now function, the <?php echo PRODUCT_NAME; ?> maintenance module has been altered to send a WOL packet to any display which has 
+    	a "Wake On LAN Time" specified. It will only send the command once, as the time window is passed.</p>
+
+    	<p>The maintenance script has to be running for this to work correctly. Maintenance instructions can be found on the 
+    	<a title="Maintenance Instructions" href="settings.php">Settings -> Maintenance</a>.</p>
+
+    	<h3>Putting the client to sleep</h3>
+   	 	<p>There are a few different options for putting the client to sleep - such as a scheduled task. However, the next article in this series 
+    	will look at an option built into <?php echo PRODUCT_NAME; ?>. The "Shell Command" module.</p>
+
+    	<p>Note: WOL is not routable. The <?php echo PRODUCT_NAME; ?> server is unable to see clients over the internet that are behind NAT,  
+    	or on a different subnet.</p>
+    </blockquote>
+
+	<a name="Display_Group" id="Display_Group"></a><h1>Display Groups</h1>
+    <p>A group should be added when there is a new set of components required for a particular group of users.
+    It could be that you want certain users to only have access to certain components or that certain users 
+    should not be able to share their content, playlists and schedules with each other.</p>
+    
+    <p><strong>Components</strong> refer to parts of <?php echo PRODUCT_NAME; ?>, e.g. Content, or Playlists.</p>
+        
+    <blockquote>
+    	<a name="Adding_a_Group" id="Adding_a_Group"></a><h3>Adding a Group</h3>
+    	<p>Click the navigation menu "Displays > Display Groups" to go to Display Groups page. To add a group click on 
+    	the "Add Group" button found at the top of the Displays list.</p>
+  
+    	<a name="Edit_Group" id="Edit_Group"></a><h3>Edit a Group</h3>
+    	<p>To edit a group click on the edit button on the row belonging to the group you wish to edit.</p>
+		 
+    	<p><img alt="SA Display Group" src="sa_display_groups.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="621" height="226"></p>
+ 
+    	<p><strong>Name</strong> is a unique identifier for a group.</p>	   
+    	   
+    	<a name="Delete_Group" id="Delete_Group"></a><h3>Delete a Group</h3>
+    	<p>To delete a group click on the delete button on the row belonging to the group you wish to delete.</p>
+    
+    	<a name="Group_Component_Security" id="Group_Component_Security"></a><h3>Group / Component Security</h3>
+    	<p>When editing a group the components that are assigned / unassigned to that group are show. These
+    	determine the permissions of the users belonging to that group.</p>
+    	<p>You should always have at least one group.</p>
+
+    	<a name="Group_Members" id="Group_Members"></a><h3>Group Members</h3>
+
+    	<p>Click on "Group Members" load the "Manage Membership" form for editing. All the Displays on the system will be shown. 
+    	You can assign or remove group members.</p>
+
+    	<p><img alt="SA Display Group Members" src="sa_display_group_members.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="408" height="270"></p>
+
+    </blockquote>
+
+	<a name="Display_Statistic" id="Display_Statistic"></a><h1>Display Statistic</h1>
+    <p>Click on "Statistic" shows a page giving statistic detail of all the system Displys on the followings. You can define
+    the filters i.e. Date, Display &amp; Media, for the required statistical data display.</p>
+
+     <ul>
+     	<li><h3>Layout ran</h3>Statistical data on layouts run for each Display.</li>
+     	<li><h3>Library Media ran</h3>Statistical data on Media played for each Display.</li>
+     	<li><h3>Media on Layouts ran</h3>Statistical data on Media played on all layouts run for each Display.</li>
+     </ul>
+
+    <p><img alt="SA Display Statistic" src="sa_display_statistic.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="648" height="650"></p>
+
+	<?php include('../../template/footer.php'); ?>
+	</body>
+</html>

=== added file 'server/manual/content/admin/modules.php'
--- server/manual/content/admin/modules.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/modules.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+		<link rel=stylesheet type="text/css" href="../../css/doc.css">
+		<meta http-equiv="Content-Type" content="text/html" />
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+
+		<link href="img/favicon.ico" rel="shortcut icon"/>
+		<!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+	</head>
+	<body>
+		
+		<h1>Modules</h1>
+    	<p><?php echo PRODUCT_NAME; ?> server content handling is done by Modules.</p>
+    	<p>Click "Administration -> Modules" load the modules parameters for edit.</p>
+      
+    	<p><img alt="SA_Modules" src="sa_modules.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="644" height="418"></p>
+
+		<p><?php echo PRODUCT_NAME; ?> server modules table contains parameters for user edit.</p>
+		<ul>
+			<li><strong>Name:</strong>
+      		<p>System given Name for the specific module.</p</li>
+			<li><strong>Description:</strong>
+      		<p>A breif description of the modules.</p</li>
+			<li><strong>Library Media:</strong>
+      		<p>Indicated if the content is saved in the <?php echo PRODUCT_NAME; ?> Library. Unchecked indicate the specific content is only save
+      		with the Layout-Regions.</p</li>
+			<li><strong>Valid Extensions:</strong>
+      		<p>Valid file extensions that are supported by the specific module.</p</li>
+			<li><strong>Image Uri:</strong>
+      		<p>Link to the module icon for UI display, usually leave as it.</p></li>
+			<li><strong>Enabled:</strong>
+      		<p>System administrator may enable/disable the specific content for <?php echo PRODUCT_NAME; ?> user access.</p</li>
+		</ul>
+
+		<h2>Edit</h2>
+		<p>Click Edit button for the specific content type load the following form for user changes.</p>
+
+		<ul>
+		<li><h3>Content Without Extension:</h3>
+    	<p>Admininstrator may enable or disable the content for user access.</p>
+    
+    	<p><img alt="SA_Modules" src="sa_modules_text.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="358" height="179"></p></li>
+
+		<li><h3>Content With Extension:</h3>
+    	<p>Administrator may add other valid files extensions that are supported by the <?php echo PRODUCT_NAME; ?> Client Display e.g. mp4.</p>
+    
+    	<p><img alt="SA_Modules" src="sa_modules_video.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="358" height="211"></p></li>
+    </ul>    
+
+	<?php include('../../template/footer.php'); ?>
+	</body>
+</html>

=== added file 'server/manual/content/admin/overview.php'
Binary files server/manual/content/admin/overview.php	1970-01-01 00:00:00 +0000 and server/manual/content/admin/overview.php	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_advanced.png'
Binary files server/manual/content/admin/sa_advanced.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_advanced.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_advanced_sessions.png'
Binary files server/manual/content/admin/sa_advanced_sessions.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_advanced_sessions.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_api.png'
Binary files server/manual/content/admin/sa_api.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_api.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_delete.png'
Binary files server/manual/content/admin/sa_display_delete.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_delete.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_edit.png'
Binary files server/manual/content/admin/sa_display_edit.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_edit.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_group_members.png'
Binary files server/manual/content/admin/sa_display_group_members.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_group_members.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_groups.png'
Binary files server/manual/content/admin/sa_display_groups.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_groups.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_groups_edit.png'
Binary files server/manual/content/admin/sa_display_groups_edit.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_groups_edit.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_media_inventory.png'
Binary files server/manual/content/admin/sa_display_media_inventory.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_media_inventory.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_statistic.png'
Binary files server/manual/content/admin/sa_display_statistic.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_statistic.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_display_wol.png'
Binary files server/manual/content/admin/sa_display_wol.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_display_wol.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_displays.png'
Binary files server/manual/content/admin/sa_displays.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_displays.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_modules.png'
Binary files server/manual/content/admin/sa_modules.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_modules.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_modules_text.png'
Binary files server/manual/content/admin/sa_modules_text.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_modules_text.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_modules_video.png'
Binary files server/manual/content/admin/sa_modules_video.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_modules_video.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_content.png'
Binary files server/manual/content/admin/sa_setting_content.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_content.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_default.png'
Binary files server/manual/content/admin/sa_setting_default.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_default.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_error.png'
Binary files server/manual/content/admin/sa_setting_error.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_error.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_general.png'
Binary files server/manual/content/admin/sa_setting_general.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_general.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_maintenance.png'
Binary files server/manual/content/admin/sa_setting_maintenance.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_maintenance.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_path.png'
Binary files server/manual/content/admin/sa_setting_path.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_path.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_permissions.png'
Binary files server/manual/content/admin/sa_setting_permissions.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_permissions.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/sa_setting_pwd.png'
Binary files server/manual/content/admin/sa_setting_pwd.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/sa_setting_pwd.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/admin/settings.php'
--- server/manual/content/admin/settings.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/settings.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title>Xibo Documentation</title>
+		<link rel=stylesheet type="text/css" href="../../css/doc.css">
+		<meta http-equiv="Content-Type" content="text/html" />
+		<meta name="keywords" content="digital signage, signage, narrow-casting, xibo, open source, agpl" />
+		<meta name="description" content="Xibo is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+
+		<link href="img/favicon.ico" rel="shortcut icon"/>
+		<!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+	</head>
+<body>
+	<a name="Settings" id="Settings"></a><h1>Settings</h1>
+    <p>This page provides you with all the settings options to configure Xibo to your environment. Each tab provides a set of forms
+      where you can alter default settings and paths.</p>
+    <p>The items in the boxes provide you with details of your PHP settings on the server with Xibo installed.</p>
+    <p>Settings should only be modified by the administrator of the system, as incorrect settings could cause system
+    stablility issues.</p>
+
+  	<a name="Content" id="Content"></a><h2>Content</h2>
+  <blockquote>    
+    <p>This tab allows you to set default content item settings - default length. This helps Xibo if the 
+    file does not contain duration information.</p>
+    
+    <p><img alt="Setting_Content" src="sa_setting_content.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="536" height="298"></p>
+	  
+    <h3>Library Size &amp; Bandwidth</h3> 
+	<p>To manage limits on the library file size and monthly bandwidth usage. This is done by virtue of two settings in the database
+    table (LIBRARY_SIZE_LIMIT_KB &amp; MONTHLY_XMDS_TRANSFER_LIMIT_KB).</p> 
+    
+    <p>If no limits are entered in database, everything continues to work without restriction; however once a limit is entered Xibo will start 
+    validating against these limits, and when they are exceeded will prevent the upload of new media / updates to clients.</p>
+    
+    <p>However these two settings are currently not available through the user interface; Only the statistical data is shown in Content page</p>
+  </blockquote> 
+
+  	<a name="Default_Settings" id="Default_Settings"></a><h2>Default Settings</h2>
+  	<blockquote> 
+     <p>Default Settings set the default options on some forms to always appear and be applied unless altered. You can also change
+    	your time zone in this section.</p>
+
+    	<p><img alt="Setting_Default" src="sa_setting_default.png"
+	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   	width="536" height="298"></p>
+  </blockquote> 
+
+  	<a name="Error" id="Error"></a><h2>Error</h2>
+  	<blockquote> 
+    <p>Tab allows you to alter how Xibo handles errors. You can turn the error and audit logs on and off. As logs records 
+    size growth rapidly, you should take care to enable it only when necessary e.g. during system debug.</p>
+
+    <p><img alt="Setting_Error" src="sa_setting_error.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="538" height="274"></p>
+  </blockquote> 
+
+  	<a name="General_Setting" id="General_Setting"></a><h2>General Settings</h2>
+  <blockquote> 
+    <p>General setting provide details of your current settings in your PHP.ini file on your server. It also allows you to setup
+    whether you are collecting statics off your Xibo displays.</p>
+
+    <p><img alt="Setting_General" src="sa_setting_general.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="539" height="451"></p>
+
+    <a name="Server_Key" id="Server_Key"></a><h3>Server Key (SERVER_KEY)</h3>
+    <p>The Server Key must be provided and required by the Client during the initial Client Display setup.</p>
+	   
+    <a name="Required_Files_LookAhead" id="Required_Files_LookAhead"></a><h3>Required Files Look Ahead (REQUIRED_FILES_LOOKAHEAD)</h3>
+    <p>The local client library may get larger and larger if its obsoleted contents are not deleted as time goes by.</p>
+    <p><strong>Clearing up old and unused files:</strong><br />
+    The client manages its content library automatically, clearing up files that are no longer needed (including temporary files).</p>
+    <p>This is managed by using the "Required Files Look Ahead" setting in the server; increasing this value causes the client
+    to consider media to be required for longer period of time.</p>
+	   
+  </blockquote> 
+
+  <a name="Maintenance" id="Maintenance"></a><h2>Maintenance</h2>
+  <blockquote>    
+    <p>Tab allows you configure Xibo maintenance.</p>
+
+    <a name="Introduction" id="Introduction"></a><h3>Introduction</h3>
+    <p>When Xibo is running, logs and statistics slowly accumulate on the server and consume disk space. In extreme cases the sheer 
+    volume of those records can cause the server interface to slow and become unresponsive.</p>
+    
+    <p>It is also reassuring to know that if there is a problem with a display and it stops checking in with the Xibo server, you will 
+    be notified by email so you can take action to resolve the problem.</p>
+    
+    <p>The maintenance script can be scheduled to run periodically and perform background cleanup tasks such as deleting old logs and 
+    statistics, and checking the status of the displays.</p>
+    
+    <a name="Prerequisites" id="Prerequisites"></a><h3>Prerequisites</h3>
+    <p>In order to send email notifications, your PHP must have a working mail() command.</p>
+    <p>You need to ensure your PHP installation is configured to send mail via a 
+    <a href="http://email.about.com/od/emailprogrammingtips/qt/Configure_PHP_to_Use_a_Local_Mail_Server_for_Sending_Mail.htm" class="external text" 
+     title="http://email.about.com/od/emailprogrammingtips/qt/Configure_PHP_to_Use_a_Local_Mail_Server_for_Sending_Mail.htm" rel="nofollow">local</a>
+     or <a href="http://email.about.com/od/emailprogrammingtips/qt/Configure_PHP_to_Use_a_Remote_SMTP_Server_for_Sending_Mail.htm" class="external text" 
+     title="http://email.about.com/od/emailprogrammingtips/qt/Configure_PHP_to_Use_a_Remote_SMTP_Server_for_Sending_Mail.htm" rel="nofollow">remote</a>
+     SMTP server.</p>
+     
+     <p>Once you have verified that your PHP installation has a working mail() command, you can proceed to the next step.</p>
+     
+    <a name="Setup_for_New_Xibo_Installations" id="Setup_for_New_Xibo_Installations"></a><h3>Setup for New Xibo Installations</h3>
+    <p>Xibo server 1.2.0 and later have the maintenance functionality.</p>
+    <p>New Xibo installations come pre-populated with some default values for the maintenance script, but with the entire system 
+    disabled. You can proceed to the configuration section.</p>
+    
+    <a name="Setup_for_Xibo_Installations_.3C_1.2.0" id="Setup_for_Xibo_Installations_.3C_1.2.0"></a><h3>Setup for Xibo Installations &lt; 1.2.0</h3>
+    <p>Only Xibo server versions 1.2.0 and later have this functionality. If you're upgrading your older Xibo server installations to 1.2.0 
+    then you will be prompted to modify the default settings as part of the upgrade process.</p>
+    <p>If you decide to enable the maintenance script as part of your upgrade, it will automatically be configured to use "protected" 
+    mode as this is the most secure option. The other options are discussed in detail below. You should change your Maintenance Key immediately 
+    in protected mode as the default key is publicly available and offers no protection.</p>
+    
+    <a name="Configuration" id="Configuration"></a><h3>Configuration</h3>
+    <p>Configuration for the maintenance script can be found in Xibo server at "Administration -&gt; Settings -&gt; Maintenance" tab.</p>
+     
+    <p><img alt="Setting_Maintenance" src="sa_setting_maintenance.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="529" height="577"></p> 
+
+    <p>There are several options associated with the maintenance script:</p>
+    
+    <ul>
+    <li>Maintenance Enabled (MAINTENANCE_ENABLED):
+      <ul>
+      <li><b>Off</b> - All maintenance functionality is disabled.</li>
+      <li><b>On</b> - All maintenance functionality is enabled. You can use any of the methods below to call the maintenance script 
+      on a schedule without specifying a key.</li>
+      <li> <b>Protected</b> - All maintenance functionality is enabled. You must specify the correct key when calling the maintenance 
+      script. This is to prevent unauthorised persons from repeatedly calling the script and generating large amounts of alert email.</li>
+      </ul></li>
+      
+    <li>Maintenance Key (MAINTENANCE_KEY)<br />
+      The secret key required to allow the maintenance script to run when "Maintenance Enabled" is set to "Protected" mode.</li>
+
+    <li>Email Alerts (MAINTENANCE_EMAIL_ALERTS)<br />
+    Globally enable or disable the sending of email alerts. You can enable/disable alerts for individual displays in Display Management.</li>
+    
+    <li>Alert Timeout (MAINTENANCE_ALERT_TOUT)<br />
+    Globally configure how many minutes after a display lasts connects to the server we should consider it to have a problem and cause an 
+    alert to be sent. You can override this default for individual displays in Display Management. You should make sure this time is longer 
+    than the collection interval you have configured on your clients to avoid false positive alerts.</li>
+    
+    <li>Email To (mail_to)<br />
+    Who should the alert emails be sent to?</li>
+    
+    <li>Email From (mail_from)<br />
+    Who should the alert emails appear to be from?</li>
+    
+    <li>Log Maximum Age (MAINTENANCE_LOG_MAXAGE)<br />
+    How many days worth of log messages to keep. Logs older than this will be deleted. Set to 0 to keep all logs indefinitely.</li>
+    
+    <li>Statistics Maximum Age (MAINTENANCE_STAT_MAXAGE)<br />
+    How many days worth of statistics to keep. Statistics older than this will be deleted. Set to 0 to keep all statistics indefinitely.</li>
+ </ul>
+    <p>Once you have decided which of the options you want to enable and the parameters required, you need to setup some mechanism for calling 
+    the <b>maintenance.php</b> script on a schedule. Skip to the appropriate section for your server below.</p>
+    <p>If you do not have permission to setup scheduled tasks on your server, you could arrange for a remote computer to call the maintenance.php script.</p>
+
+    <a name="Windows_Scheduled_Task" id="Windows_Scheduled_Task"></a><h2>Windows Scheduled Task</h2>
+    <p>This section is broadly based upon the Moodle Cron documentation available <a href="http://docs.moodle.org/en/Cron#Managing_Cron_on_Windows_systems" 
+    class="external text" title="http://docs.moodle.org/en/Cron#Managing_Cron_on_Windows_systems" rel="nofollow">here</a>.</p>
+
+  <ul>
+    <li>Find the php.exe or php-win.exe program on your server. It will be in your PHP installation directory.</li>
+    <li>Setup a <b>Scheduled Task</b></li>
+      <ul>
+      <li>Go to Start -&gt; Control Panel -&gt; Scheduled Tasks -&gt; Add Scheduled Task.</li>
+      <li>Click "Next" to start the wizard:</li>
+      <li>Click the "Browse..." button and browse to your php.exe or php-win.exe and click "Open"</li>
+      <li>Type "Xibo Maintenance" as the name of the task and select "Daily" as the schedule. Click "Next".</li>
+      <li>Select "12:00 AM" as the start time, perform the task "Every Day" and choose today's date as the starting date. Click "Next".</li>
+      <li>Enter the username and password of the user the task will run under (it does not have to be a privileged account at all). 
+      Make sure you type the password correctly. Click "Next".</li>
+      <li>Mark the checkbox titled "Open advanced properties for this task when I click Finish" and click "Finish".</li>
+      <li>In the new dialog box, type the following in the "Run:" text box:
+      <pre>c:\php\php-win.exe -f c:\path\to\xibo\maintenance.php secret</pre>
+      Replace secret with your Maintenance Key if you are running in Protected Mode.</li>
+      <li>Click on the "Schedule" tab and there in the "Advanced..." button.</li>
+      <li>Mark the "Repeat task" checkbox and set "Every:" to 5 minutes, and set "Until:" to "Duration" and type "23" hours and "59" minutes. 
+      If you are Alert Timeouts are less than 5 minutes, you may want to run the maintenance script more often.</li>
+      <li>Click "OK".</li>
+      </ul>
+    <li><b>Test your scheduled task</b>.
+    <p>You can test that your scheduled task can run successfully by clicking it with the right button
+    and chosing "Run". If everything is correctly setup, you will briefly see a DOS command window while php executes and fetches the cron 
+    page and then it disappears. If you refresh the scheduled tasks folder, you will see the <i>Last Run Time column</i>
+    in detailed folder view) reflects the current time, and that the Last Result column displays "0x0" (everything went OK). 
+    If either of these is different, then you should recheck your setup.</p></li></ul>
+
+    <a name="Maintenance_on_Unix_Servers" id="Maintenance_on_Unix_Servers"></a><h2>Maintenance on Unix Servers</h2>
+    <p>This section is broadly based upon the Moodle Cron documentation available <a href="http://docs.moodle.org/en/Cron#Using_a_cron_command_line_in_Unix" 
+    class="external text" title="http://docs.moodle.org/en/Cron#Using_a_cron_command_line_in_Unix" rel="nofollow">here</a>.
+    There are different command line programs you can use to call the maintenance page from the command line. Not all of them may be available
+    on a given server.</p>
+    
+    <p>For example, you can use a Unix utility like 'wget': </p>
+    <pre>wget -q -O /dev/null http://example.com/xibo/maintenance.php?key=changeme</pre>
+    
+    <p>Note in this example that the output is thrown away (to /dev/null).</p>
+    <p>The same thing using lynx:</p>
+    <pre>lynx -dump http://example.com/xibo/maintenance.php changeme &gt; /dev/null</pre>
+
+    <p>Note in this example that the output is thrown away (to /dev/null).</p>
+    <p>Alternatively, you can use a standalone version of PHP, compiled to be run on the command line. The disadvantage is that you need to 
+    have access to a command-line version of php. The advantage is that your web server logs are not filled with constant requests to 
+    maintenance.php and you can run at a lower I/O and CPU priority.</p>
+    <pre> php /var/www/xibo/maintenance.php changeme</pre>
+    
+    <p>Example command to run at lower priority:</p>
+    <pre> ionice -c3 -p$$;nice -n 10 /usr/bin/php /var/www/xibo/maintenance.php changeme &gt; /dev/null</pre>
+    
+    <a name="Running_maintenance_with_crontab" id="Running_maintenance_with_crontab"></a><h3>Running maintenance with crontab</h3>
+    <p>This section is broadly based upon the Moodle Cron documentation available <a href="http://docs.moodle.org/en/Cron#Using_the_crontab_program_on_Unix"
+    class="external text" title="http://docs.moodle.org/en/Cron#Using_the_crontab_program_on_Unix" rel="nofollow">here</a>.
+    Most unix-based servers run a version of cron. Cron executes commands on a schedule.</p>
+    <p>Modern Linux distributions use a version of cron that reads its configuration from /etc/crontab. If you have an /etc/crontab, 
+    edit it with your favourite editor, otherwise run the following to edit the crontab:</p>
+    <pre>crontab -e</pre>
+    
+    <p>and then adding one of the above commands like:</p>
+    <pre>*/5 * * * * wget -q -O /dev/null http://example.com/xibo/maintenance.php?key=changeme</pre>
+  
+    <p>The first five entries are the times to run values, followed by the command to run. The asterisk is a wildcard, indicating any time. 
+    The above example means run the command <i>wget -q -O /dev/null...</i> every 5 minutes (*/5), every hour (*), every day of the month (*), 
+    every month (*), every day of the week (*).</p>
+    <p>The "O" of "-O" is the capital letter not zero, and refers the output file destination, in this case "/dev/null" which is a black 
+    hole and discards the output. If you want to see the output of your cron.php then enter its url in your browser.</p>
+    
+    <ul>
+    <li> <a href="http://linuxweblog.com/node/24" class="external text" title="http://linuxweblog.com/node/24" rel="nofollow">A basic crontab tutorial</a></li>
+    <li> <a href="http://www.freebsd.org/cgi/man.cgi?query=crontab&amp;apropos=0&amp;sektion=5&amp;manpath=FreeBSD+6.0-RELEASE+and+Ports&amp;format=html" 
+    class="external text" title="http://www.freebsd.org/cgi/man.cgi?query=crontab&amp;apropos=0&amp;sektion=5&amp;manpath=FreeBSD+6.0-RELEASE+and+Ports&amp;format=html"
+    rel="nofollow">Online version of the man page</a></li>
+    </ul>
+    
+    <p>For <b>beginners</b>, "EDITOR=nano crontab -e" will allow you to edit the crontab using the <a href="http://www.nano-editor.org/dist/v1.2/faq.html" 
+    class="external text" title="http://www.nano-editor.org/dist/v1.2/faq.html" rel="nofollow">nano</a> editor. Ubuntu defaults to using the nano editor.</p>
+    <p>Usually, the "crontab -e" command will put you into the 'vi' editor. You enter "insert mode" by pressing "i", then type in the line as above, then exit 
+    insert mode by pressing ESC. You save and exit by typing ":wq", or quit without saving using ":q!" (without the quotes). Here is an 
+    <a href="http://www.unix-manuals.com/tutorials/vi/vi-in-10-1.html" class="external text" title="http://www.unix-manuals.com/tutorials/vi/vi-in-10-1.html" 
+    rel="nofollow">intro</a> to the 'vi' editor.</p>
+ </blockquote>
+
+   <a name="Path" id="Path"></a><h2>Path</h2>
+  <blockquote>    
+    <p>Settings allows you to specify particular directory locations for where Xibo will store and look for items.</p>
+
+    <p><img alt="Setting_Path" src="sa_setting_path.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="538" height="140"></p>
+  </blockquote>    
+
+  	<a name="Permissiions" id="Permissiions"></a><h2>Permissions</h2>
+ 
+ <blockquote> 
+    <p>Settings allows you to define password policy and login error message.</p>
+  
+ 	 <h3>User Password Management</h3>
+	<p>This section will take a look at the User Password Management with three features/improvements:</p>
+  	<ul>
+    	<li>Users can change their passwords without having access to the user administration page</li>
+    	<li>Administrators can set a regular expression to test password complexity</li>
+    	<li>Administrators can override users passwords in a more�intuitive�way</li>
+  	</ul>
+
+    <p><img alt="Setting_Permissions" src="sa_setting_permissions.png"
+	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	   width="806" height="365"></p>
+   
+
+  	<h3>User Passwordd Policy</h3>
+  	<p>This feature has the utmost flexibility given to the administrator to test passwords in which ever way they chose. 
+  	This is done with a setting in the &#8220;Permissions&#8221; tab called USER_PASSWORD_POLICY.</p>
+
+  	<p>An administrator can put any valid regular expression in this box, which will cause all users password change requests (and new users)
+  	to be tested against this expression.</p>
+  	<p>It is also important for the user to know what the policy actually is; the setting USER_PASSWORD_ERROR which will be presented 
+  	to the user when they enter a password that does not validate against the regular expression.</p>
+
+  	<h3>Changing Password</h3>
+  
+  	<p><img alt="Setting User Password" src="sa_setting_pwd.png"
+  	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+  	width="458" height="234"></p>
+	   
+  	<p>A user can now change their password by clicking on their user name in the top right corner of the admin interface. 
+  	They will be presented with a form requiring them to enter their existing password, a new password and a retyped new password &#8211; 
+  	all fields are required.</p>
+  
+  	<h3>Override User Password</h3>
+
+  	<p><img alt="User Password Override" src="user_pwd_override.png"
+  	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+  	width="559" height="328"></p>
+
+  	<p>An administrator can now easily override / reset a users existing password by editing the the from the user admin screen and 
+  	ticking the box to &#8220;override&#8221;.</p>
+  </blockquote> 
+
+	<iframe src="../../template/footer.html" width="100%" frameborder="0">Your browser cannot support iframe</iframe>
+	</body>
+</html>

=== added file 'server/manual/content/admin/user_pwd_override.png'
Binary files server/manual/content/admin/user_pwd_override.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/user_pwd_override.png	2013-04-11 16:56:27 +0000 differ
=== added directory 'server/manual/content/config'
=== added file 'server/manual/content/config/DWNeverUpload.reg'
Binary files server/manual/content/config/DWNeverUpload.reg	1970-01-01 00:00:00 +0000 and server/manual/content/config/DWNeverUpload.reg	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/Powerpoint-fix.reg'
Binary files server/manual/content/config/Powerpoint-fix.reg	1970-01-01 00:00:00 +0000 and server/manual/content/config/Powerpoint-fix.reg	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/client.php'
--- server/manual/content/config/client.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/config/client.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+  	<!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1>Client Options</h1>
+	
+	<p>All newly installed client must be configured and registered with the <?php echo PRODUCT_NAME; ?> Server before it can be used. The <?php echo PRODUCT_NAME; ?> Configuration
+	Options are accessible on each client installation from the Start Menu -&gt; All programs</p>
+	
+	<p><img alt="Program Menu" src="pm.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="230" height="62" border="1px"></p>
+	
+	<p>Select "<?php echo PRODUCT_NAME; ?> Client Options" to register this display on the <?php echo PRODUCT_NAME; ?> Network; or to
+	make changes to this display configuration.</p>
+	
+	<h2>Client Options Form</h2>
+	
+	<p>The default - after install - options form is shown below.</p>
+	
+	<blockquote>
+	<h3>Options - General</h3>
+	
+	<p><img alt="<?php echo PRODUCT_NAME; ?> General Settings" src="settings_gen.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="485" height="393"></p>
+	
+	<br />
+	<ul>
+	<li>Server Address: Fill in the address of your <?php echo PRODUCT_NAME; ?> server address. If your <?php echo PRODUCT_NAME; ?> server is on the same machine as the client, 
+	enter "http://localhost/<?php echo PRODUCT_NAME; ?>". If <?php echo PRODUCT_NAME; ?> server is installed on a different computer, enter the IP address or hostname of the 
+	machine the <?php echo PRODUCT_NAME; ?> server is installed on - for example "http://192.168.0.4/<?php echo PRODUCT_NAME; ?>" or "http://www.my-server.com/<?php echo PRODUCT_NAME; ?>" or similar.<br /><br /></li>
+
+	<li>Server Key: Enter your server key in the "Server Key" box. If you cannot remember the key you can find it in the 
+ 	Settings dialogue on the <a href="../admin/settings.php#server_key">Administration->Settings</a> menu in the
+  	web interface on the server.<br /><br /></li>
+
+	<li>Local Library Location: defaults to a folder called "<?php echo PRODUCT_NAME; ?> Library" It is used to cache content from the <?php echo PRODUCT_NAME; ?> server so that
+	the client can continue to play if the connection to the <?php echo PRODUCT_NAME; ?> server is lost. If you want to change to a different folder, use 
+	the "Browse" button to choose an alternative folder. The library folder must be given write access right to the <?php echo PRODUCT_NAME; ?> client.
+	<br />
+	Note that you must NOT use the server's library location (if it is on the same PC as the client or via a file share)<br /><br /></li>
+
+	<li>The collection interval for content: is the interval in seconds that the client will poll the server for new content. The more
+	frequent the collections, the quicker the client will update when changes are made on the server - but at the expense of bandwidth 
+	and possibly minor freezes in things like scrolling text when the collection happens. We don't recommend values lower than 60 seconds.<br /><br /></li>
+
+	<li>The unique key for this client: is a unique identifier for this client machine. It is generated from a mix of Windows system identifiers and
+	your hardware. If you are installing for the first time, there is no need to amend this value. If you are changing hardware or want to have
+	two clients using the same server account then you can edit the key as required.<br /><br /></li>
+
+	<li>Scroll Step Amount (px): is the number of pixels scrolling text will advance each time scrolling text items are told to move. You should
+	leave this set to 1px for smooth viewing.<br /><br /></li>
+
+	<li>Enable Powerpoint: Tick the box if you have the full version of PowerPoint 2003 or later installed and want to use PowerPoint media items.
+	Be sure to read the notes on Powerpoint setup here: <a href="windows.php"> Windows Modifications.</a><br /><br /></li>
+
+	<li>Enable Statistics: Tick the box if you want the client to send statistics back to the <?php echo PRODUCT_NAME; ?> server. This will generate alot of data that will be 
+	stored in the <?php echo PRODUCT_NAME; ?> database. If you don't have any specific use for statistics, we recommend you turn this option off.
+
+	<p>Click the "Save" button.</p></li>	
+	</ul>
+
+	<h3>Options - Proxy</h3>
+	
+	<p>If you use a proxy server to access your <?php echo PRODUCT_NAME; ?> server, go to the "Proxy" server tab and fill in the details for your network, 
+	then click "Save". Make sure to set your proxy information in Internet Explorer too.</p>
+	
+	<p><img alt="<?php echo PRODUCT_NAME; ?> General Settings" src="settings_proxy.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="485" height="393"></p>	
+	
+	<h3>Options - Apperance</h3>
+	
+	<p>Click "Apperance" tab to set the client display window size, and the offsets from the screen origin if so required.</p>
+	<p>When the specified client display window size i.e. width &amp; height is different from the original layout intended size, some 
+		of the content will be cropped. e.g. embbedded html, linked html, dataset table etc.</p>
+	<p>You may use the "Offset X' i.e. set equal to the primary display width, to place the client diplay window on an extended display monitor.</p>
+	
+	<p><img alt="<?php echo PRODUCT_NAME; ?> General Settings" src="settings_app.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="485" height="393"></p>
+	
+	<p>The default <?php echo PRODUCT_NAME; ?> Splash screen is display when the client is first launch. You may specify your own Splash Image by entering
+	   the image filename in the "Override Splash Screen" box.</p>
+	
+	<h3>Options - Advanced</h3>
+	
+	<p><img alt="<?php echo PRODUCT_NAME; ?> General Settings" src="settings_adv.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="485" height="393"></p>
+	
+	<h3>Options - Register</h3>
+	
+	<p>Finally go to the "Register" display tab.</p>
+	
+	<p><img alt="<?php echo PRODUCT_NAME; ?> General Settings" src="settings_reg.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="485" height="393"></p>
+	
+	<br />
+	<p>Optionally rename the client by entering a name in the "Display Name" box. It defaults to the hostname of the PC.
+	 Click the "Register" button.</p>
+	  
+	<p>You should see a message "Display registered and awaiting licensing". If you don't get that message, ensure you entered
+	   the correct URL for the <?php echo PRODUCT_NAME; ?> server, and that your server key is entered correctly.</p>
+	</blockquote>
+	     
+	<h2>Client License Enable</h2>
+	 
+	 <p>Now log in to the server web interface, go to the <a href="../admin/displays.php">&quot;Display-&gt;Displays&quot;</a> page. 
+	  You should see your newly registered client in the list. Click the "Edit" button next to the display. The "License Display" 
+	  option will automatically change to "Yes". Optionally select a different default layout (the layout the client will play 
+	  if nothing is scheduled).</p>
+	
+	<p>Click "Save" </p>
+	
+	<h2>Start Client Player</h2>
+	
+	<p>You can now start the <?php echo PRODUCT_NAME; ?> Client Player. It should show you the <?php echo PRODUCT_NAME; ?> splash screen while the default layout and its media contents
+	   (and anything else you have scheduled) are downloaded and then begin playing layouts'contents.
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added file 'server/manual/content/config/client_feature.php'
--- server/manual/content/config/client_feature.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/config/client_feature.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,194 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+  	<!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1><?php echo PRODUCT_NAME; ?> Client Features</h1>
+	
+	<p>The <?php echo PRODUCT_NAME; ?> client comes in three flavours &#8211; the .NET Windows Client, the Python Linux Client and an Android Client. The windows client was born first and is therefore the client of choice for a stable installation. The Python client has greater potential in the future and will eventually become the only client for Windows and Linux.</p>
+	
+	<table>
+	<col width=40%><col width=30%><col width=30%>
+	  <thead>
+	    <tr>
+	      <th>Feature</th>
+	      <th>.Net Client</th>
+	      <th>Python</th>
+          <th>Android</th>
+	    </tr>
+	  </thead>
+	
+	  <tbody>
+	  <tr>
+	    <td>Schedule Layouts</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Priority Schedules</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Video</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Flash</td>
+	    <td class="y">Yes</td>
+	    <td class="partial-support">Some Support</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	   <td>Images</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>PowerPoint</td>
+	    <td class="y">Yes</td>
+	    <td class="n">No</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Text</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>RSS</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Web Page</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Embedded HTML</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	  <td>Microblog</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>DataSets</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Background Image</td>
+	    <td class="y">Yes (jpg only)</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Media Stats</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Layout Stats</td>
+	    <td class="y">Yes</td>
+	    <td class="n">No</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Report Inventory</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>File Resume</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Counter Media</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Socket Listener</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Lift/Serial Interface Support</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes (16 inputs / 4 per serial port)</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Client Runtime Information Screen</td>
+	    <td class="y">Yes</td>
+	    <td class="y">Yes</td>
+        <td class="y">Yes</td>
+	  </tr>
+	  <tr>
+	    <td>Offline Update via USB Drive</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Full Compositing (overlapping regions)</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Webpage Transparency</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Video Transparency</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  <tr>
+	    <td>Image Transparency</td>
+	    <td class="n">No</td>
+	    <td class="y">Yes</td>
+        <td class="n">No</td>
+	  </tr>
+	  </tbody>
+	</table>	
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added file 'server/manual/content/config/config.php'
--- server/manual/content/config/config.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/config/config.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+  	<!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1 lang="en-GB" class="western">Configuring <?php echo PRODUCT_NAME; ?></h1>
+	
+	<p>After the Installtion process the <?php echo PRODUCT_NAME; ?> Client must be registered with the
+	<?php echo PRODUCT_NAME; ?> Admin Panel. This is done using the <?php echo PRODUCT_NAME; ?> Options application.</p>
+	
+	<p><a href="client.php">Please click here for information regarding the <?php echo PRODUCT_NAME; ?>
+	Options and configuring the <?php echo PRODUCT_NAME; ?> client application.</a></p>
+	
+	<h2>Admin Panel Settings</h2>
+	
+	<p>The <?php echo PRODUCT_NAME; ?> admin panel can be customised in a number of ways using the
+	settings pages. These settings pages are available only to users with
+	administrator privilages.</p>
+	
+	<p><a href="settings.php">Please click here for information regarding the
+	<?php echo PRODUCT_NAME; ?> Admin Panel Settings.</a></p>
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added file 'server/manual/content/config/pm.png'
Binary files server/manual/content/config/pm.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/pm.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/settings.php'
--- server/manual/content/config/settings.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/config/settings.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+  	<!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1>Settings Page</h1>
+	
+	<p>The Settings Page is the primary location for configuring <?php echo PRODUCT_NAME; ?>. </p>
+	
+	<p>It is constructed from a number of different categories. Each setting
+	within these categories has an explanation above it. The settings page is
+	accessible from the Dashboard or Navigation bar.</p>
+	
+	<h2>Catagories</h2>
+	
+	<h3 lang="en-GB" class="western"><strong>Content</strong></h3>
+	
+	<p lang="en-GB" class="western">This tab allows you to set default content
+	item settings, such as a default length and ratio. This helps <?php echo PRODUCT_NAME; ?> if the
+	file does not contain duration information.</p>
+	
+	<h3 lang="en-GB" class="western"><strong>Default</strong></h3>
+	
+	<p lang="en-GB" class="western">Sets the default options on some forms to
+	always appear and be applied unless altered. You can also change your time
+	zone in this section.</p>
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added file 'server/manual/content/config/settings_adv.png'
Binary files server/manual/content/config/settings_adv.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/settings_adv.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/settings_app.png'
Binary files server/manual/content/config/settings_app.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/settings_app.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/settings_gen.png'
Binary files server/manual/content/config/settings_gen.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/settings_gen.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/settings_proxy.png'
Binary files server/manual/content/config/settings_proxy.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/settings_proxy.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/settings_reg.png'
Binary files server/manual/content/config/settings_reg.png	1970-01-01 00:00:00 +0000 and server/manual/content/config/settings_reg.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/config/windows.php'
--- server/manual/content/config/windows.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/config/windows.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+	<!-- Javascript Libraries -->
+	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+	  <script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+	  <script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1 lang="en-GB" class="western">Windows Modifications</h1>
+	<p>Here are some suggested settings for Windows / PowerPoint for a Display Client:</p>
+	<ul>
+	<li>Turn off all <a href="http://www.microsoft.com/windowsxp/using/setup/personalize/screensaver.mspx" 
+		title="http://www.microsoft.com/windowsxp/using/setup/personalize/screensaver.mspx" rel="nofollow">screensavers</a></li>
+	
+	<li>Turn off screen <a href="http://www.microsoft.com/windowsxp/using/setup/tips/sleep.mspx" 
+		title="http://www.microsoft.com/windowsxp/using/setup/tips/sleep.mspx" rel="nofollow">power saving</a></li>
+	
+	<li>Load the "No Sounds" <a href="http://www.microsoft.com/windowsxp/using/accessibility/soundscheme.mspx"
+		title="http://www.microsoft.com/windowsxp/using/accessibility/soundscheme.mspx" rel="nofollow">Sound Scheme</a>
+		(Control Panel -&gt; Sounds and Audio Devices Properties)</li>
+
+	<li>Set a plain wallpaper (Hopefully nobody will see it, but you might need to reboot the client, or restart <?php echo PRODUCT_NAME; ?> and a sane wallpaper is a help)</li>
+	
+	<li>If the client is accessible from where you manage your displays from, you might want to install <a href="http://www.uvnc.com/" 
+		title="http://www.uvnc.com/" rel="nofollow">UltraVNC</a> server so you can connect in and check on the client from time to time. 
+		Use the "View only" option in the VNC client to avoid disturbing the display.</li>
+	
+	<li>Set Windows to <a href="http://www.mvps.org/marksxp/WindowsXP/welskip.php" title="http://www.mvps.org/marksxp/WindowsXP/welskip.php" 
+		rel="nofollow">log on as your display client user automatically</a></li>
+	
+	<li>Disable <a href="http://support.microsoft.com/kb/307729" title="http://support.microsoft.com/kb/307729" rel="nofollow">
+		balloon tips in the notification area</a></li>
+	
+	<li>Disable Windows Error Reporting. Occasionally PowerPoint seems to "crash" when <?php echo PRODUCT_NAME; ?> closes it. Unfortunately this leaves an unsightly
+		"PowerPoint has encountered a problem and needs to close" message on the display. Follow the steps 
+		<a href="http://www.windowsnetworking.com/articles_tutorials/Disable-Error-Reporting-Windows-XP-Server-2003.html"
+		title="http://www.windowsnetworking.com/articles_tutorials/Disable-Error-Reporting-Windows-XP-Server-2003.html" rel="nofollow">here</a>
+		to disable Windows Error Reporting completely - including notifications.</li>
+		
+	<li>Also disable Office Application Error reporting. Follow instructions at <a href="http://support.microsoft.com/kb/325075"
+		title="http://support.microsoft.com/kb/325075" rel="nofollow">KB325075</a> or merge <a href="DWNeverUpload.reg"
+		title="DWNeverUpload.reg"> this registry patch</a>.</li>
+	</ul>
+
+	<p>If you're using PowerPoint, then there are a couple of extra steps:</p>
+    <p>First consider if you would be better converting your PowerPoint content to video files. PowerPoint 2010 and later can "Save As" a WMV file
+       which can be loaded straight in to Xibo and is far more reliable. If however you still need to play PowerPoint files, please ensure you action
+       the following:</p>
+
+	<ul>
+	<li>The first time you run <?php echo PRODUCT_NAME; ?> with a PowerPoint, you might get a popup appear that asks what <?php echo PRODUCT_NAME; ?> should do with the PowerPoint file.
+		The popup actually originates from Internet Explorer. Choose to "Open" the file, and untick the box so you won't be prompted again.</li>
+		
+	<li>In some circumstances, you may find that PowerPoint, the application, loads instead of the file opening within <?php echo PRODUCT_NAME; ?> itself. If that happens,
+		try merging <a href="Powerpoint-fix.reg" title="Powerpoint-fix.reg"> this registry patch</a>. (Taken from 
+		<a href="http://www.pptfaq.com/FAQ00189.htm" title="http://www.pptfaq.com/FAQ00189.htm" rel="nofollow">pptfaq.com</a>).
+		Users of Powerpoint 2007 should go to Microsoft <a href="http://support.microsoft.com/kb/927009" 
+		title="http://support.microsoft.com/kb/927009" rel="nofollow">KB927009</a> and run the FixIT application instead. Users of PowerPoint 2010 
+		should go here instead <a href="http://support.microsoft.com/kb/982995/en-us" title="http://support.microsoft.com/kb/982995/en-us" 
+		rel="nofollow">KB982995</a></li>
+		
+	<li>Note also that PowerPoint will put scroll bars up the side of your presentation, unless you do the following for each PowerPoint file BEFORE you upload it:</li>
+	</ul>
+
+	<ul>
+		o Open your PowerPoint Document<br />
+ 		o Slide Show -&gt; Setup Show<br />
+ 		o Under "Show Type", choose "Browsed by an individual (window)" and then untick "Show scrollbar"
+	</ul>
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added directory 'server/manual/content/content'
=== added file 'server/manual/content/content/adding.php'
--- server/manual/content/content/adding.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/content/adding.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+    <head>
+        <meta name="generator" content="HTML Tidy, see www.w3.org">
+        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+        <title><?php echo PRODUCT_NAME; ?> Documentation</title>
+        <link rel="stylesheet" type="text/css" href="../../css/doc.css">
+        <meta http-equiv="Content-Type" content="text/html">
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+        <link href="img/favicon.ico" rel="shortcut icon">
+        <!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+    </head>
+
+    <body>
+        <h1>Adding Content</h1>
+        
+        <p>In order to display content on <?php echo PRODUCT_NAME; ?> it first needs to be added to the system. The
+        following instructions deal with adding content. This section deals only with media
+        content that are stored in the Media Library.</p>
+                
+        <p><img alt="Library Add Media" src="library_media_add.png"
+	       style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	       width="425" height="225"></p>        
+          
+        <p>In order to add content you must be at the "Media" page by click "Library -> Media". When at the Media 
+        page click the "Add Media" button at top. This will take you to the following screen:</p>
+        
+        <p>Note: The media can also be added when creating layouts using the layout designer.</p>
+
+        <p>You can add different types of content by clicking on the media icon in the form. Doing this will 
+        show you the correct form for the content you have selected and allow <?php echo PRODUCT_NAME; ?> to collect the appropriate information.</p>
+
+ 	<blockquote>
+        <h3>Add Image</h3>
+        <p>Following form show the required information when adding new image</p>
+ 
+        <p><img alt="Library Add Image" src="library_add_image.png"
+	       style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	       width="458" height="226"></p>        
+ 
+        <h3>Add DataSet</h3>
+        <p>Following form show the required information when adding DataSet</p>
+ 
+        <p><img alt="Library Add Image" src="library_add_dataset.png"
+	       style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	       width="358" height="179"></p>        
+
+        <p>Refef to <a href="../layout/assigncontent.php#datasets">Assigning Content - DataSets</a> in Layouts section for further information on
+        defining DataSets.</p>
+ 
+				<a name="To_edit_content" id="To_edit_content"></a><h3>Edit Content</h3>
+				<p>Click on the "Edit" button in the action column.<br />
+				<strong>Note:</strong> If there is no edit button then you do not	have permission to edit that content.</p>
+
+        <p>Once you have entered the information <?php echo PRODUCT_NAME; ?> requires, click on the "Save" button and your 
+        content will be added to <?php echo PRODUCT_NAME; ?>.</p>
+	</blockquote>
+
+        <h2>Non-Media Content</h2>
+        <p>Following contents are not saved in the <?php echo PRODUCT_NAME; ?> media library. Instead they are embbedded within the Regions in which they are
+        assigned. Refef to <a href="../layout/assigncontent.php#text">Assigning Content - Text...</a> sections in Layout on adding 
+        these items to regions</p>
+        
+        <ul>
+	        <li>Text</li>
+	        <li>Ticker</li>
+    	   	<li>MicroBlog</li>
+ 	       	<li>Counter</li>
+        </ul>
+
+		<?php include('../../template/footer.php'); ?>
+    </body>
+</html>
+

=== added file 'server/manual/content/content/library_add_dataset.png'
Binary files server/manual/content/content/library_add_dataset.png	1970-01-01 00:00:00 +0000 and server/manual/content/content/library_add_dataset.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/content/library_add_image.png'
Binary files server/manual/content/content/library_add_image.png	1970-01-01 00:00:00 +0000 and server/manual/content/content/library_add_image.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/content/library_media.png'
Binary files server/manual/content/content/library_media.png	1970-01-01 00:00:00 +0000 and server/manual/content/content/library_media.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/content/library_media_add.png'
Binary files server/manual/content/content/library_media_add.png	1970-01-01 00:00:00 +0000 and server/manual/content/content/library_media_add.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/content/licensing.php'
--- server/manual/content/content/licensing.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/content/licensing.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+    <head>
+        <meta name="generator" content="HTML Tidy, see www.w3.org">
+        <meta http-equiv="Content-Type" content=
+        "text/html; charset=iso-8859-1">
+
+        <title><?php echo PRODUCT_NAME; ?> Documentation</title>
+        <link rel="stylesheet" type="text/css" href=
+        "../../css/doc.css">
+        <meta http-equiv="Content-Type" content="text/html">
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+        <link href="img/favicon.ico" rel="shortcut icon">
+        <!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+    </head>
+
+    <body>
+        <h2 lang="en-GB" class="western">Licensing</h2>
+
+        <p>Please be aware that <?php echo PRODUCT_NAME; ?> takes no measures to control what is put on your displays.
+        Please make sure that any content is either appropriately attributed or you own the rights to it.</p>
+
+		<?php include('../../template/footer.php'); ?>
+    </body>
+</html>
+

=== added file 'server/manual/content/content/overview.php'
--- server/manual/content/content/overview.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/content/overview.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+    <head>
+        <meta name="generator" content="HTML Tidy, see www.w3.org">
+        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+        <title><?php echo PRODUCT_NAME; ?> Documentation</title>
+        <link rel="stylesheet" type="text/css" href="../../css/doc.css">
+        <meta http-equiv="Content-Type" content="text/html">
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+        <link href="img/favicon.ico" rel="shortcut icon">
+        <!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+    </head>
+
+    <body>
+        <h1>Content</h1>
+        <h2>Overview</h2>
+
+		<p><?php echo PRODUCT_NAME; ?> uses content to on layouts. The content library is a store of all the content that
+		has been used on layouts in the past, and content to be used on new layouts.</p>
+			
+        <p>In <?php echo PRODUCT_NAME; ?> content refers to individual &ldquo;items&rdquo; that you want to be
+        available for displaying.</p>
+
+        <p">For example a picture is considered as a piece of content and so is a piece of text.
+        Each piece of content has information relating to it that <?php echo PRODUCT_NAME; ?> uses to display it in the best way. You will be
+        prompted to enter all the required information when you come to add pieces of content.</p>
+
+        <p>Adding content on its own is not enough to actually display it on the screen, there
+        are further steps required before this can happen (i.e. Layouts).</p>
+ 
+		<a name="When_should_content_be_added" id="When_should_content_be_added"></a><h2>When should content be added?</h2>
+		<p>From this content library page, content should be added before it is needed. However
+		content can also be added when creating layouts using the layout designer.</p>
+
+		<?php include('../../template/footer.php'); ?>
+    </body>
+</html>
+

=== added file 'server/manual/content/content/types.php'
--- server/manual/content/content/types.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/content/types.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+    <head>
+        <meta name="generator" content="HTML Tidy, see www.w3.org">
+        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+        <title><?php echo PRODUCT_NAME; ?> Documentation</title>
+        <link rel="stylesheet" type="text/css" href="../../css/doc.css">
+        <meta http-equiv="Content-Type" content="text/html">
+		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
+        <link href="img/favicon.ico" rel="shortcut icon">
+        <!-- Javascript Libraries -->
+		<script type="text/javascript" src="lib/jquery.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+    </head>
+
+    <body>
+    	<h2>Types of Content</h2>
+    
+  		<p>A content item is piece of media that you wish to display. This can be different types of media, such as 
+        Videos, Flash animations, RSS feeds, Pictures and more.</p>
+		<p>The library table comprises of all the content items that you have uploaded or created. You can also see any other 
+        content items that a user has shared within this table</p>
+
+     <blockquote>
+        <h3>Filter</h3>
+  		 <p>You can use the filter to search for the content item that you would like to modify.</p>
+        <ul>
+        	<p><strong>Name: </strong>Partial Name matching with the media items for display.</p>
+        	<p><strong>Type: </strong>List specific media type i.e. all, image or video</p>
+			<p><strong>Retired: </strong>List inactive media items in the library.</p>
+			<p><strong>Owner: </strong>List media items with the specified owner</p>
+			<p><strong>Original Filename: </strong>Display extra colume that shows the original file name for each media item.</p>
+        </ul>
+
+      	<p><img alt="Library Media" src="library_media.png"
+	       style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	       width="650" height="463"></p>
+
+        <h3>Files</h3>
+        <p><strong>Files</strong> consist of media files such as JPEG, WMV, AVI, SWF, PPT files that are stored on the server.</p>
+        
+        <ul>
+			<p><strong>JPG</strong> is the common type of file used for still photos</p>
+        	<p><strong>WMV</strong> stands for Windows Media Video files. These files allow full motion video to be shown on your display</p>
+			<p><strong>SWF</strong> these are flash animation files.</p>
+			<p><strong>PPT</strong> PowerPoint files can also be media types. If you wish to set an automated PowerPoint presentation to display all your slides you must configure this prior to upload. PowerPoint
+				support is only available under Internet Explorer and with client machines that have Microsoft Office installed.</p>
+        </ul>
+
+        <h3>RSS</h3>
+
+        <p><strong>RSS</strong> is used to retrieve information from the web that is syndicated in RSS.
+        News feeds are commonly distributed this way. RSS is the best way to get up to date information 
+        to your displays with less interaction on your behalf.</p>
+
+        <p>The RSS Style provides information for the automation of the feed. If you would like to display 
+        each story/item one at a time or if you would like a scroll effect. New custom effects can be built in 
+        the RSS Styles page and will appear in the drop down list when adding a RSS item.</p>
+       
+        <p><?php echo PRODUCT_NAME; ?> has default RSS Styles which are available for selection when adding RSS content
+        items. The RSS styles control how the RSS Feed is displayed. If the default RSS Styles do not achieve 
+        the desired effect for a particular RSS feed additional RSS Styles can be added by an <?php echo PRODUCT_NAME; ?> admin.</p>
+
+        <p>Note: This involves a knowledge of the way RSS, XSL and CSS are constructed.</p>
+        
+        <h3>Text</h3>
+
+        <p><strong>Text</strong> provides the ability to create information directly into the system.
+        Reports or messages can be created that can then be displayed on any layouts. Text input supports the
+        selections of fonts, colours and sizes.</p>
+
+        <h3>Website</h3>
+
+        <p><?php echo PRODUCT_NAME; ?> allows an entire web page to be added to a slide. Possible uses for this would
+        be a news article on a intranet news site.</p>
+
+        <p>Please note that <?php echo PRODUCT_NAME; ?> can not guarantee that the website will fit on the displays
+        that it gets scheduled on. The area that the website takes up on the slide will resize to fit, 
+        but due to its design the containing website may not.</p>
+
+        <h3>Datasets</h3>
+        <p>DataSets are a new <?php echo PRODUCT_NAME; ?> feature to design and display tabular data, formatted nicely, in a region on a layout.</p>
+      </blockquote>
+
+		<?php include('../../template/footer.php'); ?>
+    </body>
+</html>
+

=== added directory 'server/manual/content/dashboard'
=== added file 'server/manual/content/dashboard/dashboard.php'
--- server/manual/content/dashboard/dashboard.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/dashboard/dashboard.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+  	<!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1 lang="en-GB" class="western">Dashboard</h1>
+	
+	<p>There are two types of dashboard which can be presented to a user on log in.</p>
+	
+	<h2>Default Dashboard</h2>
+	
+	<p>When a user first logs in they are presented with the <?php echo PRODUCT_NAME; ?> Dashboard. This
+	page presents all the options available to maintain your <?php echo PRODUCT_NAME; ?> Network. </p>
+	
+	<p><img alt="Default Dashboard" src="dashboard_admin.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="545" height="318"></p>
+	
+	<a name="Dashboard" id="Dashboard"></a><h2>Dashboard Icons</h2>
+	
+	<p>The dashboard icons allow the user to navigate to specific sections of the
+	<?php echo PRODUCT_NAME; ?> Interface, below is a discription of each icon.</p>
+	<ul>
+	  <li>Schedule - Access the schedule for each display, and schedule new or existing layouts to displays.</li>
+	  <li>Layouts - Links to manage all the user's defined layouts i.e. create, edit or delete layouts.</li>
+	  <li>Library - Links to server library to manage its media contentes i.e. create, replace or delete media items.</li>
+	  <li>Templates - View the templates that are offered to users when they create new layouts.</li>
+	  <li>Users - Allows administration of users on the system (Admins Only).</li>
+	  <li>Settings - <?php echo PRODUCT_NAME; ?> server configuration settings (Admins Only)</li>
+	  <li>License - Information about the licenses <?php echo PRODUCT_NAME; ?> is released under.</li>
+	  <li>Manual - Access <?php echo PRODUCT_NAME; ?> online manual</li>
+	</ul>
+	
+	<a name="Media_Dashboard" id="Media_Dashboard"></a><h2>Media Manager Dashboard</h2>
+	
+	<p>The media manager dashboard is used to delegate specific tasks to users of
+	the system. When a user has had their homepage configured they will no longer
+	be able to access admin parts of <?php echo PRODUCT_NAME; ?>. The media manager will replace the default
+	dashboard with a simple dashboard, pictured below.</p>
+	
+	<p><img alt="Media Manager Dashboard" src="dashboard_user.png"
+	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
+	width="567" height="189"></p>
+	
+	<p>This icon provides the user with a direct link to the region of the
+	template that they have been delegated. To learn more about setting users
+	permissions click <a href="../users/overview.php">here</a>.</p>
+
+	<?php include('../../template/footer.php'); ?>
+</body>
+</html>

=== added file 'server/manual/content/dashboard/dashboard_admin.png'
Binary files server/manual/content/dashboard/dashboard_admin.png	1970-01-01 00:00:00 +0000 and server/manual/content/dashboard/dashboard_admin.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/dashboard/dashboard_user.png'
Binary files server/manual/content/dashboard/dashboard_user.png	1970-01-01 00:00:00 +0000 and server/manual/content/dashboard/dashboard_user.png	2013-04-11 16:56:27 +0000 differ
=== added file 'server/manual/content/dashboard/navbar.php'
--- server/manual/content/dashboard/navbar.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/dashboard/navbar.php	2013-04-11 16:56:27 +0000
@@ -0,0 +1,183 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?php include('../../template.php'); ?>
+<html>
+<head>
+  	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  	<title><?php echo PRODUCT_NAME; ?> Documentation</title>
+  	<link rel="stylesheet" type="text/css" href="../../css/doc.css">
+	<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
+	<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />  <link href="img/favicon.ico" rel="shortcut icon">
+ 	 <!-- Javascript Libraries -->
+  	<script type="text/javascript" src="lib/jquery.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
+  	<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
+</head>
+
+<body>
+	<h1>Navigation</h1>