diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-07 15:31:27 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-07 15:31:27 +0300 |
| commit | 6f465eb01c10d578a4ad038dc003cfe194d7a218 (patch) | |
| tree | 3ee00692f89cb2ba923115d74036ee3ae0144c68 /core | |
| parent | 10d482f1d3deb4c717fbb87f523428196634a326 (diff) | |
various fixes for left menu, code tweaks and documented new method to register icons
Diffstat (limited to 'core')
| -rw-r--r-- | core/Menu/MenuAbstract.php | 12 | ||||
| -rw-r--r-- | core/Updates/2.15.0-b16.php (renamed from core/Updates/2.15.0-b13.php) | 2 | ||||
| -rw-r--r-- | core/Version.php | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index a742df41ab..777d97b523 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -49,9 +49,15 @@ abstract class MenuAbstract extends Singleton return $this->menu; } - public function registerMenuIcon($menuName, $icon) + /** + * Let's you register a menu icon for a certain menu category to replace the default arrow icon. + * + * @param string $menuName The translation key of a main menu category, eg 'Dashboard_Dashboard' + * @param string $iconCssClass The css class name of an icon, eg 'icon-user' + */ + public function registerMenuIcon($menuName, $iconCssClass) { - $this->menuIcons[$menuName] = $icon; + $this->menuIcons[$menuName] = $iconCssClass; } /** @@ -173,7 +179,7 @@ abstract class MenuAbstract extends Singleton if (!empty($this->menuIcons[$menuName])) { $this->menu[$menuName]['_icon'] = $this->menuIcons[$menuName]; } else { - $this->menu[$menuName]['_icon'] = 'icon-arrow-right'; + $this->menu[$menuName]['_icon'] = ''; } } if (!empty($subMenuName)) { diff --git a/core/Updates/2.15.0-b13.php b/core/Updates/2.15.0-b16.php index 2420eeaecc..a37e621129 100644 --- a/core/Updates/2.15.0-b13.php +++ b/core/Updates/2.15.0-b16.php @@ -13,7 +13,7 @@ use Piwik\Plugin\Manager; use Piwik\Updater; use Piwik\Updates; -class Updates_2_15_0_b13 extends Updates +class Updates_2_15_0_b16 extends Updates { public function doUpdate(Updater $updater) diff --git a/core/Version.php b/core/Version.php index c9a04c200a..dd1ae538d2 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.15.0-b15'; + const VERSION = '2.15.0-b16'; public function isStableVersion($version) { |