Everything nice and active now

6 files changed, 12 insertions, 74 deletions

diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 40d8b9188ec..ffe941552b8 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -2,12 +2,12 @@
 
 OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
 
-OC_APP::addAdminPage( array( "id" => "core_system", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_users", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 5, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "navicon.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" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some&parameters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
 
 ?>
diff --git a/admin/apps.php b/admin/apps.php
index 1b777bc246c..7ce3f4c419f 100644
--- a/admin/apps.php
+++ b/admin/apps.php
@@ -51,11 +51,13 @@ print_r($value);
 
 */
 
+// OC_APP::setActiveNavigationEntry( "core_apps_installed" );
 
 
 if($id==0) {
+	OC_APP::setActiveNavigationEntry( "core_apps" );
 
-        if($cat==0){
+	if($cat==0){
 		$numcats=array();
 		foreach($categories as $key=>$value) $numcats[]=$key;
 		$apps=OC_OCSCLIENT::getApplications($numcats);
@@ -72,6 +74,7 @@ if($id==0) {
 	unset($tmpl);
 
 }else{
+	OC_APP::setActiveNavigationEntry( "core_apps" );
 
 	$app=OC_OCSCLIENT::getApplication($id);
 
diff --git a/admin/index.php b/admin/index.php
deleted file mode 100644
index 80e70d13f9a..00000000000
--- a/admin/index.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-require_once('../lib/base.php');
-require( 'template.php' );
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
-	header( "Location: ".OC_HELPER::linkTo( "","index.php" ));
-	exit();
-}
-
-$apppages = array();
-$syspages = array();
-
-foreach( OC_APP::getAdminPages() as $i ){
-	if( substr( $i["id"], 0, 5 ) == "core_" ){
-		$syspages[] = $i;
-	}
-	else{
-		$apppages[] = $i;
-	}
-}
-
-$tmpl = new OC_TEMPLATE( "admin", "index", "admin" );
-$tmpl->assign( "apppages", $apppages );
-$tmpl->assign( "syspages", $syspages );
-$tmpl->printPage();
-
-?>
-
diff --git a/admin/plugins.php b/admin/plugins.php
index 60d23585a4f..fd1933a7fa1 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -28,6 +28,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 	exit();
 }
 
+OC_APP::setActiveNavigationEntry( "core_plugins" );
 $plugins=array();
 $blacklist=OC_PLUGIN::loadBlackList();
 
diff --git a/admin/system.php b/admin/system.php
index de62b133f85..310979295f0 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -28,6 +28,8 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 	exit();
 }
 
+OC_APP::setActiveNavigationEntry( "administration" );
+
 $tmpl = new OC_TEMPLATE( "admin", "system", "admin" );
 $tmpl->printPage();
 
diff --git a/admin/templates/index.php b/admin/templates/index.php
deleted file mode 100644
index fa32a67eadb..00000000000
--- a/admin/templates/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * Template for admin pages
- */
-?>
-<h1>Administration</h1>
-
-<h2>System</h2>
-<ul>
-	<?php foreach($_["syspages"] as $i): ?>
-		<li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li>
-	<?php endforeach; ?>
-</ul>
-<h2>Applications</h2>
-<ul>
-	<?php foreach($_["apppages"] as $i): ?>
-		<li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li>
-	<?php endforeach; ?>
-</ul>