diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-05-16 13:00:35 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-05-16 13:00:35 +0200 |
| commit | 1fb0d5412c7a4a3b888098e492342699d05fe55e (patch) | |
| tree | 436bab2e329cf0e3ff2080a4227338c131f85b57 /lib | |
| parent | 43d6650d194105dac30b11fb2ba4a3b3c7805650 (diff) | |
| parent | 6fd084243b65a556d4775209ba3916145ef5912a (diff) | |
| download | nextcloud-server-1fb0d5412c7a4a3b888098e492342699d05fe55e.tar.gz nextcloud-server-1fb0d5412c7a4a3b888098e492342699d05fe55e.zip | |
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
Files app navigation sidebar
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/template.php | 4 | ||||
| -rw-r--r-- | lib/private/templatelayout.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/template.php b/lib/private/template.php index 3d18b52bac9..dfeb5d14b08 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -30,6 +30,7 @@ class OC_Template extends \OC\Template\Base { private $renderas; // Create a full page? private $path; // The path to the template private $headers=array(); //custom headers + protected $app; // app id /** * @brief Constructor @@ -62,6 +63,7 @@ class OC_Template extends \OC\Template\Base { // Set the private data $this->renderas = $renderas; $this->path = $path; + $this->app = $app; parent::__construct($template, $requesttoken, $l10n, $themeDefaults); } @@ -172,7 +174,7 @@ class OC_Template extends \OC\Template\Base { $data = parent::fetchPage(); if( $this->renderas ) { - $page = new OC_TemplateLayout($this->renderas); + $page = new OC_TemplateLayout($this->renderas, $this->app); // Add custom headers $page->assign('headers', $this->headers, false); diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 0672ffc4a3d..a5dd9a0c614 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -15,8 +15,9 @@ class OC_TemplateLayout extends OC_Template { /** * @param string $renderas + * @param string $appid application id */ - public function __construct( $renderas ) { + public function __construct( $renderas, $appid = '' ) { // Decide which page we show if( $renderas == 'user' ) { @@ -43,6 +44,7 @@ class OC_TemplateLayout extends OC_Template { // Add navigation entry $this->assign( 'application', '', false ); + $this->assign( 'appid', $appid ); $navigation = OC_App::getNavigation(); $this->assign( 'navigation', $navigation); $this->assign( 'settingsnavigation', OC_App::getSettingsNavigation()); |