diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-13 04:04:48 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-13 05:13:34 +0200 |
| commit | 4a5ee765cf5030c7d92d88687e886079f6bafb1e (patch) | |
| tree | 0b87acdf2f21f56dc1b97b063121899f3cae87bc /lib/app.php | |
| parent | 67156f87e3757fbd5e692e7d6b2209cfafc6c3cf (diff) | |
| download | nextcloud-server-4a5ee765cf5030c7d92d88687e886079f6bafb1e.tar.gz nextcloud-server-4a5ee765cf5030c7d92d88687e886079f6bafb1e.zip | |
merged admin, help and settings to settings
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/app.php b/lib/app.php index e7cf74af85c..e9f97a4354e 100644 --- a/lib/app.php +++ b/lib/app.php @@ -52,7 +52,7 @@ class OC_App{ } // Our very own core apps are hardcoded - foreach( array( 'admin', 'files', 'help', 'settings' ) as $app ){ + foreach( array('files', 'settings') as $app ){ require( $app.'/appinfo/app.php' ); } @@ -200,13 +200,13 @@ class OC_App{ public static function getSettingsNavigation(){ $l=new OC_L10N('core'); $admin=array( - array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.svg" )), - array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.svg" )), + array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )), + array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )), // array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "settings", "options.svg" )), ); $settings=array( - array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.svg" )), - array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) + array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )), + array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) ); if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){ $settings=array_merge($admin,$settings); |