update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -8,8 +8,8 @@
*/
namespace Piwik\View;
use Piwik\View;
use Exception;
use Piwik\View;
/**
* Base type of UI controls.
@ -59,6 +59,13 @@ class UIControl extends \Piwik\View
*/
public $cssClass = "";
/**
* HTML Attributes for the root element
*
* @var string
*/
public $htmlAttributes = array();
/**
* The inner view that renders the actual control content.
*
@ -125,6 +132,7 @@ class UIControl extends \Piwik\View
$this->templateVars['cssIdentifier'] = $this->cssIdentifier;
$this->templateVars['cssClass'] = $this->cssClass;
$this->templateVars['jsClass'] = $this->jsClass;
$this->templateVars['htmlAttributes'] = $this->htmlAttributes;
$this->templateVars['jsNamespace'] = $this->jsNamespace;
$this->templateVars['implOverride'] = $override;
@ -136,7 +144,6 @@ class UIControl extends \Piwik\View
}
$this->templateVars['clientSideParameters'] = array();
$clientSideParameters = $this->getClientSideParameters();
foreach ($this->getClientSideParameters() as $name) {
$this->templateVars['clientSideParameters'][$name] = $innerTemplateVars[$name];
}
@ -169,4 +176,4 @@ class UIControl extends \Piwik\View
{
return array();
}
}
}