Merge lp:~dangarner/xibo/1278059 into lp:xibo/1.6

[Dan Garner]

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/service/xmdssoap.class.php	2014-02-09 15:05:20 +0000
@@ -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) && ($row[6] == 1) && Config::GetSetting('MAINTENANCE_ENABLED') == 'On') && Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On'))
+        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	2014-01-18 09:47:41 +0000
+++ server/lib/xmds.inc.php	2014-02-09 15:05:20 +0000
@@ -20,7 +20,7 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
  
-error_reporting(E_ALL);
+error_reporting(0);
 ini_set('display_errors', 0); //we never want to display errors on the screen
 
 // Required Library Files

=== added file 'server/manual/content/install/Capture-2.jpg'
Binary files server/manual/content/install/Capture-2.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Capture-2.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Capture-3.jpg'
Binary files server/manual/content/install/Capture-3.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Capture-3.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Capture-4.jpg'
Binary files server/manual/content/install/Capture-4.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Capture-4.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Capture-6.jpg'
Binary files server/manual/content/install/Capture-6.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Capture-6.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Configured_Control_Panel.jpg'
Binary files server/manual/content/install/Configured_Control_Panel.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Configured_Control_Panel.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Control_Panel_Running.jpg'
Binary files server/manual/content/install/Control_Panel_Running.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Control_Panel_Running.jpg	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Win32_phpmyadmin_password.png'
Binary files server/manual/content/install/Win32_phpmyadmin_password.png	1970-01-01 00:00:00 +0000 and server/manual/content/install/Win32_phpmyadmin_password.png	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Win32_phpmyadmin_privileges.png'
Binary files server/manual/content/install/Win32_phpmyadmin_privileges.png	1970-01-01 00:00:00 +0000 and server/manual/content/install/Win32_phpmyadmin_privileges.png	2014-02-09 15:05:20 +0000 differ
=== added file 'server/manual/content/install/Win32_xampp_install_start.jpg'
Binary files server/manual/content/install/Win32_xampp_install_start.jpg	1970-01-01 00:00:00 +0000 and server/manual/content/install/Win32_xampp_install_start.jpg	2014-02-09 15:05:20 +0000 differ
=== modified file 'server/manual/content/install/install_environment.php'
--- server/manual/content/install/install_environment.php	2014-01-18 09:47:41 +0000
+++ server/manual/content/install/install_environment.php	2014-02-09 15:05:20 +0000
@@ -104,27 +104,27 @@
 </p><p>Once XAMPP Installer has downloaded, double click on it to run it. You may be prompted to allow the installer to run as the publisher could not be verified. Click "Run".
 </p><p>You should get to the start of the install wizard.
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Win32_xampp_install_start.jpg" class="image"><img alt="" src="/images/thumb/2/20/Win32_xampp_install_start.jpg/100px-Win32_xampp_install_start.jpg" width="100" height="70" class="thumbimage" srcset="/images/thumb/2/20/Win32_xampp_install_start.jpg/150px-Win32_xampp_install_start.jpg 1.5x, /images/thumb/2/20/Win32_xampp_install_start.jpg/200px-Win32_xampp_install_start.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Win32_xampp_install_start.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Installer Running</div></div></div>
+<div class="img-thumbnail"><img src="content/install/Win32_xampp_install_start.jpg"></div>
 <p>By default, XAMPP installs to "c:\xampp". Unless you need to move it somewhere else, then that's a good choice. If you do select a different directory, remember it for the next step when we install Xibo.  Click Install.
 The installer will now run, and extract a number of files.  When it finishes, it will bring you to a command prompt.
 </p><p>You'll now be asked a few questions about how XAMPP should install itself.  At the following prompts, you may select all default options.
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Capture-2.jpg" class="image"><img alt="" src="/images/thumb/c/c1/Capture-2.jpg/100px-Capture-2.jpg" width="100" height="47" class="thumbimage" srcset="/images/thumb/c/c1/Capture-2.jpg/150px-Capture-2.jpg 1.5x, /images/thumb/c/c1/Capture-2.jpg/200px-Capture-2.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Capture-2.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Command Prompt 1</div></div></div>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Capture-3.jpg" class="image"><img alt="" src="/images/thumb/3/36/Capture-3.jpg/100px-Capture-3.jpg" width="100" height="47" class="thumbimage" srcset="/images/thumb/3/36/Capture-3.jpg/150px-Capture-3.jpg 1.5x, /images/thumb/3/36/Capture-3.jpg/200px-Capture-3.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Capture-3.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Command Prompt 2</div></div></div>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Capture-4.jpg" class="image"><img alt="" src="/images/thumb/1/15/Capture-4.jpg/100px-Capture-4.jpg" width="100" height="47" class="thumbimage" srcset="/images/thumb/1/15/Capture-4.jpg/150px-Capture-4.jpg 1.5x, /images/thumb/1/15/Capture-4.jpg/200px-Capture-4.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Capture-4.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Command Prompt 3</div></div></div>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Capture-6.jpg" class="image"><img alt="" src="/images/thumb/7/7f/Capture-6.jpg/100px-Capture-6.jpg" width="100" height="47" class="thumbimage" srcset="/images/thumb/7/7f/Capture-6.jpg/150px-Capture-6.jpg 1.5x, /images/thumb/7/7f/Capture-6.jpg/200px-Capture-6.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Capture-6.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Command Prompt 4</div></div></div>
+<div class="img-thumbnail"><img src="content/install/Capture-2.jpg"></div>
+<div class="img-thumbnail"><img src="content/install/Capture-3.jpg"></div>
+<div class="img-thumbnail"><img src="content/install/Capture-4.jpg"></div>
+<div class="img-thumbnail"><img src="content/install/Capture-6.jpg"></div>
 <p>Once the installation scripts complete, you should choose option 1 to load the XAMPP Control Panel. It should open up, and if everything went to plan, look like the screenshot.
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Control_Panel_Running.jpg" class="image"><img alt="" src="/images/thumb/b/b7/Control_Panel_Running.jpg/100px-Control_Panel_Running.jpg" width="100" height="79" class="thumbimage" srcset="/images/thumb/b/b7/Control_Panel_Running.jpg/150px-Control_Panel_Running.jpg 1.5x, /images/thumb/b/b7/Control_Panel_Running.jpg/200px-Control_Panel_Running.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Control_Panel_Running.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Control Panel</div></div></div>
+<div class="img-thumbnail"><img src="content/install/Control_Panel_Running.jpg"></div>
 <p>At this point, you need to check the boxes next to "Svc" for both Apache and MySql.  As you click each, it will prompt you to install the service for that item.  Click OK.  Then click the "Start" button on each of these items as well.
 Your screen should now look like the below:
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Configured_Control_Panel.jpg" class="image"><img alt="" src="/images/thumb/1/11/Configured_Control_Panel.jpg/100px-Configured_Control_Panel.jpg" width="100" height="79" class="thumbimage" srcset="/images/thumb/1/11/Configured_Control_Panel.jpg/150px-Configured_Control_Panel.jpg 1.5x, /images/thumb/1/11/Configured_Control_Panel.jpg/200px-Configured_Control_Panel.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Configured_Control_Panel.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>XAMPP Control Panel Started</div></div></div>
+<div class="img-thumbnail"><img src="content/install/Configured_Control_Panel.jpg"></div>
 <p><br />
 Before we install Xibo, we need to configure a few things on XAMPP to make it a bit more secure. From the XAMPP Control Panel, click the "Admin" button next to MySQL. This will load a web browser and take you to an application called PHPMyAdmin that was installed along with XAMPP. It will let us setup a password for the "root" MySQL account. The "root" account on MySQL has privileges to add new users, create databases etc so needs to have a strong password.
 </p><p>From the PHPMyAdmin screen, click "Privileges" at the top of the screen. You'll see the database users that exist already listed. We're interested in the one called "root" that has "localhost" in the "Host" column. Click the blue "Edit Privileges" symbol to the right of the word "Yes".
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Win32_phpmyadmin_privileges.png" class="image"><img alt="" src="/images/thumb/d/da/Win32_phpmyadmin_privileges.png/100px-Win32_phpmyadmin_privileges.png" width="100" height="71" class="thumbimage" srcset="/images/thumb/d/da/Win32_phpmyadmin_privileges.png/150px-Win32_phpmyadmin_privileges.png 1.5x, /images/thumb/d/da/Win32_phpmyadmin_privileges.png/200px-Win32_phpmyadmin_privileges.png 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Win32_phpmyadmin_privileges.png" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>PHPMyAdmin Privileges</div></div></div>
+<div class="img-thumbnail"><img src="content/install/Win32_phpmyadmin_privileges.png"></div>
 <p>Scroll down the page until you find the "Change Password" box. Enter a new password in both the password boxes and click "Go". On a piece of paper, write down "MySQL Admin User details. Username: root Password:" followed by the password you just chose. We'll need these later!
 </p>
-<div class="thumb tnone"><div class="thumbinner" style="width:102px;"><a href="/wiki/File:Win32_phpmyadmin_password.png" class="image"><img alt="" src="/images/thumb/6/6f/Win32_phpmyadmin_password.png/100px-Win32_phpmyadmin_password.png" width="100" height="71" class="thumbimage" srcset="/images/thumb/6/6f/Win32_phpmyadmin_password.png/150px-Win32_phpmyadmin_password.png 1.5x, /images/thumb/6/6f/Win32_phpmyadmin_password.png/200px-Win32_phpmyadmin_password.png 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Win32_phpmyadmin_password.png" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>PHPMyAdmin Change Password</div></div></div>
\ No newline at end of file
+<div class="img-thumbnail"><img src="content/install/Win32_phpmyadmin_password.png"></div>
\ No newline at end of file

=== modified file 'server/modules/preview/HtmlTemplateForGetResource.html'
--- server/modules/preview/HtmlTemplateForGetResource.html	2013-11-20 18:59:36 +0000
+++ server/modules/preview/HtmlTemplateForGetResource.html	2014-02-09 15:05:20 +0000
@@ -4,7 +4,7 @@
         <title>Xibo Open Source Digital Signage</title>
         <meta name="viewport" content="width=[[ViewPortWidth]], user-scalable=no, initial-scale=1.0, target-densitydpi=device-dpi" />
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<!-- Copyright 2006-2013 Daniel Garner. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
+		<!-- Copyright 2006-2014 Daniel Garner. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
 
         <script type="text/javascript">
 /*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
@@ -48,7 +48,7 @@
         <script type="text/javascript">
 /**
 * Xibo - Digital Signage - http://www.xibo.org.uk
-* Copyright (C) 2009-2013 Daniel Garner
+* Copyright (C) 2009-2014 Daniel Garner
 *
 * This file is part of Xibo.
 *
@@ -65,7 +65,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
 */
-jQuery.fn.extend({xiboRender:function(e,t){var n={type:"ticker",direction:"single",duration:"50",durationIsPerItem:false,numItems:0,takeItemsFrom:"start",itemsPerPage:0,scrollSpeed:"2",scaleMode:"scale"};var e=$.extend({},n,e);e.width=$(window).width();e.height=$(window).height();e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);this.each(function(){if(e.type=="ticker"){if(e.sourceid==undefined){console.error("Source ID undefined - assuming 1");e.sourceid=1}if(e.sourceid==1){if(e.takeItemsFrom=="end"){t.reverse()}if(e.numItems>t.length||e.numItems==0)e.numItems=t.length;e.items=t.slice(0,e.numItems);if(e.takeItemsFrom=="end"){t.reverse()}}else{e.numItems=t.length}}var n=e.numItems;var r=e.itemsPerPage>0?Math.ceil(e.numItems/e.itemsPerPage):e.numItems;var i=1;var s=this;for(var o=0;o<t.length;o++){if(e.direction=="single"&&e.itemsPerPage>0&&(i>=e.itemsPerPage||o==0)){s=$("<div/>").addClass("page").appendTo(this);i=0}$("<div/>").addClass("item").html(t[o]).appendTo(s);i++}if(e.scaleMode=="fit"){$("*",this).css("font-size","");$(this).css({width:e.originalWidth,height:e.originalHeight}).fitText(1.75)}else if(e.scaleMode=="scale"){$(this).css({zoom:e.scaleFactor,width:e.originalWidth,height:e.originalHeight})}var u=false;if(e.direction=="single"){var a=e.itemsPerPage>0?"> .page":"> .item";var f=e.itemsPerPage>0?r:n;var l=e.durationIsPerItem?e.duration:e.duration/f;$(this).cycle({fx:e.transition,timeout:l*1e3,slides:a})}else if(e.direction=="left"||e.direction=="right"){u=true;$(" .item",this).css({display:"inline","padding-left":"4px"});$(" .item p",this).css({display:"inline"})}else if(e.direction=="up"||e.direction=="down"){u=true}if(u){var c=$("<div/>").addClass("scroll").attr({scrollamount:e.scrollSpeed,scaleFactor:e.scaleFactor,behaviour:"scroll",direction:e.direction,height:e.originalHeight,width:e.originalWidth});$(this).wrapInner(c);$(this).find(".scroll").marquee()}})},dataSetRender:function(e){if(e===undefined||e===null){e={duration:5,transition:"fade"}}$(this).each(function(){var t=$(this).attr("totalPages");$(this).cycle({fx:e.transition,timeout:e.duration*1e3/t,slides:"> table"})})}});if(!window.console){(function(){var e=["log","debug","info","warn","error","assert","dir","dirxml","group","groupEnd","time","timeEnd","count","trace","profile","profileEnd"],t,n=e.length;window.console={};for(t=0;t<n;t++){window.console[e[t]]=function(){}}})()}
+jQuery.fn.extend({xiboRender:function(e,t){var n={type:"ticker",direction:"single",duration:"50",durationIsPerItem:false,numItems:0,takeItemsFrom:"start",itemsPerPage:0,scrollSpeed:"2",scaleMode:"scale"};var e=$.extend({},n,e);e.width=$(window).width();e.height=$(window).height();e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);this.each(function(){if(e.type=="ticker"){if(e.sourceid==undefined){console.error("Source ID undefined - assuming 1");e.sourceid=1}if(e.sourceid==1){if(e.takeItemsFrom=="end"){t.reverse()}if(e.numItems>t.length||e.numItems==0)e.numItems=t.length;e.items=t.slice(0,e.numItems);if(e.takeItemsFrom=="end"){t.reverse()}}else{e.numItems=t.length}}var n=e.numItems;var r=e.itemsPerPage>0?Math.ceil(e.numItems/e.itemsPerPage):e.numItems;var i=1;var s=this;for(var o=0;o<t.length;o++){if(e.direction=="single"&&e.itemsPerPage>0&&(i>=e.itemsPerPage||o==0)){s=$("<div/>").addClass("page").appendTo(this);i=0}$("<div/>").addClass("item").html(t[o]).appendTo(s);i++}if(e.scaleMode=="fit"){$("*",this).css("font-size","");$(this).css({width:e.originalWidth,height:e.originalHeight}).fitText(1.75)}else if(e.scaleMode=="scale"){$(this).css({zoom:e.scaleFactor,width:e.originalWidth,height:e.originalHeight})}var u=false;if(e.direction=="single"){var a=e.itemsPerPage>0?"> .page":"> .item";var f=e.itemsPerPage>0?r:n;var l=e.durationIsPerItem?e.duration:e.duration/f;$(this).cycle({fx:e.transition,timeout:l*1e3,slides:a})}else if(e.direction=="left"||e.direction=="right"){u=true;$(" .item",this).css({display:"inline","padding-left":"4px"});$(" .item p",this).css({display:"inline"})}else if(e.direction=="up"||e.direction=="down"){u=true}if(u){var c=$("<div/>").addClass("scroll").attr({scrollamount:e.scrollSpeed,scaleFactor:e.scaleFactor,behaviour:"scroll",direction:e.direction,height:e.originalHeight,width:e.originalWidth});$(this).wrapInner(c);$(this).find(".scroll").marquee()}if(e.direction=="up"||e.direction=="down"){$(this).children().children().css("white-space","normal")}})},dataSetRender:function(e){if(e===undefined||e===null){e={duration:5,transition:"fade"}}$(this).each(function(){var t=$(this).attr("totalPages");$(this).cycle({fx:e.transition,timeout:e.duration*1e3/t,slides:"> table"})})}});if(!window.console){(function(){var e=["log","debug","info","warn","error","assert","dir","dirxml","group","groupEnd","time","timeEnd","count","trace","profile","profileEnd"],t,n=e.length;window.console={};for(t=0;t<n;t++){window.console[e[t]]=function(){}}})()}
         </script>
         <!--script type="text/javascript" src="modules/preview/xibo-text-render.js"></script-->
 
@@ -95,4 +95,5 @@
     <body>
         <!--[[[BODYCONTENT]]]-->
     </body>
-</html>
\ No newline at end of file
+</html>
+<!--[[[CONTROLMETA]]]-->
\ No newline at end of file

=== modified file 'server/modules/preview/xibo-text-render.js'
--- server/modules/preview/xibo-text-render.js	2013-08-05 20:30:26 +0000
+++ server/modules/preview/xibo-text-render.js	2014-02-09 15:05:20 +0000
@@ -1,6 +1,6 @@
 /**
 * Xibo - Digital Signage - http://www.xibo.org.uk
-* Copyright (C) 2009-2013 Daniel Garner
+* Copyright (C) 2009-2014 Daniel Garner
 *
 * This file is part of Xibo.
 *
@@ -221,6 +221,11 @@
                 // Set some options on the extra DIV and make it a marquee
                 $(this).find('.scroll').marquee();
             }
+
+            // Correct the Up and Down scrolling so that half the article is not cut
+            if (options.direction == "up" || options.direction == "down") {
+                $(this).children().children().css("white-space", "normal");
+            }
         });
     },
     dataSetRender: function(options) {

=== modified file 'server/modules/ticker.module.php'
--- server/modules/ticker.module.php	2014-01-19 12:39:47 +0000
+++ server/modules/ticker.module.php	2014-02-09 15:05:20 +0000
@@ -122,7 +122,6 @@
         			array('Substitute' => 'Copyright'),
         			array('Substitute' => 'Link'),
         			array('Substitute' => 'PermaLink'),
-        			array('Substitute' => 'Link'),
         			array('Substitute' => 'Tag|Namespace')
         		);
         	Theme::Set('substitutions', $subs);
@@ -550,6 +549,20 @@
         if (count($items) == 0)
         	return '';
 
+        // Work out how many pages we will be showing.
+        $pages = $numItems;
+
+        if ($numItems > count($items) || $numItems == 0)
+        	$pages = count($items);
+
+        $pages = ($itemsPerPage > 0) ? ceil($pages / $itemsPerPage) : $pages;
+        $totalDuration = ($durationIsPerItem == 0) ? $duration : ($duration * $pages);
+
+        $controlMeta = array('numItems' => $pages, 'totalDuration' => $totalDuration);
+
+        // Replace and Control Meta options
+        $template = str_replace('<!--[[[CONTROLMETA]]]-->', '<!-- NUMITEMS=' . $pages . ' -->' . PHP_EOL . '<!-- DURATION=' . $totalDuration . ' -->', $template);
+
         // Replace the head content
         $headContent  = '<script type="text/javascript">';
         $headContent .= '   function init() { ';
@@ -557,6 +570,7 @@
         $headContent .= '   } ';
         $headContent .= '	var options = ' . json_encode($options) . ';';
         $headContent .= '	var items = ' . json_encode($items) . ';';
+        $headContent .= '	var meta = ' . json_encode($controlMeta) . ';';
         $headContent .= '</script>';
 
         if ($itemsSideBySide == 1) {