aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/templates/index.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:34:36 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-30 00:34:36 +0200
commit7425efade78a04f20cb3cc83f964c6a00094b6ce (patch)
tree967aa50e8873c88f0adf6f91d0285ab1c54b7189 /apps/files/templates/index.php
parentb4a523927823ab8bc80c5f1fc0d5bd5ef61f8eb8 (diff)
parent7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff)
downloadnextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.tar.gz
nextcloud-server-7425efade78a04f20cb3cc83f964c6a00094b6ce.zip
Merge branch 'master' into oc_preview
Conflicts: 3rdparty lib/template.php
Diffstat (limited to 'apps/files/templates/index.php')
-rw-r--r--apps/files/templates/index.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index c6a4ad58e43..e4348904671 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -38,9 +38,7 @@
</form>
</div>
<?php if ($_['trash'] ): ?>
- <div id="trash" class="button">
- <a><?php p($l->t('Deleted files'));?></a>
- </div>
+ <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
<?php endif; ?>
<div id="uploadprogresswrapper">
<div id="uploadprogressbar"></div>
@@ -61,7 +59,7 @@
<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
<?php endif; ?>
-<table id="filestable">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
<thead>
<tr>
<th id='headerName'>
@@ -77,7 +75,7 @@
<?php endif; ?>
</span>
</th>
- <th id="headerSize"><?php p($l->t( 'Size' )); ?></th>
+ <th id="headerSize"><?php p($l->t('Size')); ?></th>
<th id="headerDate">
<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>