show settings page in the correct context

This commit is contained in:
Robin Appelman 2011-08-08 21:51:10 +02:00
parent e6f6d3dabc
commit 5ecdd26902
6 changed files with 9 additions and 9 deletions

View File

@ -53,7 +53,7 @@ if($installed){
$records[]=$record;
}
$tmpl = new OC_Template( "admin", "appsinst", "admin" );
$tmpl = new OC_Template( "admin", "appsinst", "user" );
$tmpl->assign( "apps", $records );
$tmpl->printPage();
unset($tmpl);
@ -63,7 +63,7 @@ if($installed){
if($categories==NULL){
OC_App::setActiveNavigationEntry( "core_apps" );
$tmpl = new OC_Template( "admin", "app_noconn", "admin" );
$tmpl = new OC_Template( "admin", "app_noconn", "user" );
$tmpl->printPage();
unset($tmpl);
exit();
@ -82,7 +82,7 @@ if($installed){
}
// return template
$tmpl = new OC_Template( "admin", "apps", "admin" );
$tmpl = new OC_Template( "admin", "apps", "user" );
$tmpl->assign( "categories", $categories );
$tmpl->assign( "apps", $apps );
@ -94,7 +94,7 @@ if($installed){
$app=OC_OCSClient::getApplication($id);
$tmpl = new OC_Template( "admin", "app", "admin" );
$tmpl = new OC_Template( "admin", "app", "user" );
$tmpl->assign( "categories", $categories );
$tmpl->assign( "app", $app );
$tmpl->printPage();

View File

@ -29,7 +29,7 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
OC_App::setActiveNavigationEntry( "administration" );
$tmpl = new OC_Template( "admin", "system", "admin" );
$tmpl = new OC_Template( "admin", "system", "user" );
$tmpl->printPage();
?>

View File

@ -48,7 +48,7 @@ foreach( OC_Group::getGroups() as $i ){
$groups[] = array( "name" => $i );
}
$tmpl = new OC_Template( "admin", "users", "admin" );
$tmpl = new OC_Template( "admin", "users", "user" );
$tmpl->assign( "users", $users );
$tmpl->assign( "groups", $groups );
$tmpl->printPage();

View File

@ -42,7 +42,7 @@ if(isset($_POST['maxUploadSize'])){
OC_App::setActiveNavigationEntry( "files_administration" );
// return template
$tmpl = new OC_Template( "files", "admin", "admin" );
$tmpl = new OC_Template( "files", "admin", "user" );
$tmpl->assign( 'htaccessWorking', $htaccessWorking );
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
$tmpl->printPage();

View File

@ -18,7 +18,7 @@ OC_App::setActiveNavigationEntry( "help" );
$kbe=OC_OCSClient::getKnownledgebaseEntries();
$tmpl = new OC_Template( "help", "index", "admin" );
$tmpl = new OC_Template( "help", "index", "user" );
$tmpl->assign( "kbe", $kbe );
$tmpl->assign( "pagecount", $pagecount );
$tmpl->assign( "page", $page );

View File

@ -24,7 +24,7 @@ unset($languages[array_search($lang,$languages)]);
array_unshift($languages,$lang);
// Return template
$tmpl = new OC_Template( "settings", "index", "admin");
$tmpl = new OC_Template( "settings", "index", "user");
$tmpl->assign('usage',OC_Helper::humanFileSize($used));
$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
$tmpl->assign('usage_relative',$relative);