Merge lp:~dangarner/xibo/server-160rc1-manual into lp:xibo/1.6

[Dan Garner]

=== modified file 'server/README.TXT'
--- server/README.TXT	2014-01-02 21:06:28 +0000
+++ server/README.TXT	2014-01-19 13:57:27 +0000
@@ -1,5 +1,10 @@
+<<<<<<< TREE
 Xibo - Digitial Signage - http://www.xibo.org.uk
 Copyright (C) 2006 - 2013 Daniel Garner, James Packer and Alex Harrington
+=======
+Xibo - Digital Signage - http://www.xibo.org.uk
+Copyright (C) 2006 - 2011 Daniel Garner, James Packer and Alex Harrington
+>>>>>>> MERGE-SOURCE
 
 This file is part of Xibo.
 

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2013-10-20 13:42:02 +0000
+++ server/config/config.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
@@ -176,7 +176,7 @@
 		}
 		
 		// Check for MySQL
-		$message = __('MySQL database (PHP MySql and PDO MySql)');
+		$message = __('MySQL database (PHP MySql)');
 
 		if ($this->CheckMySQL()) 
 		{
@@ -193,6 +193,25 @@
       		</div>
 END;
 		}
+
+		// Check for PDO
+		$message = __('MySQL database (PDO MySql)');
+
+		if ($this->CheckPDO()) 
+		{
+			$output .= $imgGood.$message.'<br />';
+		}
+		else
+		{
+			$this->envFault = true;
+			
+			$output .= $imgBad.$message.'<br />';
+			$output .= <<<END
+			<div class="check_explain">
+      			<p>Xibo requires the PHP PDO Extension to function.</p>
+      		</div>
+END;
+		}
 		
 		// Check for JSON
 		$message = __('JSON Extension');
@@ -459,10 +478,17 @@
 	 */
 	function CheckMySQL() 
 	{
-		return extension_loaded("pdo_mysql") && extension_loaded("mysql");
+		return extension_loaded("mysql");
 	}
 	
 	/**
+	 * Check PHP has the PDO module installed (with MySQL driver)
+	 */
+	function CheckPDO() {
+		return extension_loaded("pdo_mysql");
+	}
+
+	/**
 	 * Check PHP has the GetText module installed
 	 * @return 
 	 */

=== modified file 'server/config/db_config.php'
--- server/config/db_config.php	2013-05-01 19:24:35 +0000
+++ server/config/db_config.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/index.php'
--- server/index.php	2013-05-01 19:24:35 +0000
+++ server/index.php	2014-01-19 13:57: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) 2006-2012 Daniel Garner, James Packer and Alex Harrington
  *
  * This file is part of Xibo.

=== removed file 'server/install.php'
--- server/install.php	2013-08-21 22:27:13 +0000
+++ server/install.php	1970-01-01 00:00:00 +0000
@@ -1,748 +0,0 @@
-<?php
-/*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2009-2013 Alex Harrington
- *
- * This file is part of Xibo.
- *
- * Xibo is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version. 
- *
- * Xibo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */ 
-DEFINE('XIBO', true);
-
-if (! checkPHP()) 
-{
-	die('Xibo requires PHP 5.2.4 or later');
-}
-
-error_reporting(0);
-ini_set('display_errors', 0);
-
-include('lib/app/kit.class.php');
-include('install/header.inc');
-include('config/config.class.php');
-include('config/db_config.php');
-
-// Setup for the Translations using Gettext.
-// There is normally a class that will do this for us - but it requires a DB object (which we do not have at install time)
-// Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging
-// The actual translation function __() is included later in this file.
-$langs 		= Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
-$lang		= 'en-gb'; 		// Default language
-$encoding 	= '';			// We do not seem to need an encoding, but I read somewhere that we might - left as a reminder of this.
-
-if ($langs != '') 
-{
-	$langs 	= explode(',', $langs);
-	$lang 	= $langs[0];
-}
-
-// For windows
-putenv('LANG='.$lang.'.'.$encoding);
-putenv('LANGUAGE='.$lang.'.'.$encoding); 
-putenv('LC_ALL='.$lang.'.'.$encoding); 
-
-// Set local
-setlocale(LC_ALL, $lang.'.'.$encoding);
-
-// Translations have been setup.
-
-$fault = false;
-
-$xibo_step = Kit::GetParam('xibo_step',_POST,_INT,'0');
-
-if (!isset($xibo_step) || $xibo_step == 0) {
-  # First step of the process.
-  # Show a welcome screen and next button
-  ?>
-  <?php echo __("Welcome to the Xibo Installer!"); ?><br /><br />
-  <?php echo __("The installer will take you through setting up Xibo one step at a time."); ?><br /><br />
-  <?php echo __("Lets get started!"); ?><br /><br />
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="1" />
-    <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 1) {
-  # Check environment
-  $db = new Database();
-  $cObj = new Config();
-  ?>
-  <p><?php echo __("First we need to check if your server meets Xibo's requirements."); ?></p>
-  <div class="checks">
-  <?php
-    echo $cObj->CheckEnvironment();
-    if ($cObj->EnvironmentFault()) {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="1" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
-      </form>
-    <?php
-    }
-    else if ($cObj->EnvironmentWarning()) {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="1" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
-      </form>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="2" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-      </form>
-    <?php
-    }
-    else {
-    ?>
-      <form action="install.php" method="POST">
-        <input type="hidden" name="xibo_step" value="2" />
-        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
-      </form>
-    <?php
-    }    
-}
-elseif ($xibo_step == 2) {
-# Create database
-## Does database exist already?
-
-  ?>
-  <div class="info">
-    <p><?php echo __("Xibo needs to setup a new database."); ?></p>
-    <p><?php echo __("If you have not yet created an empty database and database user for Xibo to use, and know the username/password of a MySQL administrator, click the \"Create New\" button, otherwise click \"Use Existing\"."); ?></p>
-    <p><i><?php echo __("Note that any existing database must be empty"); ?></i></p>
-  </div>
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="3" />
-    <button type="submit"><?php echo __("Create New"); ?></button>
-  </form>
-  <form action="install.php" method="POST">
-    <input type="hidden" name="xibo_step" value="4" />
-    <button type="submit"><?php echo __("Use Existing"); ?></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 3) {
-## If not, gather admin password and use to create empty db and new user.
-?>
-<div class="info">
-<p><?php echo __("Since no empty database has been created for Xibo to use, we need the username and password of a MySQL administrator to create a new database, and database user for Xibo."); ?></p>
-<p><?php echo __("Additionally, please give us a new username and password to create in MySQL for Xibo to use. Xibo will create this automatically for you."); ?></p>
-<form action="install.php" method="POST">
-<input type="hidden" name="xibo_step" value="5" />
-<input type="hidden" name="db_create" value="On" />
-<div class="install_table">
-  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
-  <p><label for="admin_username"><?php echo __("Admin Username:"); ?>&nbsp;</label><input class="username" type="text" id="admin_username" name="admin_username" size="12" /></p>
-  <p><label for="admin_password"><?php echo __("Admin Password:"); ?>&nbsp;</label><input class="username" type="password" id="admin_password" name="admin_password" size="12" /></p>
-  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
-  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
-  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
-</div>
-</div>
-<button type="submit"><?php echo __("Create"); ?></button>
-</form>
-<?php
-}
-elseif ($xibo_step == 4) {
-## Get details of db that's been created already for us
-?>
-<div class="info">
-<p><?php echo __("Please enter the details of the database and user you have created for Xibo."); ?></p>
-<form action="install.php" method="POST">
-<input type="hidden" name="xibo_step" value="5" />
-<input type="hidden" name="db_create" value="Off" />
-<div class="install_table">
-  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
-  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
-  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
-  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
-</div>
-</div>
-<button type="submit"><?php echo __("Create"); ?></button>
-</form>
-<?php
-}
-elseif ($xibo_step == 5) {
-
-  $db_create = Kit::GetParam('db_create',_POST,_STRING);
-
-  if (!isset($db_create)) {
-    reportError("2",__("Something went wrong"));
-  }
-  else {
-    $db_host = Kit::GetParam('host',_POST,_STRING,'localhost');
-    $db_user = Kit::GetParam('db_username',_POST,_PASSWORD);
-    $db_pass = Kit::GetParam('db_password',_POST,_PASSWORD);
-    $db_name = Kit::GetParam('db_name',_POST,_PASSWORD);
-    ?>
-    <div class="info">
-    <?php
-    if ($db_create == 'On') {  
-      $db_admin_user = Kit::GetParam('admin_username',_POST,_PASSWORD);
-      $db_admin_pass = Kit::GetParam('admin_password',_POST,_PASSWORD);
-      
-      if (! ($db_host && $db_name && $db_user && $db_admin_user)) {
-        # Something was blank.
-        # Throw an error.
-        reportError("3", __("A field was blank. Please fill in all fields."));
-      }
-      
-      $db = @mysql_connect($db_host,$db_admin_user,$db_admin_pass);
-      
-      if (! $db) {
-        reportError("3", __("Could not connect to MySQL with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-      }
-      
-      ?>
-      <p><?php echo __("Creating new database."); ?></p>
-      <?php
-      flush();
-      
-      $SQL = sprintf("CREATE DATABASE `%s`",
-                      mysql_real_escape_string($db_name));
-      if (! @mysql_query($SQL, $db)) {
-        # Create database and user
-        reportError("3", __("Could not create a new database with the administrator details. Please check and try again.") . "<br /><br />" . "MySQL Error:" . "<br />" . mysql_error());
-      }
-      
-      # Choose the MySQL DB to create a user
-      @mysql_select_db("mysql", $db);
-
-      # Make $db_host lowercase so it matches "localhost" if required.
-      $db_host = strtolower($db_host);
-      
-      ?>
-      <p><?php echo __("Creating new user"); ?></p>
-      <?php
-      flush();
-      
-      if ($db_host == 'localhost') {
-        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%s' IDENTIFIED BY '%s'",
-                        mysql_real_escape_string($db_name),
-                        mysql_real_escape_string($db_user),
-                        mysql_real_escape_string($db_host),
-                        mysql_real_escape_string($db_pass));
-      }
-      else {
-        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%%' IDENTIFIED BY '%s'",
-                        mysql_real_escape_string($db_name),
-                        mysql_real_escape_string($db_user),
-                        mysql_real_escape_string($db_pass));
-      }
-      if (! @mysql_query($SQL, $db)) {
-          reportError("3", __("Could not create a new user with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-      }
-      
-
-      @mysql_query("FLUSH PRIVILEGES", $db);      
-      @mysql_close($db);
-      
-    }
-    else {
-      if (! ($db_host && $db_name && $db_user && $db_pass)) {
-        # Something was blank
-        # Throw an error.
-        reportError("4", __("A field was blank. Please fill in all fields.") . " " . $db_host . " " . $db_name . " " . $db_user . " " . $db_pass);
-      }
-    }
-    ## Populate database
-    
-    $db = @mysql_connect($db_host,$db_user,$db_pass);
-      
-    if (! $db) {
-      reportError("4", __("Could not connect to MySQL with the Xibo User account details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($db_name,$db);
-    
-    ?>
-    <p>Populating the database</p>
-    <?php
-    flush();
-    
-    # Load from sql files to db - HOW?
-    $sql_files = array('structure.sql', 'data.sql');
-
-    $sqlStatementCount = 0;
-
-    foreach ($sql_files as $filename) {
-      ?>
-      <p>Loading from <?php print $filename; ?>
-      <?php
-        flush();
-        
-        $delimiter = ';';
-        $sql_file = @file_get_contents('install/master/' . $filename);
-        $sql_file = remove_remarks($sql_file);
-        $sql_file = split_sql_file($sql_file, $delimiter);
-    
-        foreach ($sql_file as $sql) {
-          print ".";
-          $sqlStatementCount++;
-          flush();
-          if (! @mysql_query($sql,$db)) {
-            reportError("4", __("An error occured populating the database.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
-          }
-        }
-        print "</p>";
-    }
-    @mysql_close($db);
-  }
-  # Write out a new settings.php
-  $fh = fopen("settings.php", 'wt');
-  
-  if (! $fh) {
-    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
-  }
-  
-  settings_strings();
-  
-  $settings_content = '$dbhost = \'' . $db_host . '\';' . "\n";
-  $settings_content .= '$dbuser = \'' . $db_user . '\';' . "\n";
-  $settings_content .= '$dbpass = \'' . $db_pass . '\';' . "\n";
-  $settings_content .= '$dbname = \'' . $db_name . '\';' . "\n\n";
-  $settings_content .= 'define(\'SECRET_KEY\',\'' . gen_secret() . '\');' . "\n";
-  
-  if (! fwrite($fh, $settings_header . $settings_content . $settings_footer)) {
-    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
-  }
-    
-  fclose($fh);
-  
-  ?>
-  </div>
-  <div class="install_table">
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="6" />
-  </div>
-    <button type="submit"><?php echo __("Next"); ?> ></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 6) {
-  # Form to get new admin password
-  ?>
-  <div class="info">
-  <p><?php echo __("Xibo needs to set the \"xibo_admin\" user password. Please enter a password for this account below."); ?></p>
-  </div>
-  <div class="install_table">
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="7" />
-      <p><label for="password1"><?php echo __("Password:"); ?>&nbsp;</label><input type="password" name="password1" size="12" /></p>
-      <p><label for="password2"><?php echo __("Retype Password:"); ?>&nbsp;</label><input type="password" name="password2" size="12" /></p>
-  </div>
-    <button type="submit"><?php echo __("Next"); ?> ></button>
-  </form>
-  <?php
-}
-elseif ($xibo_step == 7) {
-  # Setup xibo_admin password
-  $password1 = Kit::GetParam('password1',_POST,_PASSWORD);
-  $password2 = Kit::GetParam('password2',_POST,_PASSWORD);
-  
-  if (!(($password1 && $password2) && ($password1 == $password2))) {
-    reportError("6", __("Please input a new password. Ensure both password fields are identical."));
-  }
-  
-  include('settings.php');
-  
-  $password_hash = md5($password1);
-  
-  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
-      
-    if (! $db) {
-      reportError("6", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($dbname,$db);
-
-    $SQL = sprintf("UPDATE `user` SET UserPassword = '%s' WHERE UserID = 1 LIMIT 1",
-                    mysql_real_escape_string($password_hash));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("6", __("An error occured changing the xibo_admin password.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
- 
-    @mysql_close($db);
-    
-    ?>
-    <div class="info">
-      <?php echo __("Successfully changed the xibo_admin password. We're nearly there now. Just a couple more steps!"); ?>
-    </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="8" />
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-    <?php
-}
-elseif ($xibo_step == 8) {
-  # Configure paths and keys
-  ## nuSoap
-  ## libraries
-  ## server_key
-  ?>
-  <div class="info">
-    <p><b><?php echo __("Library Location"); ?></b></p>
-    <p><?php echo __("Xibo needs somewhere to store the things you upload to be shown. Ideally, this should be somewhere outside the root of your webserver - that is such that is not accessible by a web browser. Please input the full path to this folder. If the folder does not already exist, Xibo will attempt to create it for you."); ?></p>
-    <form action="install.php" method="POST">
-    <div class="install_table">
-       <p><label for="library_location"><?php echo __("Library Location:"); ?>&nbsp;</label><input type="text" name="library_location" value="" /></p>
-    </div>
-    <p><b><?php echo __("Server Key"); ?></b></p>
-    <p><?php echo __("Xibo needs you to choose a \"key\". This will be required each time you setup a new client. It should be complicated, and hard to remember. It is visible in the admin interface, so it need not be written down separately."); ?></p>
-    <div class="install_table">
-      <p><label for="server_key"><?php echo __("Server Key:"); ?> </label><input type="text" name="server_key" value="" /></p>
-    </div>
-    <p><b><?php echo __("Statistics"); ?></b></p>
-    <p><?php echo __("We'd love to know you're running Xibo. If you're happy for us to collect anonymous statistics (version number, number of displays) then please leave the box ticked. Please untick the box if your server does not have direct access to the internet."); ?></p>
-    <div class="install_table">
-      <p><label for="stats"><?php echo __("Anonymous Statistics:"); ?>&nbsp;</label><input type="checkbox" name="stats" value="true" checked /></p>
-    </div>
-      <input type="hidden" name="xibo_step" value="9" />
-    </div>
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-  <?php
-}
-elseif ($xibo_step == 9) {
-
-  $server_key = Kit::GetParam('server_key',_POST,_STRING);
-  $library_location = Kit::GetParam('library_location',_POST,_STRING);
-  $stats = Kit::GetParam('stats',_POST,_BOOL);
-  
-  // Remove trailing whitespace from the path given.
-  $library_location = trim($library_location);
-
-  // Check both fields were completed
-  if (! ($server_key && $library_location)) {
-    reportError("8", __("A field was blank. Please make sure you complete all fields"));
-  }
-
-  if ($stats) {
-    $stats="On"; // Fixme: translate ?
-  }
-  else {
-    $stats="Off"; //Fixme : translate ?
-  }
-
-  // Does library_location exist already?
-  if (! is_dir($library_location)) {
-    if (is_file($library_location)) {
-      reportError("8", __("A file exists with the name you gave for the Library Location. Please choose another location"));
-    }
-
-    // Directory does not exist. Attempt to make it
-    // Using mkdir recursively, so it will attempt to make any
-    // intermediate folders required.
-    if (! mkdir($library_location,0755,true)) {
-      reportError("8", __("Could not create the Library Location directory for you. Please ensure the webserver has permission to create a folder in this location, or create the folder manually and grant permission for the webserver to write to the folder."));
-    }
-    
-  }
-  
-  // Is library_location writable?
-  if (! is_writable($library_location)) {
-    // Directory is not writable.
-    reportError("8", __("The Library Location you gave is not writable by the webserver. Please fix the permissions and try again."));
-  }
-  
-  // Is library_location empty?
-  if (count(ls("*",$library_location,true)) > 0) {
-    reportError("8", __("The Library Location you gave is not empty. Please give the location of an empty folder"));
-  }
-  
-  // Check if the user has added a trailing slash.
-  // If not, add one.
-  if (!((substr($library_location, -1) == '/') || (substr($library_location, -1) == '\\'))) {
-    $library_location = $library_location . '/';
-  }
-
-  include('settings.php');
-  
-  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
-      
-    if (! $db) {
-      reportError("8", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-      
-    @mysql_select_db($dbname,$db);
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'LIBRARY_LOCATION' LIMIT 1",
-                    mysql_real_escape_string($library_location));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured changing the library location.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'SERVER_KEY' LIMIT 1",
-                      mysql_real_escape_string($server_key));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured changing the server key.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
-    
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'defaultTimezone' LIMIT 1",
-                      mysql_real_escape_string(date_default_timezone_get()));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting the default timezone.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
-    }
- 
-    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'PHONE_HOME' LIMIT 1",
-                      mysql_real_escape_string($stats));
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-    $SQL = "UPDATE `setting` SET `value` = '" . md5(uniqid(rand(), true)) . "' WHERE `setting`.`setting` = 'PHONE_HOME_KEY' LIMIT 1";
-    if (! @mysql_query($SQL, $db)) {
-      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
-    }
-    
-    @mysql_close($db);
-  
-  ?>
-  <div class="info">
-    <p><?php echo __("Successfully set library location and server key."); ?></p>
-  </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="10" />
-      <button type="submit"><?php echo __("Next"); ?> ></button>
-    </form>
-  <?php
-}
-elseif ($xibo_step == 10) {
-# Delete install.php
-# Redirect to login page.
-  if (! unlink('install.php')) {
-    reportError("10", __("Unable to delete install.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
-  }
-  if (! unlink('upgrade.php')) {
-    reportError("10", __("Unable to delete upgrade.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
-  }
-  ?>
-  <div class="info">
-    <p><b><?php echo __("Xibo was successfully installed."); ?></b></p>
-    <p><?php echo __("Please click"); ?>&nbsp;<a href="index.php"><?php echo __("here"); ?></a>&nbsp;<?php echo __("to logon to Xibo as \"xibo_admin\" with the password you chose earlier."); ?></p>
-  </div>
-  <?php
-}
-else {
-  reportError("0", __("A required parameter was missing. Please go through the installer sequentially!"), __("Start Again")); // Fixme : translate "Start Again" ?
-}
- 
-include('install/footer.inc');
-
-# Functions
-function checkFsPermissions() {
-  # Check for appropriate filesystem permissions
-  return ((is_writable("install.php") && (is_writable("settings.php")) && (is_writable("upgrade.php")) || is_writable(".")));
-}
-
-function checkMySQL() {
-  # Check PHP has MySQL module installed
-  return extension_loaded("mysql");
-}
-
-function checkJson() {
-  # Check PHP has JSON module installed
-  return extension_loaded("json");
-}
-
-function checkGd() {
-  # Check PHP has JSON module installed
-  return extension_loaded("gd");
-}
-
-function checkCal() {
-  # Check PHP has JSON module installed
-  return extension_loaded("calendar");
-}
- 
-function reportError($step, $message, $button_text="&lt; Back") { // fixme : translate ?
-?>
-    <div class="info">
-      <?php print $message; ?>
-    </div>
-    <form action="install.php" method="POST">
-      <input type="hidden" name="xibo_step" value="<?php print $step; ?>"/>
-      <button type="submit"><?php print $button_text; ?></button>
-    </form>
-  <?php
-  include('install/footer.inc');
-  die();
-} 
-
-// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
-// By Crackster 
-/**
- * remove_remarks will strip the sql comment lines out of an uploaded sql file
- */
-function remove_remarks($sql){
-  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^[-].*$/m', "\n", $sql));
-  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
-  return $sql;
-}
-
-// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
-// By Crackster              
-/**
- * split_sql_file will split an uploaded sql file into single sql statements.
- * Note: expects trim() to have already been run on $sql.
- */
-function split_sql_file($sql, $delimiter){
-  $sql = str_replace("\r" , '', $sql);
-  $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
-  $data = array_map('trim', $data);
-  // The empty case
-  $end_data = end($data);
-  if (empty($end_data))
-  {
-    unset($data[key($data)]);
-  }
-  return $data;
-}
- 
-/**
- * This funtion will take a pattern and a folder as the argument and go thru it(recursivly if needed)and return the list of 
- *               all files in that folder.
- * Link             : http://www.bin-co.com/php/scripts/filesystem/ls/
- * License	: BSD
- * Arguments     :  $pattern - The pattern to look out for [OPTIONAL]
- *                    $folder - The path of the directory of which's directory list you want [OPTIONAL]
- *                    $recursivly - The funtion will traverse the folder tree recursivly if this is true. Defaults to false. [OPTIONAL]
- *                    $options - An array of values 'return_files' or 'return_folders' or both
- * Returns       : A flat list with the path of all the files(no folders) that matches the condition given.
- */
-function ls($pattern="*", $folder="", $recursivly=false, $options=array('return_files','return_folders')) {
-    if($folder) {
-        $current_folder = realpath('.');
-        if(in_array('quiet', $options)) { // If quiet is on, we will suppress the 'no such folder' error
-            if(!file_exists($folder)) return array();
-        }
-        
-        if(!chdir($folder)) return array();
-    }
-    
-    
-    $get_files    = in_array('return_files', $options);
-    $get_folders= in_array('return_folders', $options);
-    $both = array();
-    $folders = array();
-    
-    // Get the all files and folders in the given directory.
-    if($get_files) $both = glob($pattern, GLOB_BRACE + GLOB_MARK);
-    if($recursivly or $get_folders) $folders = glob("*", GLOB_ONLYDIR + GLOB_MARK);
-    
-    //If a pattern is specified, make sure even the folders match that pattern.
-    $matching_folders = array();
-    if($pattern !== '*') $matching_folders = glob($pattern, GLOB_ONLYDIR + GLOB_MARK);
-    
-    //Get just the files by removing the folders from the list of all files.
-    $all = array_values(array_diff($both,$folders));
-        
-    if($recursivly or $get_folders) {
-        foreach ($folders as $this_folder) {
-            if($get_folders) {
-                //If a pattern is specified, make sure even the folders match that pattern.
-                if($pattern !== '*') {
-                    if(in_array($this_folder, $matching_folders)) array_push($all, $this_folder);
-                }
-                else array_push($all, $this_folder);
-            }
-            
-            if($recursivly) {
-                // Continue calling this function for all the folders
-                $deep_items = ls($pattern, $this_folder, $recursivly, $options); # :RECURSION:
-                foreach ($deep_items as $item) {
-                    array_push($all, $this_folder . $item);
-                }
-            }
-        }
-    }
-    
-    if($folder) chdir($current_folder);
-    return $all;
-}
-
-function gen_secret() {
-  # Generates a random 12 character alphanumeric string to use as a salt
-  mt_srand((double)microtime()*1000000);
-  $key = "";
-  for ($i=0; $i < 12; $i++) {
-    $c = mt_rand(0,2);
-    if ($c == 0) {
-      $key .= chr(mt_rand(65,90));
-    }
-    elseif ($c == 1) {
-      $key .= chr(mt_rand(97,122));
-    }
-    else {
-      $key .= chr(mt_rand(48,57));
-    }
-  } 
-  
-  return $key;
-}
-
-function checkPHP() 
-{
-	return (version_compare("5.2.4",phpversion(), "<="));
-}
-
-function CheckGettext() 
-{
-	return extension_loaded("gettext");
-}
-
-// Setup the translations for gettext
-function __($string)
-{
-	if (CheckGettext())
-	{
-		return _($string);
-	}
-	else
-	{
-		return $string;
-	}
-}
-
-function settings_strings() {
-global $settings_header;
-global $settings_footer;
-
-  $settings_header = <<<END
-<?php
-
-/*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- *
- * This file is part of Xibo - and is automatically generated by the installer
- *
- * You should not need to edit this file, unless your SQL connection details have changed.
- */
-
-defined('XIBO') or die(__("Sorry, you are not allowed to directly access this page.") . "<br />" . __("Please press the back button in your browser."));
-
-global \$dbhost;
-global \$dbuser;
-global \$dbpass;
-global \$dbname;
-
-
-END;
-
-$settings_footer = <<<END
-?>
-END;
-
-  return;
-}
-?>

=== modified file 'server/install/database/65.sql'
--- server/install/database/65.sql	2013-11-11 09:06:47 +0000
+++ server/install/database/65.sql	2014-01-19 13:57:27 +0000
@@ -1,4 +1,5 @@
 
+<<<<<<< TREE
 INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) 
 VALUES (NULL, 'SCHEDULE_WITH_VIEW_PERMISSION', 'No', 'dropdown', 'Should users with View permissions on displays be allowed to schedule to them?', 'Yes|No', 'permissions', '1');
 
@@ -7,5 +8,8 @@
 UPDATE `menuitem` SET `Args`='manual/index.php' WHERE `Text`='Manual';
 
 UPDATE `version` SET `app_ver` = '1.5.2', `XmdsVersion` = 3;
+=======
+UPDATE `version` SET `app_ver` = '1.6.0-rc1', `XmdsVersion` = 3;
+>>>>>>> MERGE-SOURCE
 UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
-UPDATE `version` SET `DBVersion` = '65';
\ No newline at end of file
+UPDATE `version` SET `DBVersion` = '66';
\ No newline at end of file

=== added file 'server/install/database/66.sql'
--- server/install/database/66.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/66.sql	2014-01-19 13:57:27 +0000
@@ -0,0 +1,83 @@
+DELETE FROM `help`;
+
+INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
+(1, 'Layout', 'General', 'manual/single.php?p=layout/overview'),
+(2, 'Content', 'General', 'manual/single.php?p=content/overview'),
+(4, 'Schedule', 'General', 'manual/single.php?p=schedule/overview'),
+(5, 'Group', 'General', 'manual/single.php?p=users/groups'),
+(6, 'Admin', 'General', 'manual/single.php?p=admin/settings'),
+(7, 'Report', 'General', 'manual/single.php?p=admin/advanced'),
+(8, 'Dashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard'),
+(9, 'User', 'General', 'manual/single.php?p=users/users'),
+(10, 'Display', 'General', 'manual/single.php?p=admin/displays'),
+(11, 'DisplayGroup', 'General', 'manual/single.php?p=admin/displaygroups'),
+(12, 'Layout', 'Add', 'manual/single.php?p=layout/overview#Add_Layout'),
+(13, 'Layout', 'Background', 'manual/single.php?p=layout/layoutdesigner#Background'),
+(14, 'Content', 'Assign', 'manual/single.php?p=layout/assigncontent#Assigning_Content'),
+(15, 'Layout', 'RegionOptions', 'manual/single.php?p=layout/assigncontent'),
+(16, 'Content', 'AddtoLibrary', 'manual/single.php?p=content/adding'),
+(17, 'Display', 'Edit', 'manual/single.php?p=admin/displays#Display_Edit'),
+(18, 'Display', 'Delete', 'manual/single.php?p=admin/displays#Display_Delete'),
+(19, 'Displays', 'Groups', 'manual/single.php?p=admin/displaygroups#Group_Members'),
+(20, 'UserGroup', 'Add', 'manual/single.php?p=users/groups#Adding_Group'),
+(21, 'User', 'Add', 'manual/single.php?p=users/users#Add_User'),
+(22, 'User', 'Delete', 'manual/single.php?p=users/users#Delete_User'),
+(23, 'Content', 'Config', 'manual/single.php?p=admin/settings#Content'),
+(24, 'LayoutMedia', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(25, 'Region', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(26, 'Library', 'Assign', 'manual/single.php?p=layout/assigncontent#Add_From_Library'),
+(27, 'Media', 'Delete', 'manual/single.php?p=content/deleting'),
+(28, 'DisplayGroup', 'Add', 'manual/single.php?p=admin/displaygroups#Add_Group'),
+(29, 'DisplayGroup', 'Edit', 'manual/single.php?p=admin/displaygroups#Edit_Group'),
+(30, 'DisplayGroup', 'Delete', 'manual/single.php?p=admin/displaygroups#Delete_Group'),
+(31, 'DisplayGroup', 'Members', 'manual/single.php?p=admin/displaygroups#Group_Members'),
+(32, 'DisplayGroup', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(34, 'Schedule', 'ScheduleNow', 'manual/single.php?p=schedule/schedule_now'),
+(35, 'Layout', 'Delete', 'manual/single.php?p=layout/overview#Delete_Layout'),
+(36, 'Layout', 'Copy', 'manual/single.php?p=layout/overview#Copy_Layout'),
+(37, 'Schedule', 'Edit', 'manual/single.php?p=schedule/schedule_event'),
+(38, 'Schedule', 'Add', 'manual/single.php?p=schedule/schedule_event'),
+(39, 'Layout', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(40, 'Display', 'MediaInventory', 'manual/single.php?p=admin/displays#Media_Inventory'),
+(41, 'User', 'ChangePassword', 'manual/single.php?p=coreconcepts/navbar#Change_Password'),
+(42, 'Schedule', 'Delete', 'manual/single.php?p=schedule/schedule_event'),
+(43, 'Layout', 'Edit', 'manual/single.php?p=layout/overview#Edit_Layout'),
+(44, 'Media', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(45, 'Display', 'DefaultLayout', 'manual/single.php?p=admin/displays'),
+(46, 'UserGroup', 'Edit', 'manual/single.php?p=users/groups#Edit_Group'),
+(47, 'UserGroup', 'Members', 'manual/single.php?p=users/groups#Group_Member'),
+(48, 'User', 'PageSecurity', 'manual/single.php?p=users/menu_page_security#Page_Security'),
+(49, 'User', 'MenuSecurity', 'manual/single.php?p=users/menu_page_security#Menu_Security'),
+(50, 'UserGroup', 'Delete', 'manual/single.php?p=users/groups#Delete_Group'),
+(51, 'User', 'Edit', 'manual/single.php?p=users/users#Edit_User'),
+(52, 'User', 'Applications', 'manual/single.php?p=users/users#Users_MyApplications'),
+(53, 'User', 'SetHomepage', 'manual/single.php?p=coreconcepts/dashboard#Media_Dashboard'),
+(54, 'DataSet', 'General', 'manual/single.php?p=content/content_dataset'),
+(55, 'DataSet', 'Add', 'manual/single.php?p=content/content_dataset#Create_Dataset'),
+(56, 'DataSet', 'Edit', 'manual/single.php?p=content/content_dataset#Edit_Dataset'),
+(57, 'DataSet', 'Delete', 'manual/single.php?p=content/content_dataset#Delete_Dataset'),
+(58, 'DataSet', 'AddColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(59, 'DataSet', 'EditColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(60, 'DataSet', 'DeleteColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(61, 'DataSet', 'Data', 'manual/single.php?p=content/content_dataset#Dataset_Row'),
+(62, 'DataSet', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(63, 'Fault', 'General', 'manual/single.php?p=admin/advanced#Report_Fault'),
+(65, 'Stats', 'General', 'manual/single.php?p=admin/displaystats'),
+(66, 'Resolution', 'General', 'manual/single.php?p=templates/template_resolution'),
+(67, 'Template', 'General', 'manual/single.php?p=templates/overview'),
+(68, 'Services', 'Register', 'manual/single.php?p=admin/api_oauth#Registered_Applications'),
+(69, 'OAuth', 'General', 'manual/single.php?p=admin/api_oauth'),
+(70, 'Services', 'Log', 'manual/single.php?p=admin/api_oauth#oAuthLog'),
+(71, 'Module', 'Edit', 'manual/single.php?p=admin/modules'),
+(72, 'Module', 'General', 'manual/single.php?p=admin/modules'),
+(73, 'Campaign', 'General', 'manual/single.php?p=layout/campaign_layout'),
+(74, 'License', 'General', 'manual/single.php?p=license/licenses'),
+(75, 'DataSet', 'ViewColumns', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(76, 'Campaign', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(77, 'Transition', 'Edit', 'manual/single.php?p=layout/transitions'),
+(78, 'User', 'SetPassword', 'manual/single.php?p=users/users#Set_Password'),
+(79, 'DataSet', 'ImportCSV', 'manual/single.php?p=content/content_dataset#Import_CSV');
+
+UPDATE `version` SET `app_ver` = '1.6.0-rc1', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '66';
\ No newline at end of file

=== modified file 'server/install/header.inc'
--- server/install/header.inc	2013-05-01 19:25:37 +0000
+++ server/install/header.inc	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/install/header_upgrade.inc'
--- server/install/header_upgrade.inc	2013-05-01 19:25:37 +0000
+++ server/install/header_upgrade.inc	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/install/install.css'
--- server/install/install.css	2013-05-01 19:25:37 +0000
+++ server/install/install.css	2014-01-19 13:57:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - http://www.xibo.org.uk
  * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2013-11-11 09:06:47 +0000
+++ server/install/master/data.sql	2014-01-19 13:57:27 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.5.2', 3, 1, 65);
+('1.6.0-rc1', 3, 1, 66);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),
@@ -7,82 +7,82 @@
 (3, 'xibo_admin', 1, 0);
 
 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'),
-(78, 'User', 'SetPassword', 'manual/content/users/users.php#Set_Password');
+(1, 'Layout', 'General', 'manual/single.php?p=layout/overview'),
+(2, 'Content', 'General', 'manual/single.php?p=content/overview'),
+(4, 'Schedule', 'General', 'manual/single.php?p=schedule/overview'),
+(5, 'Group', 'General', 'manual/single.php?p=users/groups'),
+(6, 'Admin', 'General', 'manual/single.php?p=admin/settings'),
+(7, 'Report', 'General', 'manual/single.php?p=admin/advanced'),
+(8, 'Dashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard'),
+(9, 'User', 'General', 'manual/single.php?p=users/users'),
+(10, 'Display', 'General', 'manual/single.php?p=admin/displays'),
+(11, 'DisplayGroup', 'General', 'manual/single.php?p=admin/displaygroups'),
+(12, 'Layout', 'Add', 'manual/single.php?p=layout/overview#Add_Layout'),
+(13, 'Layout', 'Background', 'manual/single.php?p=layout/layoutdesigner#Background'),
+(14, 'Content', 'Assign', 'manual/single.php?p=layout/assigncontent#Assigning_Content'),
+(15, 'Layout', 'RegionOptions', 'manual/single.php?p=layout/assigncontent'),
+(16, 'Content', 'AddtoLibrary', 'manual/single.php?p=content/adding'),
+(17, 'Display', 'Edit', 'manual/single.php?p=admin/displays#Display_Edit'),
+(18, 'Display', 'Delete', 'manual/single.php?p=admin/displays#Display_Delete'),
+(19, 'Displays', 'Groups', 'manual/single.php?p=admin/displaygroups#Group_Members'),
+(20, 'UserGroup', 'Add', 'manual/single.php?p=users/groups#Adding_Group'),
+(21, 'User', 'Add', 'manual/single.php?p=users/users#Add_User'),
+(22, 'User', 'Delete', 'manual/single.php?p=users/users#Delete_User'),
+(23, 'Content', 'Config', 'manual/single.php?p=admin/settings#Content'),
+(24, 'LayoutMedia', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(25, 'Region', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(26, 'Library', 'Assign', 'manual/single.php?p=layout/assigncontent#Add_From_Library'),
+(27, 'Media', 'Delete', 'manual/single.php?p=content/deleting'),
+(28, 'DisplayGroup', 'Add', 'manual/single.php?p=admin/displaygroups#Add_Group'),
+(29, 'DisplayGroup', 'Edit', 'manual/single.php?p=admin/displaygroups#Edit_Group'),
+(30, 'DisplayGroup', 'Delete', 'manual/single.php?p=admin/displaygroups#Delete_Group'),
+(31, 'DisplayGroup', 'Members', 'manual/single.php?p=admin/displaygroups#Group_Members'),
+(32, 'DisplayGroup', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(34, 'Schedule', 'ScheduleNow', 'manual/single.php?p=schedule/schedule_now'),
+(35, 'Layout', 'Delete', 'manual/single.php?p=layout/overview#Delete_Layout'),
+(36, 'Layout', 'Copy', 'manual/single.php?p=layout/overview#Copy_Layout'),
+(37, 'Schedule', 'Edit', 'manual/single.php?p=schedule/schedule_event'),
+(38, 'Schedule', 'Add', 'manual/single.php?p=schedule/schedule_event'),
+(39, 'Layout', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(40, 'Display', 'MediaInventory', 'manual/single.php?p=admin/displays#Media_Inventory'),
+(41, 'User', 'ChangePassword', 'manual/single.php?p=coreconcepts/navbar#Change_Password'),
+(42, 'Schedule', 'Delete', 'manual/single.php?p=schedule/schedule_event'),
+(43, 'Layout', 'Edit', 'manual/single.php?p=layout/overview#Edit_Layout'),
+(44, 'Media', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(45, 'Display', 'DefaultLayout', 'manual/single.php?p=admin/displays'),
+(46, 'UserGroup', 'Edit', 'manual/single.php?p=users/groups#Edit_Group'),
+(47, 'UserGroup', 'Members', 'manual/single.php?p=users/groups#Group_Member'),
+(48, 'User', 'PageSecurity', 'manual/single.php?p=users/menu_page_security#Page_Security'),
+(49, 'User', 'MenuSecurity', 'manual/single.php?p=users/menu_page_security#Menu_Security'),
+(50, 'UserGroup', 'Delete', 'manual/single.php?p=users/groups#Delete_Group'),
+(51, 'User', 'Edit', 'manual/single.php?p=users/users#Edit_User'),
+(52, 'User', 'Applications', 'manual/single.php?p=users/users#Users_MyApplications'),
+(53, 'User', 'SetHomepage', 'manual/single.php?p=coreconcepts/dashboard#Media_Dashboard'),
+(54, 'DataSet', 'General', 'manual/single.php?p=content/content_dataset'),
+(55, 'DataSet', 'Add', 'manual/single.php?p=content/content_dataset#Create_Dataset'),
+(56, 'DataSet', 'Edit', 'manual/single.php?p=content/content_dataset#Edit_Dataset'),
+(57, 'DataSet', 'Delete', 'manual/single.php?p=content/content_dataset#Delete_Dataset'),
+(58, 'DataSet', 'AddColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(59, 'DataSet', 'EditColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(60, 'DataSet', 'DeleteColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(61, 'DataSet', 'Data', 'manual/single.php?p=content/content_dataset#Dataset_Row'),
+(62, 'DataSet', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(63, 'Fault', 'General', 'manual/single.php?p=admin/advanced#Report_Fault'),
+(65, 'Stats', 'General', 'manual/single.php?p=admin/displaystats'),
+(66, 'Resolution', 'General', 'manual/single.php?p=templates/template_resolution'),
+(67, 'Template', 'General', 'manual/single.php?p=templates/overview'),
+(68, 'Services', 'Register', 'manual/single.php?p=admin/api_oauth#Registered_Applications'),
+(69, 'OAuth', 'General', 'manual/single.php?p=admin/api_oauth'),
+(70, 'Services', 'Log', 'manual/single.php?p=admin/api_oauth#oAuthLog'),
+(71, 'Module', 'Edit', 'manual/single.php?p=admin/modules'),
+(72, 'Module', 'General', 'manual/single.php?p=admin/modules'),
+(73, 'Campaign', 'General', 'manual/single.php?p=layout/campaign_layout'),
+(74, 'License', 'General', 'manual/single.php?p=license/licenses'),
+(75, 'DataSet', 'ViewColumns', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
+(76, 'Campaign', 'Permissions', 'manual/single.php?p=users/user_permissions'),
+(77, 'Transition', 'Edit', 'manual/single.php?p=layout/transitions'),
+(78, 'User', 'SetPassword', 'manual/single.php?p=users/users#Set_Password'),
+(79, 'DataSet', 'ImportCSV', 'manual/single.php?p=content/content_dataset#Import_CSV');
 
 INSERT INTO `menu` (`MenuID`, `Menu`) VALUES
 (8, 'Administration Menu'),
@@ -95,15 +95,20 @@
 
 INSERT INTO `module` (`ModuleID`, `Module`, `Name`, `Enabled`, `RegionSpecific`, `Description`, `ImageUri`, `SchemaVersion`, `ValidExtensions`, `PreviewEnabled`) VALUES
 (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),
+(2, 'Video', 'Video', 1, 0, 'Videos - support varies depending on the client hardware you are using.', 'forms/video.gif', 1, 'wmv,avi,mpg,mpeg,webm,mp4', 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),
+<<<<<<< TREE
 (9, 'MicroBlog', 'MicroBlog', 0, 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),
+=======
+(9, 'MicroBlog', 'MicroBlog', 0, 1, NULL, 'forms/microblog.gif', 1, NULL, 1),
+(10, 'Counter', 'Counter', 0, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1),
+>>>>>>> MERGE-SOURCE
 (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);

=== modified file 'server/lib/app/app_functions.php'
--- server/lib/app/app_functions.php	2013-11-03 11:24:11 +0000
+++ server/lib/app/app_functions.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/datemanager.class.php'
--- server/lib/app/datemanager.class.php	2013-05-01 19:25:37 +0000
+++ server/lib/app/datemanager.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/debug.class.php'
--- server/lib/app/debug.class.php	2013-08-21 22:27:13 +0000
+++ server/lib/app/debug.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/formmanager.class.php'
--- server/lib/app/formmanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/formmanager.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/helpmanager.class.php'
--- server/lib/app/helpmanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/helpmanager.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2013-09-03 10:06:55 +0000
+++ server/lib/app/kit.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
@@ -61,7 +61,6 @@
 		} 
 		else 
 		{
-			header( 'HTTP/1.1 301 Moved Permanently' );
 			header( 'Location: ' . $url );
 		}
 		
@@ -615,5 +614,19 @@
 			return false;
 		}
 	}
+
+	/**
+	 * Format Bytes
+	 * http://stackoverflow.com/questions/2510434/format-bytes-to-kilobytes-megabytes-gigabytes
+	 * @param  [int]  $size   The file size in bytes
+	 * @param  integer $precision The precision to go to
+	 * @return [string] The Formatted string with suffix
+	 */
+	public static function formatBytes($size, $precision = 2) {
+		$base = log($size) / log(1024);
+		$suffixes = array('', 'k', 'M', 'G', 'T');   
+
+		return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
+	}
 }
 ?>

=== modified file 'server/lib/app/menumanager.class.php'
--- server/lib/app/menumanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/menumanager.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/modulemanager.class.php'
--- server/lib/app/modulemanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/modulemanager.class.php	2014-01-19 13:57: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) 2006-2012 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/pagemanager.class.php'
--- server/lib/app/pagemanager.class.php	2013-11-03 11:24:11 +0000
+++ server/lib/app/pagemanager.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/pdoconnect.class.php'
--- server/lib/app/pdoconnect.class.php	2013-08-21 09:51:59 +0000
+++ server/lib/app/pdoconnect.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/permissionmanager.class.php'
--- server/lib/app/permissionmanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/permissionmanager.class.php	2014-01-19 13:57: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) 2011 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/responsemanager.class.php'
--- server/lib/app/responsemanager.class.php	2013-11-03 11:24:11 +0000
+++ server/lib/app/responsemanager.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/rssreader.class.php'
--- server/lib/app/rssreader.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/app/rssreader.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/session.class.php'
--- server/lib/app/session.class.php	2013-09-03 10:06:55 +0000
+++ server/lib/app/session.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/thememanager.class.php'
--- server/lib/app/thememanager.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/app/thememanager.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/app/translationengine.class.php'
--- server/lib/app/translationengine.class.php	2013-08-21 09:51:59 +0000
+++ server/lib/app/translationengine.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/campaign.data.class.php'
--- server/lib/data/campaign.data.class.php	2013-09-21 14:58:19 +0000
+++ server/lib/data/campaign.data.class.php	2014-01-19 13:57: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) 2012-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/campaignsecurity.data.class.php'
--- server/lib/data/campaignsecurity.data.class.php	2013-09-14 17:51:02 +0000
+++ server/lib/data/campaignsecurity.data.class.php	2014-01-19 13:57: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) 2012-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/data.class.php'
--- server/lib/data/data.class.php	2013-09-16 19:43:53 +0000
+++ server/lib/data/data.class.php	2014-01-19 13:57: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-2012 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	2013-09-21 14:58:19 +0000
+++ server/lib/data/dataset.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/datasetcolumn.data.class.php'
--- server/lib/data/datasetcolumn.data.class.php	2013-09-14 17:51:02 +0000
+++ server/lib/data/datasetcolumn.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2013-09-21 14:58:19 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/datasetgroupsecurity.data.class.php'
--- server/lib/data/datasetgroupsecurity.data.class.php	2013-09-14 18:06:51 +0000
+++ server/lib/data/datasetgroupsecurity.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/display.data.class.php'
--- server/lib/data/display.data.class.php	2013-10-20 14:36:21 +0000
+++ server/lib/data/display.data.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/displaygroup.data.class.php'
--- server/lib/data/displaygroup.data.class.php	2013-09-21 14:58:19 +0000
+++ server/lib/data/displaygroup.data.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/displaygroupsecurity.data.class.php'
--- server/lib/data/displaygroupsecurity.data.class.php	2013-09-21 15:18:29 +0000
+++ server/lib/data/displaygroupsecurity.data.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/file.data.class.php'
--- server/lib/data/file.data.class.php	2013-09-22 10:37:35 +0000
+++ server/lib/data/file.data.class.php	2014-01-19 13:57: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) 2010-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/help.data.class.php'
--- server/lib/data/help.data.class.php	2013-09-22 10:37:35 +0000
+++ server/lib/data/help.data.class.php	2014-01-19 13:57: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) 2012-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/layout.data.class.php'
--- server/lib/data/layout.data.class.php	2013-11-03 22:44:50 +0000
+++ server/lib/data/layout.data.class.php	2014-01-19 13:57: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) 2011-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/layoutmediagroupsecurity.data.class.php'
--- server/lib/data/layoutmediagroupsecurity.data.class.php	2013-09-22 15:49:19 +0000
+++ server/lib/data/layoutmediagroupsecurity.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/layoutregiongroupsecurity.data.class.php'
--- server/lib/data/layoutregiongroupsecurity.data.class.php	2013-09-22 13:31:06 +0000
+++ server/lib/data/layoutregiongroupsecurity.data.class.php	2014-01-19 13:57: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) 2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/maintenance.data.class.php'
--- server/lib/data/maintenance.data.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/data/maintenance.data.class.php	2014-01-19 13:57: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) 2012 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/media.data.class.php'
--- server/lib/data/media.data.class.php	2013-09-22 15:49:19 +0000
+++ server/lib/data/media.data.class.php	2014-01-19 13:57: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) 2010-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/mediagroupsecurity.data.class.php'
--- server/lib/data/mediagroupsecurity.data.class.php	2013-09-22 13:31:06 +0000
+++ server/lib/data/mediagroupsecurity.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/region.data.class.php'
--- server/lib/data/region.data.class.php	2013-11-02 13:30:06 +0000
+++ server/lib/data/region.data.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/resolution.data.class.php'
--- server/lib/data/resolution.data.class.php	2013-09-22 14:01:16 +0000
+++ server/lib/data/resolution.data.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/schedule.data.class.php'
--- server/lib/data/schedule.data.class.php	2013-11-11 10:32:42 +0000
+++ server/lib/data/schedule.data.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/setting.data.class.php'
--- server/lib/data/setting.data.class.php	2013-09-22 14:01:16 +0000
+++ server/lib/data/setting.data.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/stat.data.class.php'
--- server/lib/data/stat.data.class.php	2013-09-28 14:00:01 +0000
+++ server/lib/data/stat.data.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/template.data.class.php'
--- server/lib/data/template.data.class.php	2013-09-22 14:01:16 +0000
+++ server/lib/data/template.data.class.php	2014-01-19 13:57: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) 2011-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/templategroupsecurity.data.class.php'
--- server/lib/data/templategroupsecurity.data.class.php	2013-09-22 14:34:20 +0000
+++ server/lib/data/templategroupsecurity.data.class.php	2014-01-19 13:57: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) 2011-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/userdata.data.class.php'
--- server/lib/data/userdata.data.class.php	2013-09-22 14:34:20 +0000
+++ server/lib/data/userdata.data.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/data/usergroup.data.class.php'
--- server/lib/data/usergroup.data.class.php	2013-09-22 14:34:20 +0000
+++ server/lib/data/usergroup.data.class.php	2014-01-19 13:57: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-11 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2013-08-21 22:27:13 +0000
+++ server/lib/include.php	2014-01-19 13:57: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) 2006-2012 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
@@ -20,7 +20,7 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
-define('WEBSITE_VERSION', 65);
+define('WEBSITE_VERSION', 66);
 
 // No errors reported until we read the settings from the DB
 error_reporting(0);

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2013-11-11 08:36:36 +0000
+++ server/lib/modules/module.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/modules/module.interface.php'
--- server/lib/modules/module.interface.php	2013-05-01 19:24:35 +0000
+++ server/lib/modules/module.interface.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/oauth.inc.php'
--- server/lib/oauth.inc.php	2013-08-21 09:36:12 +0000
+++ server/lib/oauth.inc.php	2014-01-19 13:57: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) 2010 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2013-10-20 14:26:32 +0000
+++ server/lib/pages/admin.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/campaign.class.php'
--- server/lib/pages/campaign.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/campaign.class.php	2014-01-19 13:57: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) 2012-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/clock.class.php'
--- server/lib/pages/clock.class.php	2013-05-01 19:25:37 +0000
+++ server/lib/pages/clock.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2013-11-03 12:54:28 +0000
+++ server/lib/pages/content.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
@@ -112,11 +112,8 @@
 			$row['permissions'] = $group = $this->GroupsForMedia($row['mediaid']);
 			$row['revised'] = ($row['parentid'] != 0) ? Theme::Image('act.gif') : '';
 
-			// Display a friendly filesize
-			$sz = 'BKMGTP';
-            $factor = floor((strlen($row['filesize']) - 1) / 3);
-            $fileSize = sprintf('%.2f', $row['filesize'] / pow(1024, $factor)) . @$sz[$factor];
-			$row['size_text'] = $fileSize;
+			// Display a friendly file size
+			$row['size_text'] = Kit::FormatBytes($row['filesize']);
 
 			$row['buttons'] = array();
 

=== modified file 'server/lib/pages/dashboard.class.php'
--- server/lib/pages/dashboard.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/pages/dashboard.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/dataset.class.php'
--- server/lib/pages/dataset.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/dataset.class.php	2014-01-19 13:57: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) 2011-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/display.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/displaygroup.class.php'
--- server/lib/pages/displaygroup.class.php	2013-08-20 20:17:11 +0000
+++ server/lib/pages/displaygroup.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/error.class.php'
--- server/lib/pages/error.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/pages/error.class.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/fault.class.php'
--- server/lib/pages/fault.class.php	2013-08-21 22:27:13 +0000
+++ server/lib/pages/fault.class.php	2014-01-19 13:57: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-13 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/group.class.php'
--- server/lib/pages/group.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/group.class.php	2014-01-19 13:57: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) 2006,2007,2008,2009 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
@@ -695,7 +695,7 @@
         $form = Theme::RenderReturn('usergroup_form_user_assign');
 
         $response->SetFormRequestResponse($form, __('Manage Membership'), '400', '375', 'ManageMembersCallBack');
-        $response->AddButton(__('Help'), "XiboHelpRender(". HelpManager::Link('UserGroup', 'Members') .")");
+        $response->AddButton(__('Help'), "XiboHelpRender('" . HelpManager::Link('UserGroup', 'Members') . "')");
         $response->AddButton(__('Cancel'), 'XiboDialogClose()');
         $response->AddButton(__('Save'), 'MembersSubmit()');
         $response->Respond();

=== modified file 'server/lib/pages/help.class.php'
--- server/lib/pages/help.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/help.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.
@@ -159,6 +159,13 @@
                         'url' => 'index.php?p=help&q=DeleteForm&HelpID=' . $row['helpid'],
                         'text' => __('Delete')
                     );
+
+                // Test
+                $row['buttons'][] = array(
+                        'id' => 'help_button_test',
+                        'url' => HelpManager::Link($row['topic'], $row['category']),
+                        'text' => __('Test')
+                    );
             }
 
             $rows[] = $row;

=== modified file 'server/lib/pages/index.class.php'
--- server/lib/pages/index.class.php	2013-11-03 11:24:11 +0000
+++ server/lib/pages/index.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/layout.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
@@ -547,7 +547,7 @@
 		}
 		else
 		{
-            $thumbBgImage = "theme/default/img/forms/filenotfound.png";
+            $thumbBgImage = "theme/default/img/forms/filenotfound.gif";
 		}
 
 		// Configure some template variables.

=== modified file 'server/lib/pages/license.class.php'
--- server/lib/pages/license.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/pages/license.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/log.class.php'
--- server/lib/pages/log.class.php	2013-08-20 20:17:11 +0000
+++ server/lib/pages/log.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/mediamanager.class.php'
--- server/lib/pages/mediamanager.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/pages/mediamanager.class.php	2014-01-19 13:57: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) 2011-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/module.class.php'
--- server/lib/pages/module.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/module.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/oauth.class.php'
--- server/lib/pages/oauth.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/oauth.class.php	2014-01-19 13:57: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) 2010-13 Daniel Garner
  *
  * This file is part of Xibo.
@@ -283,7 +283,7 @@
         $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')");
+        $response->AddButton(__('Help'), "XiboHelpRender('" . HelpManager::Link('User', 'Applications') . "')");
         $response->AddButton(__('Close'), 'XiboDialogClose()');
         $response->Respond();
     }

=== modified file 'server/lib/pages/resolution.class.php'
--- server/lib/pages/resolution.class.php	2013-08-20 20:17:11 +0000
+++ server/lib/pages/resolution.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2013-11-03 13:30:21 +0000
+++ server/lib/pages/schedule.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
@@ -753,8 +753,8 @@
                 }
             }
 
-            Debug::LogEntry('audit', 'Built Month Array');
-            Debug::LogEntry('audit', var_export($events, true));
+            //Debug::LogEntry('audit', 'Built Month Array');
+            //Debug::LogEntry('audit', var_export($events, true));
 
             return $events;
     }
@@ -1404,7 +1404,7 @@
         <tr>
             <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
             <td><input type=text" name="DisplayOrder" value="0" />
-            <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
+            <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
             <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
         </tr>
 END;
@@ -1572,7 +1572,7 @@
         <tr>
             <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
             <td><input type=text" name="DisplayOrder" value="$displayOrder" />
-            <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
+            <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
             <td><input type="checkbox" id="cb_is_priority" name="is_priority" $isPriority title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
         </tr>
 END;
@@ -1921,7 +1921,7 @@
                         <td><input type=text" name="DisplayOrder" value="0" />
                     </tr>
                     <tr>
-                        <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
+                        <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
                         <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
                     </tr>
                     <tr>

=== modified file 'server/lib/pages/sessions.class.php'
--- server/lib/pages/sessions.class.php	2013-08-20 20:17:11 +0000
+++ server/lib/pages/sessions.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.
@@ -70,10 +70,7 @@
 		$fromdt = Kit::GetParam('filter_fromdt', _POST, _STRING);
 		
 		///get the dates and times
-		if ($fromdt == '') {
-			$starttime_timestamp = time();
-		}
-		else {
+		if ($fromdt != '') {
 			$start_date = explode("/",$fromdt); //		dd/mm/yyyy
 			$starttime_timestamp = strtotime($start_date[1] . "/" . $start_date[0] . "/" . $start_date[2] . ' ' . date("H", time()) . ":" . date("i", time()) . ':59');
 		}
@@ -84,7 +81,10 @@
 		
 		$SQL  = "SELECT session.userID, user.UserName,  IsExpired, LastPage,  session.LastAccessed,  RemoteAddr,  UserAgent ";
 		$SQL .= "FROM `session` LEFT OUTER JOIN user ON user.userID = session.userID ";
-		$SQL .= sprintf(" WHERE session_expiration < '%s' ", $starttime_timestamp);
+		$SQL .= "WHERE 1 = 1 ";
+
+		if ($fromdt != '')
+			$SQL .= sprintf(" AND session_expiration < '%s' ", $starttime_timestamp);
 		
 		if ($type == "active")
 			$SQL .= " AND IsExpired = 0 ";
@@ -110,7 +110,7 @@
 
             $row['userid'] = Kit::ValidateParam($row['userID'], _INT);
 			$row['username'] = Kit::ValidateParam($row['UserName'], _STRING);
-			$row['isexpired'] = (Kit::ValidateParam($row['IsExpired'], _INT) == 1) ? 'icon-ok' : 'icon-remove';
+			$row['isexpired'] = (Kit::ValidateParam($row['IsExpired'], _INT) == 0) ? 'icon-ok' : 'icon-remove';
 			$row['lastpage'] = Kit::ValidateParam($row['LastPage'], _STRING);
 			$row['lastaccessed'] = Kit::ValidateParam($row['LastAccessed'], _STRING);
 			$row['ip'] = Kit::ValidateParam($row['RemoteAddr'], _STRING);

=== modified file 'server/lib/pages/stats.class.php'
--- server/lib/pages/stats.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/stats.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/template.class.php'
--- server/lib/pages/template.class.php	2013-09-22 14:01:16 +0000
+++ server/lib/pages/template.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/timeline.class.php'
--- server/lib/pages/timeline.class.php	2013-11-02 15:32:17 +0000
+++ server/lib/pages/timeline.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/transition.class.php'
--- server/lib/pages/transition.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/transition.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/pages/user.class.php'
--- server/lib/pages/user.class.php	2013-08-21 09:36:12 +0000
+++ server/lib/pages/user.class.php	2014-01-19 13:57: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) 2006-2013 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/service/rest.class.php'
--- server/lib/service/rest.class.php	2013-10-20 14:59:58 +0000
+++ server/lib/service/rest.class.php	2014-01-19 13:57: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) 2010-2013 Daniel Garner
  *
  * This file is part of Xibo.
@@ -850,7 +850,7 @@
         $layoutId = $this->GetParam('layoutId', _INT);
         $regionId = $this->GetParam('regionId', _STRING);
         $type = $this->GetParam('type', _WORD);
-        $xlf = $this->GetParam('xlf', _STRING);
+        $xlf = $this->GetParam('xlf', _HTMLSTRING);
 
         // Does the user have permissions to view this layout?
         if (!$this->user->LayoutAuth($layoutId))
@@ -892,7 +892,7 @@
         $regionId = $this->GetParam('regionId', _STRING);
         $mediaId = $this->GetParam('mediaId', _STRING);
         $type = $this->GetParam('type', _WORD);
-        $xlf = $this->GetParam('xlf', _STRING);
+        $xlf = $this->GetParam('xlf', _HTMLSTRING);
 
         // Does the user have permissions to view this layout?
         if (!$this->user->LayoutAuth($layoutId))

=== modified file 'server/lib/service/restjson.class.php'
--- server/lib/service/restjson.class.php	2013-09-21 15:09:35 +0000
+++ server/lib/service/restjson.class.php	2014-01-19 13:57: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) 2010 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/service/restxml.class.php'
--- server/lib/service/restxml.class.php	2013-09-21 15:09:35 +0000
+++ server/lib/service/restxml.class.php	2014-01-19 13:57: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) 2010 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/service/serviceoauth.class.php'
--- server/lib/service/serviceoauth.class.php	2013-05-01 19:24:35 +0000
+++ server/lib/service/serviceoauth.class.php	2014-01-19 13:57: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) 2010 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/service/serviceresponse.class.php'
--- server/lib/service/serviceresponse.class.php	2013-09-24 17:57:08 +0000
+++ server/lib/service/serviceresponse.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2013-09-29 18:54:12 +0000
+++ server/lib/service/xmdssoap.class.php	2014-01-19 13:57: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 Daniel Garner
  *
  * This file is part of Xibo.
@@ -1069,7 +1069,7 @@
 
         // See if the client was offline and if appropriate send an alert
         // to say that it has come back online
-        if (($row[5] == 0) and ($row[6] == 1))
+        if (($row[5] == 0) && ($row[6] == 1) && Config::GetSetting('MAINTENANCE_ENABLED') == 'On') && Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On'))
         {
             $msgTo    = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD);
             $msgFrom  = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD);

=== modified file 'server/lib/xmds.inc.php'
--- server/lib/xmds.inc.php	2013-08-23 18:25:01 +0000
+++ server/lib/xmds.inc.php	2014-01-19 13:57: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) 2006,2007,2008 Daniel Garner and James Packer
  *
  * This file is part of Xibo.

=== modified file 'server/locale/dbtranslate.php'
--- server/locale/dbtranslate.php	2013-11-03 13:30:21 +0000
+++ server/locale/dbtranslate.php	2014-01-19 13:57: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-12 Daniel Garner
  *
  * This file is part of Xibo.
@@ -53,6 +53,7 @@
 echo __('Modules');
 echo __('Campaigns');
 echo __('Transitions');
+echo __('Resolutions');
 
 // Settings translations
 echo __('jpg_length');

=== modified file 'server/maintenance.php'
--- server/maintenance.php	2013-08-21 09:51:59 +0000
+++ server/maintenance.php	2014-01-19 13:57:27 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
- * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2010 Alex Harrington
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2010-13 Alex Harrington
  *
  * This file is part of Xibo.
  *
@@ -29,6 +29,7 @@
 
 // Required Library Files
 require_once("lib/app/translationengine.class.php");
+require_once("lib/app/pdoconnect.class.php");
 require_once("lib/app/debug.class.php");
 require_once("lib/app/kit.class.php");
 require_once("lib/data/data.class.php");

=== modified file 'server/manual/content/admin/advanced.php'
--- server/manual/content/admin/advanced.php	2013-05-01 19:24:35 +0000
+++ server/manual/content/admin/advanced.php	2014-01-19 13:57:27 +0000
@@ -1,57 +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 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>
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+
+<h1>Troubleshooting <small>The Advanced Menu</small></h1>
+<p>The CMS contains a number of useful tools for first line debugging and reporting faults to technical support.</p>
+
+<h2 id="Report_Fault">Report Fault</h2>
+<p>The Report Fault Wizard is designed to be enabled by the CMS administrator to recreate the problem and collect logging information that can be analysed or submitted to the Technical Support team for further analysis. The Wizard lists 6 steps which should be followed in order.</p>
+
+<p><img class="img-thumbnail" alt="Report Fault Wizard" src="content/admin/report_fault_wizard.png"></p>
+
+
+<h2>System Log</h2>
+<p>The CMS keeps a detailed log of all errors that have been recorded as well as detailed debugging information. This is intended for a more technical user to analyse and fix issues.</p>
+
+<p>The System Log is available from the Advanced Menu.</p>
+
+<p><img class="img-thumbnail" alt="System Log" src="content/admin/sa_advanced.png"></p>
+
+<p class="alert alert-warning">The system log can get quite large over time and should be manually truncated after any debugging session. This is done from the System Log page using the "Truncate" menu item in the top right corner of the Log Table.</p>
+
+<h2>Sessions</h2>
+<p>Sessions provide details of the current user activity on the network</p>
+<p><img class="img-thumbnail" alt="Sessions" src="content/admin/sa_advanced_sessions.png"></p>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_displaygroups.php'
--- server/manual/content/admin/api_displaygroups.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_displaygroups.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,11 @@
+
+<h3> <span class="mw-headline" id="DisplayGroups"> DisplayGroups </span></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>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_displays.php'
--- server/manual/content/admin/api_displays.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_displays.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,8 @@
+<h3> <span class="mw-headline" id="Displays"> Displays </span></h3>
+<ul><li> DisplayList
+</li><li> DisplayEdit
+</li><li> DisplayRetire
+</li><li> DisplayDelete
+</li><li> DisplayUserGroupSecurity
+</li><li> DisplayUserGroupEdit
+</li></ul>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_layouts.php'
--- server/manual/content/admin/api_layouts.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_layouts.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,260 @@
+
+<h3> <span class="mw-headline" id="Layout"> Layout </span></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>
+
+
+<h2> <span class="mw-headline" id="Layout_2"> Layout </span></h2>
+<p>Transactions Related to Layouts
+</p>
+<h3> <span class="mw-headline" id="LayoutAdd"> LayoutAdd </span></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>
+<h3> <span class="mw-headline" id="LayoutDelete"> 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>
+
+
+<h3> <span class="mw-headline" id="LayoutRegionList"> LayoutRegionList </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li></ul>
+<p>Response
+</p><p>A list of region timelines. Each item will have the following values:
+</p>
+<ul><li> regionid
+</li><li> width
+</li><li> height
+</li><li> top
+</li><li> left
+</li><li> ownerid
+</li><li> permission_edit
+</li><li> permission_del
+</li><li> permission_update_permissions
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionAdd"> LayoutRegionAdd </span></h3>
+<p>Adds a new Region Timeline to a Layout
+</p><p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> width
+</li><li> height
+</li><li> top
+</li><li> left
+</li><li> name
+</li></ul>
+<p>Response
+</p>
+<ul><li> success = true
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionEdit"> LayoutRegionEdit </span></h3>
+<p>Edits an existing Region Timeline on a Layout
+</p><p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> width
+</li><li> height
+</li><li> top
+</li><li> left
+</li><li> name
+</li></ul>
+<p>Response
+</p>
+<ul><li> success = true
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionDelete"> LayoutRegionDelete </span></h3>
+<p>Deletes an existing Region Timeline on a Layout
+</p><p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li></ul>
+<p>Response
+</p>
+<ul><li> success = true
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h2> <span class="mw-headline" id="Layout_Timelines"> Layout Timelines </span></h2>
+<p>Transactions related to layout timelines
+</p>
+<h3> <span class="mw-headline" id="LayoutRegionTimelineList"> LayoutRegionTimelineList </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li></ul>
+<p>Response
+</p><p>A list of media items on a region timeline. Each item will have the following values:
+</p>
+<ul><li> mediaid
+</li><li> lkid
+</li><li> type
+</li><li> duration
+</li><li> permission_edit
+</li><li> permission_del
+</li><li> permission_update_duration
+</li><li> permission_update_permissions
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionMediaDetails"> LayoutRegionMediaDetails </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> mediaId
+</li></ul>
+<p>Response
+The XLF for the provided media id (XML format)
+</p><p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionMediaAdd"> LayoutRegionMediaAdd </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> type (the type of media item being added)
+</li><li> xlf (the xibo layout file xml representing the media to add)
+</li></ul>
+<p>The XLF will be checked for the attributes that are required for all media type. It is the callers responsibility to ensure media type specific attributes are set correctly.
+</p><p>Response
+</p>
+<pre> The Media ID added
+</pre>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionLibraryAdd"> LayoutRegionLibraryAdd </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> mediaList (A list of media id's from the library that should be added to to supplied layout/region)
+</li></ul>
+<p>Response
+</p>
+<pre>success (true|error)
+</pre>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionMediaEdit"> LayoutRegionMediaEdit </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> mediaId
+</li><li> xlf (the xibo layout file xml representing the media to add)
+</li></ul>
+<p>The XLF will be checked for the attributes that are required for all media type. It is the callers responsibility to ensure media type specific attributes are set correctly.
+</p><p>Response
+</p>
+<pre>success (true|error)
+</pre>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionMediaReorder"> LayoutRegionMediaReorder </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> mediaList (array('mediaid' =&gt; <i>, 'lkid' =&gt; 0))</i>
+</li></ul>
+<p>Response
+</p>
+<ul><li> success (true|false)
+</li></ul>
+<p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
+<h3> <span class="mw-headline" id="LayoutRegionMediaDelete"> LayoutRegionMediaDelete </span></h3>
+<p>Parameters
+</p>
+<ul><li> layoutId
+</li><li> regionId
+</li><li> mediaId
+</li></ul>
+<p>Response
+success (true|error)
+</p><p>Error Codes
+</p>
+<ul><li> 1 - Access Denied
+</li></ul>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_library.php'
--- server/manual/content/admin/api_library.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_library.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,132 @@
+
+<h3> <span class="mw-headline" id="Library"> Library </span></h3>
+<ul><li> LibraryMediaFileUpload
+</li><li> LibraryMediaFileRevise
+</li><li> LibraryMediaAdd
+</li><li> LibraryMediaEdit
+</li><li> LibraryMediaRetire
+</li><li> LibraryMediaDownload
+</li><li> LibraryMediaList
+</li></ul>
+
+<p>Transactions related to the Library
+</p>
+<h3> <span class="mw-headline" id="LibraryMediaFileUpload"> 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>
+<h3> <span class="mw-headline" id="LibraryMediaAdd"> LibraryMediaAdd </span></h3>
+<p>Parameters
+</p>
+<ul><li> fileId
+</li><li> type (image|video|flash|ppt)
+</li><li> name
+</li><li> duration
+</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>
+<h3> <span class="mw-headline" id="LibraryMediaEdit"> LibraryMediaEdit </span></h3>
+<p>Parameters
+</p>
+<ul><li> mediaId
+</li><li> name
+</li><li> duration
+</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>
+<h3> <span class="mw-headline" id="LibraryMediaFileRevise"> 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>
+<h3> <span class="mw-headline" id="LibraryMediaRetire"> 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>
+<h3> <span class="mw-headline" id="LibraryMediaDelete"> 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>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_methods.php'
--- server/manual/content/admin/api_methods.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_methods.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,144 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h2> <span class="mw-headline" id="Request_Formats"> Request Formats </span></h2>
+<p>Xibo supports the following request formats
+</p>
+<ul><li> REST
+</li></ul>
+<h3> <span class="mw-headline" id="REST"> REST </span></h3>
+<p>A simple POST or GET.
+</p><p>To request the Xibo 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><p><br />
+</p>
+<h2> <span class="mw-headline" id="Response_Types"> Response Types </span></h2>
+<p>Xibo supports the following response types
+</p>
+<ul><li> JSON (not implemented)
+</li><li> XML
+</li></ul>
+<h3> <span class="mw-headline" id="JSON"> JSON </span></h3>
+<p>To return a JSON object specify the response to be JSON (response="json")
+</p><p>A method call returns:
+</p>
+<pre>xiboApi({
+  "stat":"ok",
+  "response": {...}
+})
+</pre>
+<p><br />
+A failure call returns:
+</p>
+<pre>xiboApi({
+  "stat":"error",
+  "error": {
+     "code": "[error-code]",
+     "message": "[error-message]"
+  }
+})
+</pre>
+<h3> <span class="mw-headline" id="XML"> XML </span></h3>
+<p>A successful call returns this:
+</p>
+<pre>&lt;?xml version="1.0" encoding="utf-8"&#160;?&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"&#160;?&gt;
+&lt;rsp status="error"&gt;
+    &lt;error code="[error-code]" message="[error-message]"
+&lt;/rsp&gt;
+</pre>
+<h2> <span class="mw-headline" id="Error_Codes">General Error Codes </span></h2>
+<p>A list of the potential error codes from each method call can be found with the documentation of that call.
+</p>
+
+<table border="1">
+<caption> Error code numbers and explanations
+</caption>
+<tr>
+<th>Error Code</th>
+<th>Explanation</th>
+<th>Use case
+</th></tr>
+<tr>
+<td> 1 </td>
+<td>Access Denied</td>
+<td>OAuth was successful, but Xibo denied access to that functionality for the user
+</td></tr>
+<tr>
+<td> 2 </td>
+<td>Checksum does not match with the generated checksum for the current payload</td>
+<td>Used when Uploading data or requesting file offset
+</td></tr>
+<tr>
+<td> 3 </td>
+<td>Unable to add File record to the Database</td>
+<td>
+</td></tr>
+<tr>
+<td> 4 </td>
+<td>Library location does not exist</td>
+<td>
+</td></tr>
+<tr>
+<td> 5 </td>
+<td>Unable to create file in the library location</td>
+<td>
+</td></tr>
+<tr>
+<td> 6 </td>
+<td>Unable to write to file in the library location</td>
+<td>
+</td></tr>
+<tr>
+<td> 7 </td>
+<td>File does not exist</td>
+<td>
+</td></tr>
+<tr>
+<td>10</td>
+<td>The Layout Name cannot be longer than 100 characters</td>
+<td>
+</td></tr>
+<tr>
+<td>11</td>
+<td>You must enter a duration</td>
+<td>
+</td></tr>
+<tr>
+<td>12</td>
+<td>The user already owns media with this name</td>
+<td>
+</td></tr>
+<tr>
+<td>13</td>
+<td>Error inserting media into the database</td>
+<td>
+</td></tr></table>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_misc.php'
--- server/manual/content/admin/api_misc.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_misc.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,15 @@
+
+<h3> <span class="mw-headline" id="Other"> Other </span></h3>
+<ul><li> Version
+</li><li> ServerStatus
+</li></ul>
+
+
+<h3> <span class="mw-headline" id="Version"> 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>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_modules.php'
--- server/manual/content/admin/api_modules.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_modules.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,19 @@
+
+<h3> <span class="mw-headline" id="Modules"> Modules</span></h3>
+<ul><li> ModuleList
+</li></ul>
+
+
+<h3> <span class="mw-headline" id="ModuleList"> 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>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_oauth.php'
--- server/manual/content/admin/api_oauth.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_oauth.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,100 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1>Applications <small>API Authentication with oAuth</small></h1>
+<p>Any application that connects to the CMS API will require pre-registration and user authentication before it is allowed to connect.</p>
+
+<p>Applications must have an "Application" record in the CMS, which describes the application name, home page location and authentication information (application keys). Applications can be viewed from the Administration > Applications menu.</p>
+
+<p><img class="img-thumbnail" alt="API" src="content/admin/sa_api.png"></p>
+
+<p class="alert alert-danger">It is recommended to keep this information confidential and only accessible to super administrator users.</p>
+
+
+<h3 id="Registered_Applications">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; ?> CMS using the "Add Application" menu button.</p>
+
+<p><img class="img-thumbnail" alt="API" src="content/admin/api_register_application.png"></p>
+
+
+<h3 id="Callback_URL">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>
+  
+<h2 id="oAuthLog">oAuth Log <small>Debugging authentication requests</small></h2>
+<p>The CMS provides a log of all oAuth requests for tokens in the oAuth Log. Currently this log is a list of the last 50 oAuth requests, showing the date and header provided by the client.</p>
+
+<p><img class="img-thumbnail" alt="API" src="content/admin/api_oauth_log.png"></p>
+
+<h1 id="Authorization">Application Code <small>within the 3rd party application</small></h1>
+<p>The 3rd party application must obtain an access token which is used when making requests. This is done using the standard oAuth pattern. The specific URL's for the CMS are shown below:</p>
+
+<p>Service location: <code>http:://**YourCMS**/services.php</code></p>
+<p>OAuth methods:</p>
+
+<ul>
+    <li>XRDS: <code>services.php?xrds</code></li>
+    <li>Request Token: <code>services.php?service=oauth&amp;method=request_token</code></li>
+    <li>Authorize Token: <code>index.php?p=oauth&amp;q=authorize</code></li>
+    <li>Access Token: <code>services.php?service=oauth&amp;method=access_token</code></li>
+</ul>
+
+<h3 id="XRDS">XRDS</h3>
+<p>The service is also discoverable by XRDS. The schema is below: </p>
+
+<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>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_oauth_log.png'
Binary files server/manual/content/admin/api_oauth_log.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_oauth_log.png	2014-01-19 13:57:27 +0000 differ
=== renamed file 'server/manual/content/admin/api.php' => 'server/manual/content/admin/api_overview.php'
--- server/manual/content/admin/api.php	2013-05-01 19:24:35 +0000
+++ server/manual/content/admin/api_overview.php	2014-01-19 13:57:27 +0000
@@ -1,396 +1,25 @@
-<!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>
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1><?php echo PRODUCT_NAME; ?> API</h1>
+
+<p>The CMS comes with an API for external applications to integrate with <?php echo PRODUCT_NAME; ?>.</p>

=== added file 'server/manual/content/admin/api_register_application.png'
Binary files server/manual/content/admin/api_register_application.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_register_application.png	2014-01-19 13:57:27 +0000 differ
=== added file 'server/manual/content/admin/api_resolution.php'
--- server/manual/content/admin/api_resolution.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_resolution.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,4 @@
+
+<h3> <span class="mw-headline" id="Resolution"> Resolution </span></h3>
+<ul><li> ResolutionList
+</li></ul>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_schedule.php'
--- server/manual/content/admin/api_schedule.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_schedule.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,7 @@
+
+<h3> <span class="mw-headline" id="Schedule"> Schedule </span></h3>
+<ul><li> ScheduleList
+</li><li> ScheduleAdd
+</li><li> ScheduleEdit
+</li><li> ScheduleDelete
+</li></ul>
\ No newline at end of file

=== added file 'server/manual/content/admin/api_template.php'
--- server/manual/content/admin/api_template.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/api_template.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,21 @@
+
+<h3> <span class="mw-headline" id="Template"> Template </span></h3>
+<ul><li> TemplateList
+</li><li> TemplateDelete
+</li></ul>
+
+
+<h3> <span class="mw-headline" id="TemplateDelete"> 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>
\ No newline at end of file

=== added file 'server/manual/content/admin/blueprints.php'
--- server/manual/content/admin/blueprints.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/blueprints.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1>Blueprints</h1>
+<p>For the time being blueprints will be managed on the <a href="https://blueprints.launchpad.net/xibo">Launchpad Project Page</a>.</p>
\ No newline at end of file

=== added file 'server/manual/content/admin/contributing.php'
--- server/manual/content/admin/contributing.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/contributing.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,167 @@
+<table id="toc" class="toc"><tr><td><div id="toctitle"><h1>Contributing <small>How can you help?</small></h1></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#Introduction"><span class="tocnumber">1</span> <span class="toctext">Introduction</span></a></li>
+<li class="toclevel-1 tocsection-2"><a href="#Ways_to_Contribute"><span class="tocnumber">2</span> <span class="toctext">Ways to Contribute</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Licensing"><span class="tocnumber">3</span> <span class="toctext">Licensing</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Answering_Questions"><span class="tocnumber">4</span> <span class="toctext">Answering Questions</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#Reporting_Bugs"><span class="tocnumber">5</span> <span class="toctext">Reporting Bugs</span></a></li>
+<li class="toclevel-1 tocsection-6"><a href="#Suggest_Improvements"><span class="tocnumber">6</span> <span class="toctext">Suggest Improvements</span></a></li>
+<li class="toclevel-1 tocsection-7"><a href="#Translate_Xibo"><span class="tocnumber">7</span> <span class="toctext">Translate Xibo</span></a></li>
+<li class="toclevel-1 tocsection-8"><a href="#Triage_Bugs"><span class="tocnumber">8</span> <span class="toctext">Triage Bugs</span></a></li>
+<li class="toclevel-1 tocsection-9"><a href="#Test_Unstable_Releases"><span class="tocnumber">9</span> <span class="toctext">Test Unstable Releases</span></a></li>
+<li class="toclevel-1 tocsection-10"><a href="#Documentation"><span class="tocnumber">10</span> <span class="toctext">Documentation</span></a></li>
+<li class="toclevel-1 tocsection-11"><a href="#Fix_Bugs_.2F_Implement_Blueprints"><span class="tocnumber">11</span> <span class="toctext">Fix Bugs / Implement Blueprints</span></a>
+<ul>
+<li class="toclevel-2 tocsection-12"><a href="#Development_Overview"><span class="tocnumber">11.1</span> <span class="toctext">Development Overview</span></a></li>
+<li class="toclevel-2 tocsection-13"><a href="#Important_Links"><span class="tocnumber">11.2</span> <span class="toctext">Important Links</span></a></li>
+<li class="toclevel-2 tocsection-14"><a href="#Development_Process_.28how_to_contribute.29"><span class="tocnumber">11.3</span> <span class="toctext">Development Process (how to contribute)</span></a>
+<ul>
+<li class="toclevel-3 tocsection-15"><a href="#Blueprints_.28new_features.29"><span class="tocnumber">11.3.1</span> <span class="toctext">Blueprints (new features)</span></a></li>
+<li class="toclevel-3 tocsection-16"><a href="#Bugs"><span class="tocnumber">11.3.2</span> <span class="toctext">Bugs</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toclevel-1 tocsection-17"><a href="#Translatability"><span class="tocnumber">12</span> <span class="toctext">Translatability</span></a></li>
+<li class="toclevel-1 tocsection-18"><a href="#Coding_Style_Guide"><span class="tocnumber">13</span> <span class="toctext">Coding Style Guide</span></a>
+<ul>
+<li class="toclevel-2 tocsection-19"><a href="#Server"><span class="tocnumber">13.1</span> <span class="toctext">Server</span></a></li>
+<li class="toclevel-2 tocsection-20"><a href="#Notes"><span class="tocnumber">13.2</span> <span class="toctext">Notes</span></a></li>
+</ul>
+</li>
+</ul>
+</td></tr></table>
+<h2> <span class="mw-headline" id="Introduction">Introduction</span></h2>
+<p>Xibo is primarily developed by Daniel Garner and Alex Harrington. Xibo 1.0.0 also has heavy involvement from James Packer. Being a small development team we are very intimate with the Xibo code and design.
+</p><p>We are always delighted to accept contributions from others and we would always encourage this.
+</p>
+<h2> <span class="mw-headline" id="Ways_to_Contribute">Ways to Contribute</span></h2>
+<p>There are lots of ways to contribute to the Xibo project, and there are jobs that everyone can do, even if you're not a programmer! Here are the main ways, listed in ascending order of difficulty.
+</p>
+<ul><li>Answer questions in Launchpad Answers: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
+</li><li>Report bugs you find in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (The new bug report wizard in 1.0.0 greatly simplifies this)
+</li><li>Suggest improvements and new features in Launchpad Blueprints: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</li><li>Translate Xibo in to new Languages: <a rel="nofollow" class="external free" href="https://translations.launchpad.net/xibo">https://translations.launchpad.net/xibo</a>
+</li><li>Help triage bugs in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</li><li>Test unstable development releases and report bugs
+</li><li>Improve the documentation in the wiki or manual: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk/manual">http://www.xibo.org.uk/manual</a>
+</li><li>Fix bugs in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</li><li>Implement Xibo Blueprints (new features) <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</li></ul>
+<p>Each of these areas is covered in more detail below:
+</p>
+<h2> <span class="mw-headline" id="Licensing">Licensing</span></h2>
+<p>Xibo is released under the AGPL v3. Xibo documentation is released under the Creative Commons Attribution Sharealike License. Xibo Translations are licensed by Launchpad under the BSD license (revised, without advertising clause).
+</p><p>All contributions to Xibo should be under the appropriate license listed above. If you object to contributing code under the appropriate license, please email [e-mail] BEFORE starting work, as there is a strong possibility that your contribution would be rejected.
+</p><p><br />
+</p>
+<h2> <span class="mw-headline" id="Answering_Questions">Answering Questions</span></h2>
+<p>Xibo isn't particularly well documented at present. There is a manual-in-progress, but it isn't complete. A great deal of time is taken up answering queries from people asking how to install Xibo, or how to use Xibo, or asking if various behaviours are bugs or not etc.
+</p><p>If you've used Xibo for a little while, and become familiar with its operation, you are more than qualified to suggest answers to these questions. All we ask is that you are polite and factual at all times.
+</p><p>We're particularly interested in people who speak more than one language who would be happy to answer questions posed in non-english languages (as Alex and Dan have very limited skills in that area!) or who can translate for us!
+</p>
+<h2> <span class="mw-headline" id="Reporting_Bugs">Reporting Bugs</span></h2>
+<p>Think you've found a bug? First check in Launchpad Bugs if someone else has already reported the same issue. If they have, you can subscribe to the bug so you get notification when its status changes, or when a new version of Xibo is released which solves the problem.
+</p><p>If you've found a new bug, please let us know about it!
+</p><p>Xibo 1.0.0 sees the release of the bug reporting wizard for Xibo Server. Initially please follow the steps in the bug wizard (found in the management menu). Also include screenshots if appropriate to show us what's wrong. The bug wizard collects alot of the commonly requested information that we need, but we might come back to you and ask for more information or further examples so we can figure out what went wrong.
+</p>
+<h2> <span class="mw-headline" id="Suggest_Improvements">Suggest Improvements</span></h2>
+<p>Everyone has ideas about how Xibo could improve, not just the developers. If you've got an idea, first have a look in Xibo Blueprints to see if it has already been suggested. If it has, subscribe to it to be notified as its status changes. Also feel free to ADD to the blueprint whiteboard specific thoughts about how things might work.
+</p><p>If your idea is new, feel free to create a new Blueprint. You should describe the idea you have in as much detail as you feel able. If you've done some development work on Xibo before, you might write a new section in the Wiki to further detail how you think the idea might be implemented.
+</p><p>With new ideas, especially if they are radically different to the general direction of Xibo development, it's best to start out with an overview of the functionallity, which you or a developer can flesh out at a later date.
+</p><p>An aside: Blueprints are just that - plans for the future. Not everything suggested will end up as a feature, especially if your idea is applicable to a very small number of users, or if the idea is a fundamental departure from the general direction of Xibo development.
+</p>
+<h2> <span class="mw-headline" id="Translate_Xibo">Translate Xibo</span></h2>
+<p>Already Xibo is being used in several countries. Xibo 1.1 and later will have support for GNU Gettext Translations. Translations will be handled by Launchpad Translations. If Xibo isn't currently available in your language, or a language you speak, then it's a really great way to help. Launchpad Translations is its own system, and help on how to use the system are best directed to the Launchpad Translations team. They have a getting started guide here: <a rel="nofollow" class="external free" href="https://help.launchpad.net/Translations/StartingToTranslate">https://help.launchpad.net/Translations/StartingToTranslate</a>
+</p>
+<h2> <span class="mw-headline" id="Triage_Bugs">Triage Bugs</span></h2>
+<p>Triage is a medical term, and it basically means catagorise problems by their severity. In Launchpad, triage is the process of checking a bug report to make sure it has all the appropriate information a developer will need to fix the problem, or in fact confirming that the problem exists and is reproducable.
+</p><p>When a bug arrives in Launchpad, it's status is set to "New" and it's importance is set to "Unknown". A bug triager will look at the bug report, and see if all the required information is there - eg is a suitable txt file attached with the output of the server Bug Wizard? Are screenshots provided if necessary. Can the bug triager reproduce the problem.
+</p><p>If information is missing, please add a comment to the bug asking for that information to be added. Set the bug status to "Incomplete" if you have suitable access rights.
+</p><p>If all the information is there, have a go at reproducing the problem on your system (virtual machines are really good for this). If you can reproduce the problem, mark the bug as "Confirmed" and add a comment to the bug describing how you reproduced it in detail. Attach any media as required, or provide links. If you can't reproduce the problem, then add a comment to that effect, but leave the status as "New".
+If you confirmed the bug, is there a workaround? If there is, describe it in a comment. Set the priority to "Low" and status to "Triaged" if you have suitable access rights.
+If there is no work around, set the priority as described below and the status to "Triaged". If you're not sure, leave this step all together:
+</p>
+<ul><li>Low - Confirmed bugs with workaround available
+</li><li>Medium - Confirmed bugs with no workaround that does not significantly impact upon operation of the whole system
+</li><li>High - Confirmed bugs with no workaround that impacts significantly on one or more areas of the whole system, but that leaves other areas of the system working.
+</li><li>Critical - Confirmed bugs with no workaround that make the whole system inoperable.
+</li></ul>
+<h2> <span class="mw-headline" id="Test_Unstable_Releases">Test Unstable Releases</span></h2>
+<p>The whole Xibo 1.1 series is "unstable". That means that releases in the series are not recommended for production environments. You can help by installing these releases and testing their operation as if it were a live system. Report any problems in Launchpad Bugs or Launchpad Answers.
+</p>
+<h2> <span class="mw-headline" id="Documentation">Documentation</span></h2>
+<p>There are large sections of the Xibo Manual still to be written, and the existing sections will need constant updates to track Xibo development. If you're interested in working on Xibo documentation, then please email [e-mail] and we'll get something worked out.
+</p><p><br />
+</p>
+<h2> <span class="mw-headline" id="Fix_Bugs_.2F_Implement_Blueprints">Fix Bugs / Implement Blueprints</span></h2>
+<h3> <span class="mw-headline" id="Development_Overview">Development Overview</span></h3>
+<p>These notes will give guidelines to developers which will ensure that any work you do has the maximum chance of getting merged into a Xibo release.
+</p><p>The Xibo Project exclusively uses Launchpad as a development platform. Through launchpad we manage blueprints (specifications for new features), bugs, Q&amp;A (support), translations and the code release cycle. The only thing we do not manage in Launchpad is the detailed specification documents and developer documentation - which is of course managed here on this Wiki.
+</p>
+<h3> <span class="mw-headline" id="Important_Links">Important Links</span></h3>
+<ul><li>Xibo Homepage: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk">http://www.xibo.org.uk</a>
+</li><li>Launchpad Project Page: <a rel="nofollow" class="external free" href="https://launchpad.net/xibo">https://launchpad.net/xibo</a>
+</li><li>Developer Wiki: <a rel="nofollow" class="external free" href="http://wiki.xibo.org.uk">http://wiki.xibo.org.uk</a>
+</li></ul>
+<h3> <span class="mw-headline" id="Development_Process_.28how_to_contribute.29">Development Process (how to contribute)</span></h3>
+<p>I will split the development process into two sections; bugs and blueprints. They are essentially managed in the same way with a few minor differences.
+</p>
+<h4> <span class="mw-headline" id="Blueprints_.28new_features.29">Blueprints (new features)</span></h4>
+<p>So you want to implement an exciting new feature or idea into Xibo? - or maybe you want to change the way Xibo works slightly? In both of these circumstances your first task is to create a blueprint for the feature and assign it to yourself. You are then responsible for writing a specification document (it may be a brief paragraph, an article on this wiki or a IM conversation with us) at which point we will either Approve your idea, ask for more details or suggest an alternative.
+</p><p>Once your idea is approved you can ask for a "mentor" to help you get started - or you can pull the latest "future" series of the Xibo code and begin development. All development should be done using BZR (supported by Launchpad) and pushed to the Xibo project space in Launchpad. There are some good Launchpad tutorials available on their help site.
+</p><p><b>Note:</b> Blueprints will almost always be for the "Future series".
+We would suggest you call your branch "lp:~username/xibo/blueprint-title"
+</p>
+<h4> <span class="mw-headline" id="Bugs">Bugs</span></h4>
+<p>Found a bug that you want to help fix? The first place to go is the "Bugs" section in Launchpad to create a bug report for the problem you have found. This bug report will then be triaged by the community to determine if it has already been fixed or if it is a new bug, etc.
+</p><p>If the bug gets confirmed and you would like to implement a fix for the bug attach a comment to the bug saying so - we will then give the bug a milestone and a series goal and assign it to you. You can then branch the Xibo code from the appropriate series goal (unlike a blueprint a bug may be targeted to the stable release or to the future release).
+</p><p>Once you have the code, implement the fix to that one bug only and push your code back to launchpad. We would suggest you call your branch "lp:~username/xibo/bug#"
+</p><p><i>Check list</i>
+</p>
+<pre>1. Register a bug report or blueprint in Launchpad
+2. For a blueprint create a specification document - for a bug help triage it
+3. Get your blueprint approved / bug confirmed and assigned to you
+4. Branch the code your blueprint/bug relates to
+5. Implement the one blueprint / bug and push the branch back to Launchpad
+6. Does the code meet the coding style guide?
+7. Does the code use the appropriate library objects (Config, Kit, ResponseManager, db etc)
+8. Does the code output translatable strings (use the library function)
+9. Create a merge request
+</pre>
+<p>10. Wait for your code to be reviewed and merged!!
+11. Points 1-3 may take some time to get checked off - but it is worth it!
+</p>
+<h2> <span class="mw-headline" id="Translatability">Translatability</span></h2>
+<p>We're in the process of adding translation support to Xibo. There will be a library method to call in place of PHP's _("string") call. All new code must use this function. Also please look at the existing library of strings and see if the message you need to output is already in the translation library. If there is a suitable string there already, please reuse it rather than creating a new, very similar one, that has to be translated separatly.
+</p>
+<h2> <span class="mw-headline" id="Coding_Style_Guide">Coding Style Guide</span></h2>
+<h4> <span class="mw-headline" id="Server">Server</span></h4>
+<p>Blocks are expressed as follows:
+</p>
+<pre>class Example
+{
+   function registerDisplay(var)
+   {
+       print "OK";
+   }
+}
+
+$example = new Example();
+</pre>
+<p>Comments are good. Please add adequate comments to describe your code.
+If you include code written by someone else, please fully document where you got the code from, who wrote it and under what license you're using it. <b>Bear in mind that the license must be AGPLv3 or later compatible.</b>
+</p><p>Xibo is very object oriented. Please make sure you code in an object-oriented style where appropriate.
+</p>
+<h3> <span class="mw-headline" id="Notes">Notes</span></h3>
+<p>Due to the time pressures on Alex and myself we are unlikely to accept any code changes that fall into the below categories:
+</p>
+<ul><li> Do not have an approved blueprint or associated bug
+</li><li> Have more than one blueprint or associated bug (without prior agreement)
+</li><li> Are not released under an appropriate license (see above)
+</li></ul>
+<p>This may seem like an excessively complex way of contributing to Xibo - and if this is too much for you to do we understand. However this method gives the Xibo project the maximum chance of being stable, extensible and well managed!
+</p><p>We dont want to delay the release of important fixes and improvements any more than you want to wait for them to be released! This is why we have adopted launchpad as a solution. When used in the above manor it will allow bugs to be merged across series and features to be implemented in isolation. It will also reduce the chances of two contributions conflicting with each other.
+</p><p>It is also the method the Xibo Maintainers (Alex and I) develop and bug fix Xibo!!
+</p><p>We look forward to your contributions!
+</p>
\ No newline at end of file

=== added file 'server/manual/content/admin/contributing_fr.php'
--- server/manual/content/admin/contributing_fr.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/contributing_fr.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,166 @@
+<p>Merci de vous référer aux notes ci-dessous lors de vos réflexions ou contributions au projet Xibo
+</p>
+<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#Introduction"><span class="tocnumber">1</span> <span class="toctext">Introduction</span></a></li>
+<li class="toclevel-1 tocsection-2"><a href="#Comment_contribuer"><span class="tocnumber">2</span> <span class="toctext">Comment contribuer</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Licence"><span class="tocnumber">3</span> <span class="toctext">Licence</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Questions_.2F_R.C3.A9ponses"><span class="tocnumber">4</span> <span class="toctext">Questions / Réponses</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#Report_des_bugs"><span class="tocnumber">5</span> <span class="toctext">Report des bugs</span></a></li>
+<li class="toclevel-1 tocsection-6"><a href="#Sugg.C3.A9rer_des_am.C3.A9liorations"><span class="tocnumber">6</span> <span class="toctext">Suggérer des améliorations</span></a></li>
+<li class="toclevel-1 tocsection-7"><a href="#Traduire_Xibo"><span class="tocnumber">7</span> <span class="toctext">Traduire Xibo</span></a></li>
+<li class="toclevel-1 tocsection-8"><a href="#Triage_des_bugs"><span class="tocnumber">8</span> <span class="toctext">Triage des bugs</span></a></li>
+<li class="toclevel-1 tocsection-9"><a href="#Test_des_versions_instables"><span class="tocnumber">9</span> <span class="toctext">Test des versions instables</span></a></li>
+<li class="toclevel-1 tocsection-10"><a href="#Documentation"><span class="tocnumber">10</span> <span class="toctext">Documentation</span></a></li>
+<li class="toclevel-1 tocsection-11"><a href="#Correction_de_Bugs_.2F_Impl.C3.A9mentation_Blueprints"><span class="tocnumber">11</span> <span class="toctext">Correction de Bugs / Implémentation Blueprints</span></a>
+<ul>
+<li class="toclevel-2 tocsection-12"><a href="#Vue_d.27ensemble_du_d.C3.A9veloppement"><span class="tocnumber">11.1</span> <span class="toctext">Vue d'ensemble du développement</span></a></li>
+<li class="toclevel-2 tocsection-13"><a href="#Liens_importants"><span class="tocnumber">11.2</span> <span class="toctext">Liens importants</span></a></li>
+<li class="toclevel-2 tocsection-14"><a href="#Processus_de_d.C3.A9veloppement_.28comment_contribuer.29"><span class="tocnumber">11.3</span> <span class="toctext">Processus de développement (comment contribuer)</span></a>
+<ul>
+<li class="toclevel-3 tocsection-15"><a href="#Blueprints_.28nouvelles_fonctionnalit.C3.A9s.29"><span class="tocnumber">11.3.1</span> <span class="toctext">Blueprints (nouvelles fonctionnalités)</span></a></li>
+<li class="toclevel-3 tocsection-16"><a href="#Bugs"><span class="tocnumber">11.3.2</span> <span class="toctext">Bugs</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toclevel-1 tocsection-17"><a href="#Traduction"><span class="tocnumber">12</span> <span class="toctext">Traduction</span></a></li>
+<li class="toclevel-1 tocsection-18"><a href="#Guide_pour_le_code_source"><span class="tocnumber">13</span> <span class="toctext">Guide pour le code source</span></a>
+<ul>
+<li class="toclevel-2 tocsection-19"><a href="#Serveur"><span class="tocnumber">13.1</span> <span class="toctext">Serveur</span></a></li>
+<li class="toclevel-2 tocsection-20"><a href="#Notes"><span class="tocnumber">13.2</span> <span class="toctext">Notes</span></a></li>
+</ul>
+</li>
+</ul>
+</td></tr></table>
+<h2> <span class="mw-headline" id="Introduction">Introduction</span></h2>
+<p>Xibo est principalement développé par Daniel Garner et Alex Harrington. James Packer s'est aussi beaucoup impliqué dans Xibo 1.0.0. Étant une petite équipe de développement, nous sommes très intime avec le code et le design de Xibo.
+</p><p>Nous sommes toujours ravis d'accepter des contributions d'autres personnes et nous encourageons cela.
+</p>
+<h2> <span class="mw-headline" id="Comment_contribuer">Comment contribuer</span></h2>
+<p>Il existe de nombreuses façons de contribuer au projet Xibo, et il ya des tâches que chacun peut faire, même si vous n'êtes pas développeurs&#160;! 
+Voici les principaux moyens, énumérés dans l'ordre croissant de difficulté&#160;:
+</p>
+<ul><li>Poser des questions sur Launchpad Answers&#160;: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
+</li><li>Reporter un bug que vous avez trouvé sur Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (Le nouvel assistant de report de bugs dans 1.0.0 simplifie grandement cela)
+</li><li>Suggérer des améliorations ou nouvelles fonctionnalités sur Launchpad Blueprints&#160;: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</li><li>Traduire Xibo dans d'autres Langues: https&#160;://translations.launchpad.net/xibo
+</li><li>Aider au trie des bugs sur Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</li><li>Tester les versions de développement instables et reporter les bugs
+</li><li>Améliorer la documentation sur le wiki ou le manuel&#160;: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk/manual">http://www.xibo.org.uk/manual</a>
+</li><li>Corriger des bugs dans Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</li><li>Mettre en oeuvre les idées de Xibo Blueprints (nouvelles fonctionnalités) <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</li></ul>
+<p>Chacun de ces aspects est traité plus en détail ci-dessous&#160;:
+</p>
+<h2> <span class="mw-headline" id="Licence">Licence</span></h2>
+<p>Xibo est publié sous licence AGPL v3. La documentation de Xibo est sous Creative Commons Attribution ShareAlike License. 
+Les traductions de Xibo sont par le biais de Launchpad sous licence BSD (révisé, sans clause de publicité).
+</p><p>Toutes les contributions à Xibo doivent être dans le cadre de la licence mentionnées ci-dessus. Si vous vous opposez à contribuer du code sous la licence appropriée, merci d'envoter un courriel à [e-mail] avant de commencer à travailler, car il est fort possible que votre contribution soit rejetée.
+</p>
+<h2> <span class="mw-headline" id="Questions_.2F_R.C3.A9ponses">Questions / Réponses</span></h2>
+<p>Xibo n'est pas particulièrement bien documenté à l'heure actuelle. Il existe un manuel en cours de rédaction, mais il n'est pas complet. Nous passons beaucoup de temps  à répondre à des requêtes de gens demandant comment installer Xibo, comment utiliser Xibo ou encore de demander si les différents comportements sont des bugs ou pas.
+</p><p>Si vous avez utilisé Xibo un peu de temps, et que vous êtes familiarisé avec son fonctionnement, vous êtes plus que qualifié pour suggérer des réponses à ces questions. Tout ce que nous demandons, c'est d'être toujours poli.
+</p><p>Nous sommes particulièrement intéressés par des gens qui parlent plus d'une langue et qui se feront un plaisir de répondre à des questions posées dans les langues non-anglophones (comme Alex et Dan ont très peu de compétences dans ce domaine&#160;!) Ou qui peuvent les traduires pour nous&#160;!
+</p>
+<h2> <span class="mw-headline" id="Report_des_bugs">Report des bugs</span></h2>
+<p>Vous pensez que vous avez trouvé un bug&#160;? Vérifiez d'abord dans Launchpad Bugs si quelqu'un a déjà signalé le même problème. Si c'est le cas, vous pouvez vous abonner à l'erreur afin que vous obteniez une notification lorsque son statut change, ou quand une nouvelle version de Xibo est disponible et qui résout le problème.
+</p><p>Si vous avez trouvé un nouveau bug, merci de nous le faire savoir&#160;!
+</p><p>Xibo 1.0.0 voit la publication des rapports de bugs à partir de l'assistant pour Xibo Server. Au début, merci de suivre les étapes de l'assistant de bug (qui se trouve dans le menu de gestion). Inclure également des captures d'écran le cas échéant, afin de nous montrer ce qui ne va pas. L'assistant de bug rassemble une grande partie des informations communes que nous avons besoin, mais nous pourrions revenir vers vous et vous demander plus d'information ou d'autres exemples afin que nous puissions comprendre ce qui s'est mal passé.
+</p>
+<h2> <span class="mw-headline" id="Sugg.C3.A9rer_des_am.C3.A9liorations">Suggérer des améliorations</span></h2>
+<p>Tout le monde a des idées sur la façon dont Xibo pourrait s'améliorer et non pas seulement les développeurs. Si vous avez une idée, d'abord jeter un oeil dans le Blueprint de Xibo pour voir si elle n'a pas déjà été suggérée. Si c'est le cas, vous pouvez y souscrire pour être notifié si son statut change. N'hésitez pas à ajouter au tableau blanc spécifique, des idées sur la façon dont les choses pourraient fonctionner.
+</p><p>Si votre idée est nouvelle, sentez vous libre de créer une nouvelle idée dans Blueprint. Vous devez décrire l'idée que vous avez, en détaillant autant que possible. Si vous avez effectué avant, certains travaux de développement sur Xibo, vous pouvez écrire un nouveau chapitre dans le Wiki pour plus de détails sur la manière dont vous pensez que l'idée pourrait être mise en œuvre.
+</p><p>Avec de nouvelles idées, surtout si elles sont radicalement différentes de la direction générale de Xibo développement, il est préférable de commencer par une vue d'ensemble des fonctionnalités, que vous ou un développeur peut préciser pour une date ultérieure.
+</p><p>Un aparté: les idées sur Blueprints ne sont que des plans pour l'avenir. Tout ce qui est suggéré ne finira pas comme une caractéristique, surtout si votre idée est applicable à un très petit nombre d'utilisateurs, ou si l'idée est un chemin fondamentallement différent de la direction générale du développement de Xibo.
+</p>
+<h2> <span class="mw-headline" id="Traduire_Xibo">Traduire Xibo</span></h2>
+<p>Xibo est déjà utilisé dans plusieurs pays. Xibo 1.1 et supérieur supporterons la traduction via GNU Gettext. Les traductions seront traités par Launchpad Translations. Si Xibo n'est actuellement pas disponible dans votre langue, ou dans une langue que vous parlez, alors c'est un excellent moyen de nous aider. Launchpad Translations à son propre système, et l'aide sur l'utilisation du système est par l'équipe de Launchpad Translations ets la plus adaptée. Ils ont un guide de démarrage ici: <a rel="nofollow" class="external free" href="https://help.launchpad.net/Translations/StartingToTranslate">https://help.launchpad.net/Translations/StartingToTranslate</a>
+</p>
+<h2> <span class="mw-headline" id="Triage_des_bugs">Triage des bugs</span></h2>
+<p>Le triage est un terme médical, qui signifie catégoriser des problèmes de par leur gravité. Pour Launchpad, le triage est un processus de vérification d'un rapport de bug pour s'assurer qu'il y a toutes les informations qu'auront besoin un développeur pour résoudre le problème, ou de confirmer que le problème existe et qu'il se reproduit.
+</p><p>Quand un bug arrive dans Launchpad, son statut est réglé sur "New" et son importance est fixée à "Unknown". Un trieur de bug se penchera sur le rapport de bug, et voir si toutes les informations requises sont présentes, comme par exemple un fichier txt joint à la sortie de l'Assistant de bug du serveur&#160;? Des captures d'écran fournis si nécessaire. Puis le trieur de bug va essayer de reproduire le problème.
+</p><p>Si l'information est manquante, merci d'ajouter un commentaire à l'erreur pour demander que les informations soit ajoutées. Chnager le statut du problème à «Incomplete» si vous avez les droits d'accès appropriés.
+</p><p>Si toute l'information est là, se lancer à reproduire le problème sur votre système (les machines virtuelles sont vraiment bons pour ça). Si vous pouvez reproduire ce problème, marquer le bug comme "Confirmed", et ajouter un commentaire sur le bug pour décrire comment le reproduire en détail. Joindre les médias nécessaire en cas de besoin ou des liens. 
+Si vous ne pouvez pas reproduire le problème, ajoutez un commentaire à cet effet, mais laissez le statut sur "New". Si vous avez confirmé le bug, y'a t'il une solution? Si c'est le cas, la décrire dans un commentaire. Définissez la priorité à "Low" et le statut de "Triaged" si vous avez les droits d'accès appropriés. S'il n'y a pas de problème, la priorité tel que décrit ci-dessous et le statut de "Triaged". Si vous ne savez pas, laissez cette étape, tous ensemble:
+</p>
+<ul><li> Low - Bugs confirmés avec une solution disponible
+</li><li> Middle - Bugs confirmés, sans solution disponible, sans impact significatif sur le fonctionnement de l'ensemble du système
+</li><li> High - Bugs confirmés, sans solution disponible, avec impact significatif uniquement sur un ou plusieurs parties de l'ensemble du système, mais qui laisse d'autres parties du système fonctionner.
+</li><li> Critical - Bugs confirmés, sans solution disponible et qui rend l'ensemble du système inutilisable.
+</li></ul>
+<h2> <span class="mw-headline" id="Test_des_versions_instables">Test des versions instables</span></h2>
+<p>L'ensemble de la série Xibo 1.1 est "instable". Cela signifie que les versions dans ses séries ne sont pas recommandés pour les environnements de production. Vous pouvez nous aider par l'installation de ces versions et en testant leurs fonctionnement, comme si elle était en environnement réel. Reporter les problèmes dans Launchpad Bugs ou dans Launchpad Answers.
+</p>
+<h2> <span class="mw-headline" id="Documentation">Documentation</span></h2>
+<p>Il y a de grandes sections de la Xibo Manuel qui ne sont pas encore écrites, et les sections doivent être constamment mises à jour en fonction du développement de Xibo. Si vous êtes intéressé pour travailler sur la documentation de Xibo, alors merci d'envoyer un courriel à l'adresse [e-mail] et nous vous donnerons quelque chose à faire.
+</p>
+<h2> <span class="mw-headline" id="Correction_de_Bugs_.2F_Impl.C3.A9mentation_Blueprints">Correction de Bugs / Implémentation Blueprints</span></h2>
+<h3> <span class="mw-headline" id="Vue_d.27ensemble_du_d.C3.A9veloppement">Vue d'ensemble du développement</span></h3>
+<p>Ces notes donnent des directives pour les développeurs qui feront en sorte que tout travail que vous faites ai le maximum de chances de se fusionner dans une version de Xibo.
+</p><p>Le projet utilise exclusivement Xibo Launchpad comme plate-forme de développement. Grâce Launchpad nous gérons propositions d'idées (spécifications pour de nouvelles fonctionnalités), les bugs, FAQ (support), les traductions et la gestion du cycle pour le code source. La seule chose que nous ne parvenons pas à Launchpad est la spécification détaillée des documents et de documentation pour les développeurs, ce qui est bien sûr géré ici sur ce Wiki.
+</p>
+<h3> <span class="mw-headline" id="Liens_importants">Liens importants</span></h3>
+<ul><li> Site du projet Xibo&#160;: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk">http://www.xibo.org.uk</a>
+</li><li> Page du project sur Launchpad&#160;: <a rel="nofollow" class="external free" href="https://launchpad.net/xibo">https://launchpad.net/xibo</a>
+</li><li> Wiki pour les développeurs&#160;: <a rel="nofollow" class="external free" href="http://labs.xibo.org.uk/blueprints">http://labs.xibo.org.uk/blueprints</a> 
+</li></ul>
+<h3> <span class="mw-headline" id="Processus_de_d.C3.A9veloppement_.28comment_contribuer.29">Processus de développement (comment contribuer)</span></h3>
+<p>Je vais diviser le processus de développement en deux sections; Blueprints et bugs. Elles sont essentiellement gérées de la même manière, avec quelques différences mineures.
+</p>
+<h4> <span class="mw-headline" id="Blueprints_.28nouvelles_fonctionnalit.C3.A9s.29">Blueprints (nouvelles fonctionnalités)</span></h4>
+<p>Vous voulez mettre en place une nouvelle fonctionnalité ou une idée pour Xibo&#160;? Ou peut-être que vous voulez un peu modifier la façon dont fonctionne Xibo&#160;? Dans ces deux circonstances, votre première tâche est de créer un entrée dans Blueprint pour cette fonctionnalité et l'attribuer à vous-même. Vous êtes alors responsable de la rédaction d'un document de spécification (cela doit être un bref paragraphe, un article sur ce wiki ou d'une conversation de messagerie instantanée avec nous) dans un second temps, nous pouvons approuver votre idée, demander plus de détails ou suggérer une alternative.
+</p><p>Une fois que votre idée est approuvée, vous pouvez demander à un «mentor» de vous aider à démarrer ou vous pouvez récupérer le code de la  "future" version de la série Xibo et commencer le développement. Tous les efforts devraient être faits en utilisant BZR (Bazaar, soutenu par Launchpad) et renvoyer les modifications de votre branche sur Launchpad, dans l'espace réservé au projet Xibo. Il ya de bons tutoriels Launchpad disponibles sur leur site d'aide.
+</p><p><b>Note</b>&#160;: Les propositions sur Blueprint seront presque toujours pour les «futures versions". Nous vous suggérons de nommer vos branches "lp:~nom-utilisateur/xibo/titre-blueprint"
+</p>
+<h4> <span class="mw-headline" id="Bugs">Bugs</span></h4>
+<p>Vous avez trouvé un bug et vous voulez nous aider à corriger&#160;? Le premier endroit où aller est la partie "bugs" du projet Xibo dans le Launchpad pour créer un rapport de bug pour le problème que vous avez trouvé. Ce rapport de bug sera ensuite triés par la communautée afin de déterminer si il a déjà été fixé ou si c'est un nouveau bug.
+</p><p>Si le bug est confirmé et vous souhaitez appliquer un correctif pour le bug, joindre un commentaire à l'erreur pour le dire, nous donnerons un objectif pour une version et vous l'assignerons. Vous pouvez ensuite récupérer le code de la branche correspondante à la version Xibo spécifiée lros de l'attribution du bug (contrairement à une nouvelle fonctionnalité, un bug est assignée pour une version pour la version stable ou une future version).
+</p><p>Une fois que vous avez récupérer le code, mettre en œuvre la correction du bug et renvoyer le code sur le Launchpad. Nous vous suggérons de nommer votre branche "lp:~nom-utilisateur/xibo/bug#"
+</p><p><i>Check list</i>
+</p>
+<pre>1. Enregistrer un rapport de bug ou une nouvelle fonctionnalité Blueprint in Launchpad
+2. Pour une fonctionnalité Blueprint, créer une spécifiation détaillée, pour un bug aider au triage de celui-ci
+3. Obtenez l'approbation de votre fonctionnalité Blueprint / confirmation de votre bug et vous l'assignez
+4. Récupérer le code la branche correspondante à la fonctionnalité Blueprint / de votre bug
+5. Implémenter la fonctionnalité Blueprint / corriger le bug et publié le code dans une nouvelle branche sur Launchpad
+6. Est-ce que le code correspond au style du code Xibo indiqué dans le guide 
+7. Est-ce que le code utilise corectement les libraries d'objets Xibo (Config, Kit, ResponseManager, DB, etc)
+8. Es-ce que le code affiche bien les variables (utilisation des librairies de fonctions)
+9. Faire une demande de fusion du code
+10. Attendre que votre code soit relu et fusionné&#160;! 
+11. Les points à 1-3 peuvent mettre du temps à être complété, mais cela en vaut la peine&#160;!
+</pre>
+<h2> <span class="mw-headline" id="Traduction">Traduction</span></h2>
+<p>Nous sommes actuellement dans le processus d'ajout de traduction à Xibo. Il y aura une librairie de méthode pour permettre la traduction à la place des appels Gettext en PHP _( "string"). Tous les nouveaux code doivent utiliser cette fonction. Aussi, merci de jeter un oeil à la bibliothèque existante de variables et de voir si le message que vous avez besoin pour l'affichage est déjà dans la librairie de traduction. Si il y a une chaîne de caractères qui existe déjà, merci de la réutiliser plutôt que de créer une nouvelle, très similaire, qui doit être traduit séparément.
+</p>
+<h2> <span class="mw-headline" id="Guide_pour_le_code_source">Guide pour le code source</span></h2>
+<h4> <span class="mw-headline" id="Serveur">Serveur</span></h4>
+<p>Les blocs sont exprimés comme suit:
+</p>
+<pre>class Example
+{
+   function registerDisplay(var)
+   {
+       print "OK";
+   }
+}
+
+$example = new Example();
+</pre>
+<p>Les commentaires sont utiles. Merci d'ajouter des commentaires adéquats pour décrire votre code.
+Si vous incluez le code écrit par quelqu'un d'autre, merci de documenter complétement dans ce cas là où vous l'avez obtenu le code, qui a écrit et sous quelle licence vous l'utiliser. <i> 'Gardez à l'esprit que la licence doit être compatible AGPLv3 ou suivante.'</i>
+</p><p>Xibo est très orienté objet. Merci de vous assurer que votre code suive aussi le style orienté objet, s'il ya lieu.
+</p>
+<h3> <span class="mw-headline" id="Notes">Notes</span></h3>
+<p>En raison de contraintes de temps d'Alex et moi-même nous ne pouvons accepter tout changement de code qui entrent dans les catégories ci-dessous:
+</p>
+<ul><li> Ne pas avoir une fonctionnalité Blueprint ou bug attribué
+</li><li> Avoir plus d'une fonctionnalité Blueprint ou bug en même temps (sans accord préalable)
+</li><li> Ne pas avoir une licence appropriée (voir ci-dessus)
+</li></ul>
+<p>Cette cela peut sembler excessivement complexe de contribuer à Xibo et si cela est trop pour vous, nous vous comprenons. Toutefois, cette méthode donne au projet Xibo le maximum de chances d'être stable, extensible et bien géré&#160;!
+</p><p>Nous ne voulons pas retarder la publication d'importantes corrections et améliorations, pas plus que vous voulez attendre leur libération&#160;! C'est pourquoi nous avons adopté la solution Launchpad. Lorsqu'il est utilisé à bon escient, il permet de corriger les bugs et fusionné ensuite avec une version, et les caractéristiques d'être mis en oeuvre de façon isolée. Il permettra également de réduire les chances que deux contributions entre en conflit les unes avec les autres.
+</p><p>Il s'agit également de la méthode que les Mainteneurs Xibo (Alex et moi) élabore pour le développement et la correction des bugs dans Xibo!
+</p><p>Nous attendons vos contributions!
+</p>
\ No newline at end of file

=== added file 'server/manual/content/admin/database_model.php'
--- server/manual/content/admin/database_model.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/database_model.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,26 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1>Database Model</h1>
+
+<h2>EER</h2>
+<p><a href="content/admin/eer_1.4.png"><img class="img-thumbnail" alt="EER" src="content/admin/eer_1.4.png"></a></p>
\ No newline at end of file

=== added file 'server/manual/content/admin/display_action_menu.png'
Binary files server/manual/content/admin/display_action_menu.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/display_action_menu.png	2014-01-19 13:57:27 +0000 differ
=== added file 'server/manual/content/admin/display_wakeonlan.php'
--- server/manual/content/admin/display_wakeonlan.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/display_wakeonlan.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,78 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1>Wake On LAN (WOL)</h1>
+
+<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>
+<dl>
+	<dt>Enable Wake On LAN</dt>
+	<dd>Turn WOL on/off for the display</dd>
+</dl>
+<dl>
+	<dt>Wake On LAN Time</dt>
+	<dd>Specify a time for this display to wake, using the 24 hr clock</dd>
+</dl>
+<dl>
+	<dt>BroadCast Address</dt>
+	<dd>The BroadCast address of the client, if unknown use the IP address and fill in the CIDR field</dd>
+</dl>
+<dl>
+	<dt>Wake On LAN Secure On</dt>
+	<dd>The SecureOn password for the client, if supported</dd>
+</dl>
+<dl>
+	<dt>Wake On LAN CIDR</dt>
+	<dd>The CIDR subnet mask, if the BroadCast Address is unknown</dd>
+</dl>
+
+<p>Once the display has these settings it can be woken up in 2 ways:</p>
+
+
+<h3>Wake On LAN Now</h3>
+
+<p><img class="img-thumbnail" alt="Send WOL Form" src="content/admin/sa_display_wol.png"></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="index.php?toc=getting_started&p=admin/settings#Maintenance">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 class="alert alert-info">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>
\ No newline at end of file

=== added file 'server/manual/content/admin/displaygroups.php'
--- server/manual/content/admin/displaygroups.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/displaygroups.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,53 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1 id="Display_Group">Display Groups</h1>
+
+<p>Display Groups help to easily schedule layouts and campaigns to multiple displays at once.</p>
+
+<p><img class="img-thumbnail" alt="Display Group Administration" src="content/admin/sa_display_groups.png"></p>
+
+
+<h3 id="Add_Group">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>
+
+<h3 id="Edit_Group">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><strong>Name</strong> is a unique identifier for a group.</p>	   
+
+<h3 id="Delete_Group">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>
+
+<h3 id="Group_Component_Security">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>
+
+<h3 id="Group_Members">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 class="img-thumbnail" alt="Display Group Members" src="content/admin/sa_display_group_members.png"></p>
\ No newline at end of file

=== modified file 'server/manual/content/admin/displays.php'
--- server/manual/content/admin/displays.php	2013-05-01 19:24:35 +0000
+++ server/manual/content/admin/displays.php	2014-01-19 13:57:27 +0000
@@ -1,189 +1,163 @@
-<!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>
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1 id="Displays">Displays</h1>
+
+<p>Displays are records to identify each physical device that should show content from the <?php echo PRODUCT_NAME; ?> CMS. Each display client application registered with the server creates a unique display record when registered.</p>
+
+<p>Display records can be assigned a default layout, have a schedule of layouts and are used for status monitoring and access control. The main area for displays is the Display Administration page accessed from the Nagivation Bar by clicking on "Displays > Displays"</p>
+
+<p><img class="img-thumbnail" alt="Display Administration" src="content/admin/sa_displays.png"></p>
+
+<p>The display administration table gives an easy to understand overview of each display registered in the CMS.</p>
+
+<dl class="dl-horizontal">
+	<dt>Row Colour</dt>
+	<dd>The status of the display. Red = missing content, Yellow = downloading missing content, Green = Up to Date.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>ID</dt>
+	<dd>The internal ID for the display.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Licence</dt>
+	<dd>A tick or cross showing whether the display has been granted a licence with the CMS. This prevents unauthourised displays being added to the CMS.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Display</dt>
+	<dd>A friendly name for the display. This can be set during the registration process in the display client software.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Default Layout</dt>
+	<dd>The default layout that will play when there are no other layouts/campaigns scheduled or when all scheduled layouts are invalid.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Interleave Default</dt>
+	<dd>A tick or cross showing whether the default layout will play when there are other layouts scheduled.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Email Alert</dt>
+	<dd>A tick or cross showing whether an email alert will be sent by the Maintenance module.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Logged In</dt>
+	<dd>A tick or cross showing whether the display has logged in recently. The time out for the display is set on each display OR in the global settings field MAINTENANCE_ALERT_TOUT.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Last Accessed</dt>
+	<dd>The date/time of last access.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>IP Address</dt>
+	<dd>The IP address the display had the last time it reported its status through the "Media Inventory" status call.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Mac Address</dt>
+	<dd>The Mac Address of the display (if the client software is capable of sending it).</dd>
+</dl>
+
+<h2 id="Display_ActionMenu">Action Menu <small>options for each display</small></h2>
+<p>Displays can have a number of actions performed against them.</p>
+
+<p><img class="img-thumbnail" alt="Display Action Menu" src="content/admin/display_action_menu.png"></p>
+
+<dl class="dl-horizontal">
+	<dt>Schedule Now</dt>
+	<dd>A quick shortcut to scheduling a layout from the current time for a particular duration.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Media Inventory</dt>
+	<dd>View the required media inventory and the current status of each item as reported by the display during the last check in.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Default Layout</dt>
+	<dd>A quick shortcut to updating the default layout.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Edit</dt>
+	<dd>The display edit form for adjusting all options available on the display.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Wake on LAN</dt>
+	<dd>Send a Wake on LAN packet to the display - requires the Wake On LAN settings to be configured.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Delete</dt>
+	<dd>The display delete form.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Display Groups</dt>
+	<dd>Administration of the display groups this display belongs to.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Permissions</dt>
+	<dd>Adjust the user/user group permissions on this display.</dd>
+</dl>
+
+<h2 id="Display_Edit">Display Edit</h2>
+
+<p>Before the display will be allowed to download its schedule or required media it must be licenced with the CMS. After a display client is registered a new display record will appear in the Display Administration - it will then need to be edited to grant is access (getting a licence).</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 class="img-thumbnail" alt="Display Edit" src="content/admin/sa_display_edit.png"></p> 
+
+
+<h2 id="Display_Delete">Display Delete</h2>
+
+<p>Deleting a display will remove it from the CMS entirely and can only be performed if the display is not active.</p>
+
+<p class="alert alert-info">A display can be unlicenced without deleting it using the Display Edit form.</p>
+
+<p><img class="img-thumbnail" alt="Display Delete" src="content/admin/sa_display_delete.png"></p>
+
+<p class="alert alert-warning">Deleting a display cannot be reversed. A display can be reconnected to the CMS by repeating the "register" procedure which will create a new display record.</p>
+
+
+<h2 id="Media_Inventory">Media Inventory</h2>
+
+<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.</p>
+
+
+<p><img class="img-thumbnail" alt="Display Media Inventory" src="content/admin/sa_display_media_inventory.png"></p>
+
+<p class="alert alert-info">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>
\ No newline at end of file

=== added file 'server/manual/content/admin/displaystats.php'
--- server/manual/content/admin/displaystats.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/displaystats.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<h1 id="Display_Statistic">Display Statistics <small>Proof of Play</small></h1>
+
+<p>Display clients collect statistics for layouts and media shown and their play durations. These statistics can be viewed in the Displays section using the Statistics sub menu.</p>
+
+<p>A specific display can be viewed across a date range.</p>
+
+<p><img class="img-thumbnail" alt="Display Statistics" src="content/admin/sa_display_statistic.png"></p>
+
+<dl class="dl-horizontal">
+	<dt>Layouts Shown</dt>
+	<dd>All layouts shown in the range selected.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Library Media Shown</dt>
+	<dd>All media shown in the range selected.</dd>
+</dl>
+<dl class="dl-horizontal">
+	<dt>Media on Layouts Shown</dt>
+	<dd>All Layouts shown with a breakdown of the associated media on those Layouts.</dd>
+</dl>
+
+<p class="alert alert-warning">Statistics reporting may need to be enabled on the display client application.</p>

=== added file 'server/manual/content/admin/eer_1.4.png'
Binary files server/manual/content/admin/eer_1.4.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/eer_1.4.png	2014-01-19 13:57:27 +0000 differ
=== modified file 'server/manual/content/admin/modules.php'
--- server/manual/content/admin/modules.php	2013-05-01 19:24:35 +0000
+++ server/manual/content/admin/modules.php	2014-01-19 13:57:27 +0000
@@ -1,66 +1,75 @@
-<!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>
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
 		
-		<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>
+<h1>Modules</h1>
+<p>All content displayed in <?php echo PRODUCT_NAME; ?> is added/edited and served by a media module. There are 13 media modules to choose from and more are being added as new releases are made.</p>
+
+<p>Modules can be enabled and disabled using the CMS administrator menu, Modules sub menu. Each module also has a range of settings available.</p>
+
+<p><img  class="img-thumbnail" alt="Module List" src="content/admin/sa_modules.png"></p>
+
+<p>Each module has the following properties.</p>
+
+<dl class="dl-horizontal">
+    <dt>Name</dt>
+    <dd>System given Name for the specific module.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Description</dt>
+    <dd>A breif description of the module.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Library Media</dt>
+    <dd>Indicated if the content is saved in the <?php echo PRODUCT_NAME; ?> Library. Unchecked indicate the specific content is only saved with the Layout-Regions.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Valid Extensions</dt>
+    <dd>File extensions that are supported by the specific module.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Image Uri</dt>
+    <dd>Link to the module icon for UI display - this can also be provided by your Theme.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Preview Enabled</dt>
+    <dd>Should this module output a preview in the Layout Designer.</dd>
+</dl>
+
+<dl class="dl-horizontal">
+    <dt>Enabled</dt>
+    <dd>Can this module be used?</dd>
+</dl>
+
+
+<h2>Modules Settings</h2>
+<p>A Module can have a selection of its settings adjusted, exactly which ones depends on the module.</p>
+
+<h3>File based Modules</h3>
+<p>At times it may be necessary to add or removed the allowed extensions on a particular file based module. A typical use case would be if a client is being used which does not support that particular type of file.</p>
+
+<p><img class="img-thumbnail" alt="Modules" src="content/admin/sa_modules_video.png"></p>

=== modified file 'server/manual/content/admin/overview.php'
Binary files server/manual/content/admin/overview.php	2013-03-05 19:25:50 +0000 and server/manual/content/admin/overview.php	2014-01-19 13:57:27 +0000 differ
=== added file 'server/manual/content/admin/release_notes.php'
--- server/manual/content/admin/release_notes.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/release_notes.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,23 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<?php include('content/admin/release_notes_' . PRODUCT_VERSION . '.php'); ?>
\ No newline at end of file

=== added file 'server/manual/content/admin/release_notes_1.0.0.php'
--- server/manual/content/admin/release_notes_1.0.0.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/release_notes_1.0.0.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,74 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#Xibo_1.0.1_-_Codename_.22Halley.22"><span class="tocnumber">1</span> <span class="toctext">Xibo 1.0.1 - Codename "Halley"</span></a></li>
+<li class="toclevel-1 tocsection-2"><a href="#Requirements"><span class="tocnumber">2</span> <span class="toctext">Requirements</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Upgrading"><span class="tocnumber">3</span> <span class="toctext">Upgrading</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Bug_Fixes"><span class="tocnumber">4</span> <span class="toctext">Bug Fixes</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#Known_Issues_and_Limitations"><span class="tocnumber">5</span> <span class="toctext">Known Issues and Limitations</span></a></li>
+</ul>
+</td></tr></table>
+<h3> <span class="mw-headline" id="Xibo_1.0.1_-_Codename_.22Halley.22">Xibo 1.0.1 - Codename "Halley"</span></h3>
+<p>This is a bug fix release mainly aimed at people that are having trouble installing Xibo. If you already have a working version of Xibo 1.0.0 there is no need for you to upgrade to this latest release.
+</p><p>You can download this release from <a rel="nofollow" class="external free" href="https://launchpad.net/xibo/1.0/1.0.1">https://launchpad.net/xibo/1.0/1.0.1</a>
+</p>
+<h3> <span class="mw-headline" id="Requirements"> Requirements </span></h3>
+<p>You should use the 1.0.0 client with this version of the Xibo server.
+</p><p>Xibo now recommends PHP 5.2.0 or higher. Xibo will function in most cases with 5.1.0 but you may experience some problems with experimental PHP functions. In particular Xibo may present a restricted list of timezones in the Admin Interface.
+</p>
+<h3> <span class="mw-headline" id="Upgrading"> Upgrading </span></h3>
+<ul><li> Backup settings.php from your installation
+</li><li> The upgrader will attempt to backup your database, but manually taking a backup would be a good idea.
+</li><li> Replace your existing installation with the new version from the tar.gz or zip file
+</li><li> Replace your settings.php file
+</li><li> Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a> as normal
+</li><li> You will be prompted that an upgrade is required.
+</li><li> Enter your xibo_admin password, and follow the upgrade wizard.
+</li><li> The upgrade should run, and finally ask you to log in as you would normally.
+</li></ul>
+<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</p><p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</p><p>Please ask for help/advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
+</p>
+<h3> <span class="mw-headline" id="Bug_Fixes">Bug Fixes</span></h3>
+<p>Fixes for the following Bugs
+</p>
+<ul><li> 358996 - [Linux Server] Install block on configuration of database
+</li><li> 369674 - Xibo requires PHP 5.1.0 (with compile options) or 5.2.0 otherwise, but only checks for 5.0.2
+</li><li> 362320 - Retired layouts shown in Default Layout select
+</li><li> 361125 - The file name is not displayed in Layout / Region Options
+</li></ul>
+<h3> <span class="mw-headline" id="Known_Issues_and_Limitations"> Known Issues and Limitations </span></h3>
+<p>Xibo is a young project. There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.0 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.1 series - which will be unstable.
+</p><p>Once we are happy with 1.1, we will release Xibo 1.2 which will be the next stable release series and the direct upgrade path for 1.0. Any future releases of Xibo 1.0 will be bug fix releases only.
+</p><p>Therefore there are the following known issues and limitations with Xibo 1.0.0-final:
+</p>
+<ul><li> Internationalisation: Xibo currently deals with non-english characters badly. You are strongly recommended to avoid using non-english characters wherever possible. <a rel="nofollow" class="external autonumber" href="https://blueprints.launchpad.net/xibo/translate-xibo">[1]</a>
+</li><li> Tickers slow when only one layout scheduled. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/336589">[2]</a>
+</li><li> The backgrounds of Text and RSS media items are not transparent if the background of a layout is a GIF image. Please use JPEG images as a work around. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/348506">[3]</a>
+</li><li> Videos will not loop if they are the only media in a region. Add a short empty text field as a work around. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/346260">[4]</a>
+</li><li> Overlapping regions are handled badly. The existing server/client were never developed to support overlapping regions, but they do work in some circumstances which is why we have decided to leave this functionality intact, but with the caveat that they may not work as you expect. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/321377">[5]</a> <a rel="nofollow" class="external autonumber" href="https://answers.launchpad.net/xibo/+question/64768">[6]</a>
+</li><li> Client will not run under VirtualBox. We think this is a VirtualBox bug as it's a low-level Windows API call that is failing. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/338021">[7]</a>
+</li><li> Backgrounds of FlashMedia items are not transparent. This is a limitation of the Adobe Flash C# control. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/341634">[8]</a>
+</li></ul>
\ No newline at end of file

=== added file 'server/manual/content/admin/release_notes_1.0.1.php'
--- server/manual/content/admin/release_notes_1.0.1.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/release_notes_1.0.1.php	2014-01-19 13:57:27 +0000
@@ -0,0 +1,74 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2013 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+?>
+<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#Xibo_1.0.1_-_Codename_.22Halley.22"><span class="tocnumber">1</span> <span class="toctext">Xibo 1.0.1 - Codename "Halley"</span></a></li>
+<li class="toclevel-1 tocsection-2"><a href="#Requirements"><span class="tocnumber">2</span> <span class="toctext">Requirements</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Upgrading"><span class="tocnumber">3</span> <span class="toctext">Upgrading</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Bug_Fixes"><span class="tocnumber">4</span> <span class="toctext">Bug Fixes</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#Known_Issues_and_Limitations"><span class="tocnumber">5</span> <span class="toctext">Known Issues and Limitations</span></a></li>
+</ul>
+</td></tr></table>
+<h3> <span class="mw-headline" id="Xibo_1.0.1_-_Codename_.22Halley.22">Xibo 1.0.1 - Codename "Halley"</span></h3>
+<p>This is a bug fix release mainly aimed at people that are having trouble installing Xibo. If you already have a working version of Xibo 1.0.0 there is no need for you to upgrade to this latest release.
+</p><p>You can download this release from <a rel="nofollow" class="external free" href="https://launchpad.net/xibo/1.0/1.0.1">https://launchpad.net/xibo/1.0/1.0.1</a>
+</p>
+<h3> <span class="mw-headline" id="Requirements"> Requirements </span></h3>
+<p>You should use the 1.0.0 client with this version of the Xibo server.
+</p><p>Xibo now recommends PHP 5.2.0 or higher. Xibo will function in most cases with 5.1.0 but you may experience some problems with experimental PHP functions. In particular Xibo may present a restricted list of timezones in the Admin Interface.
+</p>
+<h3> <span class="mw-headline" id="Upgrading"> Upgrading </span></h3>
+<ul><li> Backup settings.php from your installation
+</li><li> The upgrader will attempt to backup your database, but manually taking a backup would be a good idea.
+</li><li> Replace your existing installation with the new version from the tar.gz or zip file
+</li><li> Replace your settings.php file
+</li><li> Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a> as normal
+</li><li> You will be prompted that an upgrade is required.
+</li><li> Enter your xibo_admin password, and follow the upgrade wizard.
+</li><li> The upgrade should run, and finally ask you to log in as you would normally.
+</li></ul>
+<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
+</p><p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
+</p><p>Please ask for help/advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
+</p>
+<h3> <span class="mw-headline" id="Bug_Fixes">Bug Fixes</span></h3>
+<p>Fixes for the following Bugs