summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorJakob Sack <kde@jakobsack.de>2011-03-03 23:08:11 +0100
committerJakob Sack <kde@jakobsack.de>2011-03-03 23:08:11 +0100
commitf7f957abb92e5ce359d7eafa136406822fee0a51 (patch)
tree3e101065ee9f29335ffbc8ab48253237eb6c441d /admin
parentae5dc3efdffef75c48e5ef7cac6b40cd5720442b (diff)
downloadnextcloud-server-f7f957abb92e5ce359d7eafa136406822fee0a51.tar.gz
nextcloud-server-f7f957abb92e5ce359d7eafa136406822fee0a51.zip
Base for a more flexible navigation
Diffstat (limited to 'admin')
-rw-r--r--admin/appinfo/app.php10
-rw-r--r--admin/img/navicon.pngbin0 -> 874 bytes
-rw-r--r--admin/index.php2
-rw-r--r--admin/templates/index.php2
4 files changed, 7 insertions, 7 deletions
diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index befe8e678f0..3221e276c5f 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -1,12 +1,12 @@
<?php
-OC_APP::register( array( "id" => "admin", "name" => "Administration" ));
+OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
if( OC_USER::ingroup( $_SESSION['username'], 'admin' ))
{
- OC_UTIL::addNavigationEntry( array( "app" => "admin", "file" => "index.php", "name" => "Administration" ));
+ OC_UTIL::addNavigationEntry( array( "id" => "admin_index", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "index.php" ), "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ), "name" => "Administration" ));
}
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "system.php", "name" => "System Settings" ));
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "users.php", "name" => "Users" ));
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "plugins.php", "name" => "Plugins" ));
+OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings" ));
+OC_UTIL::addAdminPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users" ));
+OC_UTIL::addAdminPage( array( "order" => 3, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins" ));
?>
diff --git a/admin/img/navicon.png b/admin/img/navicon.png
new file mode 100644
index 00000000000..f2c7c0867f6
--- /dev/null
+++ b/admin/img/navicon.png
Binary files differ
diff --git a/admin/index.php b/admin/index.php
index 96fa2007244..cfcb70d056b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,7 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin'
$adminpages = array();
-foreach( OC_APP::list() as $i ){
+foreach( OC_UTIL::$adminpages as $i ){
// Do some more work here soon
$adminpages[] = $i;
}
diff --git a/admin/templates/index.php b/admin/templates/index.php
index 56f85cbbbc5..f13d5634eac 100644
--- a/admin/templates/index.php
+++ b/admin/templates/index.php
@@ -7,6 +7,6 @@
<ul>
<? foreach( $_["adminpages"] as $i ){ ?>
- <li><a href="<? echo link_to( $i["app"], $i["file"] ) ?>"><? echo $i["name"] ?></a></li>
+ <li><a href="<? echo $i["href"] ?>"><? echo $i["name"] ?></a></li>
<? } ?>
</ul>