wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1

Browse source
This commit is contained in:
Vincent Petry 2014-02-20 14:49:54 +01:00
commit 6cf83de60e
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apps/files/js/filelist.js
View file

@ -18,6 +18,15 @@ window.FileList={
$(this).attr('data-file',decodeURIComponent($(this).attr('data-file'))); $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
}); });
}, },
/**
* Sets a new page title
*/
setPageTitle: function(title){
// Sets the page title with the " - ownCloud" suffix as in templates
window.document.title = title + ' - ' + oc_defaults.title;
return true;
},
/** /**
* Returns the tr element for a given file name * Returns the tr element for a given file name
*/ */
@ -186,12 +195,22 @@ window.FileList={
changeDirectory: function(targetDir, changeUrl, force) { changeDirectory: function(targetDir, changeUrl, force) {
var $dir = $('#dir'), var $dir = $('#dir'),
url, url,
currentDir = $dir.val() || '/'; currentDir = $dir.val() || '/',
baseDir = OC.basename(targetDir),
targetDir = targetDir || '/'; targetDir = targetDir || '/';
if (!force && currentDir === targetDir) { if (!force && currentDir === targetDir) {
return; return;
} }
if (baseDir !== '') {
FileList.setPageTitle(baseDir);
}
else {
FileList.setPageTitle(t('files', 'Files'));
}
FileList.setCurrentDir(targetDir, changeUrl); FileList.setCurrentDir(targetDir, changeUrl);
$('#fileList').trigger( $('#fileList').trigger(
jQuery.Event('changeDirectory', { jQuery.Event('changeDirectory', {
dir: targetDir, dir: targetDir,
@ -847,7 +866,8 @@ window.FileList={
}; };
$(document).ready(function() { $(document).ready(function() {
var isPublic = !!$('#isPublic').val(); var baseDir,
isPublic = !!$('#isPublic').val();
// handle upload events // handle upload events
var file_upload_start = $('#file_upload_start'); var file_upload_start = $('#file_upload_start');
@ -1131,6 +1151,14 @@ $(document).ready(function() {
FileList.changeDirectory(parseCurrentDirFromUrl(), false, true); FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
} }
} }
baseDir = OC.basename(parseCurrentDirFromUrl());
if (baseDir !== '') {
FileList.setPageTitle(baseDir);
}
FileList.createFileSummary(); FileList.createFileSummary();
}); });

17
core/js/config.php
View file

@ -16,6 +16,9 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
// Enable l10n support // Enable l10n support
$l = OC_L10N::get('core'); $l = OC_L10N::get('core');
// Enable OC_Defaults support
$defaults = new OC_Defaults();
// Get the config // Get the config
$apps_paths = array(); $apps_paths = array();
foreach(OC_App::getEnabledApps() as $app) { foreach(OC_App::getEnabledApps() as $app) {
@ -60,6 +63,20 @@ $array = array(
'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')),
'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true) 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true)
) )
),
"oc_defaults" => json_encode(
array(
'entity' => $defaults->getEntity(),
'name' => $defaults->getName(),
'title' => $defaults->getTitle(),
'baseUrl' => $defaults->getBaseUrl(),
'syncClientUrl' => $defaults->getSyncClientUrl(),
'docBaseUrl' => $defaults->getDocBaseUrl(),
'slogan' => $defaults->getSlogan(),
'logoClaim' => $defaults->getLogoClaim(),
'shortFooter' => $defaults->getShortFooter(),
'longFooter' => $defaults->getLongFooter()
)
) )
); );