diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-15 20:35:15 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-22 15:32:57 +0100 |
| commit | 9d77317de82cb5ea3e3e8e2a3d13122134e0ca0c (patch) | |
| tree | 531989dc911eac1206456c2209ea392d48588bef | |
| parent | dd40b691eee34d313a5894afbc7ccf217968fd94 (diff) | |
| download | nextcloud-server-9d77317de82cb5ea3e3e8e2a3d13122134e0ca0c.tar.gz nextcloud-server-9d77317de82cb5ea3e3e8e2a3d13122134e0ca0c.zip | |
add trash button to web interface
| -rw-r--r-- | apps/files/css/files.css | 4 | ||||
| -rw-r--r-- | apps/files/index.php | 1 | ||||
| -rw-r--r-- | apps/files/js/files.js | 5 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 6 |
4 files changed, 14 insertions, 2 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 0c97b009b88..f9406f58652 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -23,7 +23,9 @@ #new>ul>li>p { cursor:pointer; } #new>ul>li>form>input { padding:0.3em; margin:-0.3em; } -#upload { +#trash { height:17px; margin:0 0 0 1em; z-index:1010; position:absolute; right:13.5em; } + +#upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; } #upload a { diff --git a/apps/files/index.php b/apps/files/index.php index 1c4b7fbd497..8861be72283 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -100,6 +100,7 @@ $tmpl->assign('dir', OC_Filesystem::normalizePath($dir)); $tmpl->assign('isCreatable', OC_Filesystem::isCreatable($dir . '/')); $tmpl->assign('permissions', $permissions); $tmpl->assign('files', $files); +$tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin')); $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index c1abe205151..9f5169fea58 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -99,6 +99,11 @@ $(document).ready(function() { $(this).parent().children('#file_upload_start').trigger('click'); return false; }); + + // Show Trash bin + $('#trash a').live('click', function() { + console.log("hello"); + }); var lastChecked; diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 2e0772443f2..f6b4c29d5a2 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -35,6 +35,11 @@ <a href="#" class="svg" onclick="return false;"></a> </form> </div> + <?php if ($_['trash'] ): ?> + <div id="trash" class="button"> + <a><?php echo $l->t('Trash');?></a> + </div> + <?php endif; ?> <div id="uploadprogresswrapper"> <div id="uploadprogressbar"></div> <input type="button" class="stop" style="display:none" @@ -42,7 +47,6 @@ onclick="javascript:Files.cancelUploads();" /> </div> - </div> <div id="file_action_panel"></div> <?php else:?> |