Skip to content
Snippets Groups Projects
Commit 223adc31 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge pull request #5230 from owncloud/trashbin_fixes

Trashbin fixes
parents 45510f2f 7ab4fef7
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,6 @@ OCP\User::checkLoggedIn(); ...@@ -5,7 +5,6 @@ OCP\User::checkLoggedIn();
OCP\App::setActiveNavigationEntry('files_index'); OCP\App::setActiveNavigationEntry('files_index');
OCP\Util::addScript('files_trashbin', 'trash');
OCP\Util::addScript('files_trashbin', 'disableDefaultActions'); OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
OCP\Util::addScript('files', 'fileactions'); OCP\Util::addScript('files', 'fileactions');
$tmpl = new OCP\Template('files_trashbin', 'index', 'user'); $tmpl = new OCP\Template('files_trashbin', 'index', 'user');
...@@ -15,6 +14,7 @@ OCP\Util::addScript('files', 'filelist'); ...@@ -15,6 +14,7 @@ OCP\Util::addScript('files', 'filelist');
// filelist overrides // filelist overrides
OCP\Util::addScript('files_trashbin', 'filelist'); OCP\Util::addScript('files_trashbin', 'filelist');
OCP\Util::addscript('files', 'files'); OCP\Util::addscript('files', 'files');
OCP\Util::addScript('files_trashbin', 'trash');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
<thead> <thead>
<tr> <tr>
<th id='headerName'> <th id='headerName'>
<div id="headerName-container">
<input type="checkbox" id="select_all" /> <input type="checkbox" id="select_all" />
<label for="select_all"></label>
<span class='name'><?php p($l->t( 'Name' )); ?></span> <span class='name'><?php p($l->t( 'Name' )); ?></span>
<span class='selectedActions'> <span class='selectedActions'>
<a href="" class="undelete"> <a href="" class="undelete">
...@@ -26,6 +28,7 @@ ...@@ -26,6 +28,7 @@
<?php p($l->t('Restore'))?> <?php p($l->t('Restore'))?>
</a> </a>
</span> </span>
</div>
</th> </th>
<th id="headerDate"> <th id="headerDate">
<span id="modified"><?php p($l->t( 'Deleted' )); ?></span> <span id="modified"><?php p($l->t( 'Deleted' )); ?></span>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment