mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show 'Apps' in the browser title when app management is open

This commit is contained in:
Thomas Müller 2015-09-23 15:00:58 +02:00
parent d54d9a573f
commit 2ea2ec0004
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/app.php
View File

@ -411,7 +411,7 @@ class OC_App {
/** /**
* Returns the Settings Navigation * Returns the Settings Navigation
* *
* @return string * @return string[]
* *
* This function returns an array containing all settings pages added. The * This function returns an array containing all settings pages added. The
* entries are sorted by the key 'order' ascending. * entries are sorted by the key 'order' ascending.

9
lib/private/templatelayout.php
View File

@ -116,9 +116,14 @@ class OC_TemplateLayout extends OC_Template {
} }
} }
$userDisplayName = OC_User::getDisplayName(); $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_displayname', $userDisplayName);
$this->assign('user_uid', OC_User::getUser()); $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('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
$this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser())); $this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser()));
} else if ($renderAs == 'error') { } else if ($renderAs == 'error') {
@ -148,7 +153,7 @@ class OC_TemplateLayout extends OC_Template {
} else { } else {
// Add the js files // Add the js files
$jsFiles = self::findJavascriptFiles(OC_Util::$scripts); $jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
$this->assign('jsfiles', array(), false); $this->assign('jsfiles', array());
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash))); $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
} }