Skip to content
Snippets Groups Projects
Commit a471d40c authored by Robin Appelman's avatar Robin Appelman
Browse files

Show installed apps as default for the apps entry on the settings page.

Installing new apps is moved to the subentry
parent 9a989a28
No related branches found
No related tags found
No related merge requests found
......@@ -4,9 +4,9 @@ OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administratio
OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
// Add subentries for App installer
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
?>
......@@ -44,7 +44,7 @@ if($installed){
$apps = OC_APPCONFIG::getApps();
$records = array();
OC_APP::setActiveNavigationEntry( "core_apps_installed" );
OC_APP::setActiveNavigationEntry( "core_apps" );
foreach($apps as $app){
$info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
$record = array( 'id' => $app,
......@@ -61,7 +61,6 @@ if($installed){
unset($tmpl);
exit();
}else{
$categories=OC_OCSCLIENT::getCategories();
if($categories==NULL){
OC_APP::setActiveNavigationEntry( "core_apps" );
......@@ -74,7 +73,7 @@ if($installed){
if($id==0) {
OC_APP::setActiveNavigationEntry( "core_apps" );
OC_APP::setActiveNavigationEntry( "core_apps_get" );
if($cat==0){
$numcats=array();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment