diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-05-08 19:00:42 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-05-15 17:51:04 +0200 |
| commit | fb10bf4048aaf5b2a9665fc9dff217c790efe005 (patch) | |
| tree | 9d65596c49ecb78d828c8b2fc661f46424c2965d /apps/files_trashbin | |
| parent | 88ebb15f1d91b82022e02903ab73338065e223b9 (diff) | |
| download | nextcloud-server-fb10bf4048aaf5b2a9665fc9dff217c790efe005.tar.gz nextcloud-server-fb10bf4048aaf5b2a9665fc9dff217c790efe005.zip | |
Files app navigation can now switch
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
due to overrides
- added app.js as entry point for JS code (ideally all other files should
only contain classes and not trigger anything)
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/appinfo/app.php | 1 | ||||
| -rw-r--r-- | apps/files_trashbin/index.php | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index a045b1f0f51..219c5d6cb7e 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -6,6 +6,7 @@ $l = OC_L10N::get('files_trashbin'); \OCA\Files\App::getNavigationManager()->add( array( + "id" => 'trashbin', "appname" => 'files_trashbin', "script" => 'index.php', "order" => 1, diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 59258a6cf16..4c5527822fb 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -3,12 +3,14 @@ // Check if we are a user OCP\User::checkLoggedIn(); -OCP\Util::addScript('files_trashbin', 'disableDefaultActions'); $tmpl = new OCP\Template('files_trashbin', 'index', ''); - +// TODO: re-enable after making sure the scripts doesn't +// override the files app +/* +OCP\Util::addScript('files_trashbin', 'disableDefaultActions'); OCP\Util::addStyle('files_trashbin', 'trash'); OCP\Util::addScript('files_trashbin', 'filelist'); OCP\Util::addScript('files_trashbin', 'trash'); - + */ $tmpl->printPage(); |