wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icons added; empty trash bin message added

Browse source
This commit is contained in:
Björn Schießle 2013-01-29 10:03:04 +01:00
parent 320233ec3d
commit d10e137939
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/js/filelist.js
View file

@ -292,7 +292,7 @@ var FileList={
procesSelection(); procesSelection();
} }
}); });
}, }
}; };
$(document).ready(function(){ $(document).ready(function(){

1
apps/files_trashbin/index.php
View file

@ -95,6 +95,7 @@ $list->assign('dirlisting', $dirlisting);
$list->assign('disableDownloadActions', true); $list->assign('disableDownloadActions', true);
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
$tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false);
$tmpl->assign('files', $files);
$tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath()));
$tmpl->printPage(); $tmpl->printPage();

2
apps/files_trashbin/js/trash.js
View file

@ -2,7 +2,7 @@
$(document).ready(function() { $(document).ready(function() {
if (typeof FileActions !== 'undefined') { if (typeof FileActions !== 'undefined') {
FileActions.register('all', 'Undelete', OC.PERMISSION_READ, '', function(filename) { FileActions.register('all', 'Undelete', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) {
var tr=$('tr').filterAttr('data-file', filename); var tr=$('tr').filterAttr('data-file', filename);
$.post(OC.filePath('files_trashbin','ajax','undelete.php'), $.post(OC.filePath('files_trashbin','ajax','undelete.php'),
{files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') },

2
apps/files_trashbin/lib/trash.php
View file

@ -54,7 +54,7 @@ class Trashbin {
self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view);
$query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
$result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
if ( \OCP\App::isEnabled('files_versions') ) { if ( \OCP\App::isEnabled('files_versions') ) {
if ( $view->is_dir('files_versions'.$file_path) ) { if ( $view->is_dir('files_versions'.$file_path) ) {

9
apps/files_trashbin/templates/index.php
View file

@ -5,8 +5,8 @@
</div> </div>
<div id='notification'></div> <div id='notification'></div>
<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?> <?php if (isset($_['files']) && count($_['files'])==0):?>
<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> <div id="emptyfolder"><?php echo $l->t('Nothing in here. Trash bin empty!')?></div>
<?php endif; ?> <?php endif; ?>
<table> <table>
@ -17,9 +17,8 @@
<span class='name'><?php echo $l->t( 'Name' ); ?></span> <span class='name'><?php echo $l->t( 'Name' ); ?></span>
<span class='selectedActions'> <span class='selectedActions'>
<a href="" class="undelete"> <a href="" class="undelete">
<!-- <img class="svg" alt="Undelete" <img class="svg" alt="Undelete"
src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /> src="<?php echo OCP\image_path("core", "actions/undelete.png"); ?>" />
-->
<?php echo $l->t('Undelete')?> <?php echo $l->t('Undelete')?>
</a> </a>
</span> </span>

BIN
core/img/actions/undelete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 680 B