add trash button to web interface

remotes/origin/stable5
Björn Schießle 12 years ago
parent fa78fbe0c3
commit 73d45e79a7
  1. 2
      apps/files/css/files.css
  2. 1
      apps/files/index.php
  3. 5
      apps/files/js/files.js
  4. 6
      apps/files/templates/index.php

@ -23,6 +23,8 @@
#new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
#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;
}

@ -105,6 +105,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)));

@ -82,6 +82,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;

@ -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:?>

Loading…
Cancel
Save