diff options
| author | François KUBLER <francois@kubler.org> | 2011-03-09 22:46:17 +0100 |
|---|---|---|
| committer | François KUBLER <francois@kubler.org> | 2011-03-09 22:46:17 +0100 |
| commit | 7faf852561d3aca1cd1f62858d03d5b3daf888f9 (patch) | |
| tree | fb4fcaf5ff77085073f003f59778577373638af9 /admin | |
| parent | bf815b33908394fcda4fb6cb987caaca58b20fd0 (diff) | |
| parent | ab22dfde8a2b34b14c8024d68a16131fc7deefa5 (diff) | |
| download | nextcloud-server-7faf852561d3aca1cd1f62858d03d5b3daf888f9.tar.gz nextcloud-server-7faf852561d3aca1cd1f62858d03d5b3daf888f9.zip | |
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
Conflicts:
admin/templates/index.php
templates/layout.admin.php
templates/layout.user.php
All conflicts are fixed.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/appinfo.php | 12 | ||||
| -rw-r--r-- | admin/appinfo/app.php | 12 | ||||
| -rw-r--r-- | admin/img/navicon.png | bin | 0 -> 874 bytes | |||
| -rw-r--r-- | admin/templates/index.php | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/admin/appinfo.php b/admin/appinfo.php deleted file mode 100644 index 0b2e4dbf85d..00000000000 --- a/admin/appinfo.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php - -OC_UTIL::addApplication( array( "id" => "admin", "name" => "Administration" )); -if( OC_USER::ingroup( $_SESSION['username'], 'admin' )) -{ - OC_UTIL::addNavigationEntry( array( "app" => "admin", "file" => "index.php", "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" )); - -?> diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php new file mode 100644 index 00000000000..3221e276c5f --- /dev/null +++ b/admin/appinfo/app.php @@ -0,0 +1,12 @@ +<?php + +OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); +if( OC_USER::ingroup( $_SESSION['username'], 'admin' )) +{ + 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( "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 Binary files differnew file mode 100644 index 00000000000..f2c7c0867f6 --- /dev/null +++ b/admin/img/navicon.png diff --git a/admin/templates/index.php b/admin/templates/index.php index 2ca7b0b2d3b..9d0ffd84c61 100644 --- a/admin/templates/index.php +++ b/admin/templates/index.php @@ -7,6 +7,6 @@ <ul> <?php foreach($_["adminpages"] as $i): ?> - <li><a href="<?php echo link_to($i["app"], $i["file"]); ?>"><?php echo $i["name"]; ?></a></li> + <li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li> <?php endforeach; ?> </ul> |
