diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-09-23 15:37:07 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-09-23 15:37:07 +0200 |
| commit | 1c052d554bd09a7d14117971b21e69092f7a1416 (patch) | |
| tree | a1c7230f0a1c9d24ba0f0c54874d0748ea591345 | |
| parent | d54d9a573fac498c4aaeea0df832a204cf525b58 (diff) | |
| parent | 2ea2ec00040a9f42d11213c4baa0118ea702b995 (diff) | |
| download | nextcloud-server-1c052d554bd09a7d14117971b21e69092f7a1416.tar.gz nextcloud-server-1c052d554bd09a7d14117971b21e69092f7a1416.zip | |
Merge pull request #19308 from owncloud/fix-title
Show 'Apps' in the browser title when app management is open
| -rw-r--r-- | lib/private/app.php | 2 | ||||
| -rw-r--r-- | lib/private/templatelayout.php | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 6c9f7615228..26d51947642 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -411,7 +411,7 @@ class OC_App { /** * Returns the Settings Navigation * - * @return string + * @return string[] * * This function returns an array containing all settings pages added. The * entries are sorted by the key 'order' ascending. diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 93bf6cbd307..ae3c1093b20 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -116,9 +116,14 @@ class OC_TemplateLayout extends OC_Template { } } $userDisplayName = OC_User::getDisplayName(); + $appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0; + if ($appsMgmtActive) { + $l = \OC::$server->getL10N('lib'); + $this->assign('application', $l->t('Apps')); + } $this->assign('user_displayname', $userDisplayName); $this->assign('user_uid', OC_User::getUser()); - $this->assign('appsmanagement_active', strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0 ); + $this->assign('appsmanagement_active', $appsMgmtActive); $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true)); $this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser())); } else if ($renderAs == 'error') { @@ -148,7 +153,7 @@ class OC_TemplateLayout extends OC_Template { } else { // Add the js files $jsFiles = self::findJavascriptFiles(OC_Util::$scripts); - $this->assign('jsfiles', array(), false); + $this->assign('jsfiles', array()); if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash))); } |