diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
| commit | 32b29c9d735ae235641a7ea3869c14d7eb69cb4f (patch) | |
| tree | 63e4e269bd33b0688965c9b3b1059466a8f502b8 /apps/files/templates/part.list.php | |
| parent | 6de370b64cb8f7fcd9d3bd090b8d801d91d2fcca (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.tar.gz nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.zip | |
Merge branch 'master' into fix-7307
Conflicts:
core/js/router.js
settings/js/admin.js
Diffstat (limited to 'apps/files/templates/part.list.php')
| -rw-r--r-- | apps/files/templates/part.list.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index f4fb96a7a7c..8a7a1e370eb 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -17,7 +17,13 @@ $totalsize = 0; ?> data-mime="<?php p($file['mimetype'])?>" data-size="<?php p($file['size']);?>" data-etag="<?php p($file['etag']);?>" - data-permissions="<?php p($file['permissions']); ?>"> + data-permissions="<?php p($file['permissions']); ?>" + + <?php if(isset($file['displayname_owner'])): ?> + data-share-owner="<?php p($file['displayname_owner']) ?>" + <?php endif; ?> + > + <?php if(isset($file['isPreviewAvailable']) and $file['isPreviewAvailable']): ?> <td class="filename svg preview-icon" <?php else: ?> @@ -34,17 +40,15 @@ $totalsize = 0; ?> <span class="nametext"> <?php print_unescaped(htmlspecialchars($file['name']));?> </span> + <span class="uploadtext" currentUploads="0"> + </span> + </a> <?php else: ?> <a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>"> <label class="filetext" title="" for="select-<?php p($file['fileid']); ?>"></label> <span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span></span> </a> <?php endif; ?> - <?php if($file['type'] == 'dir'):?> - <span class="uploadtext" currentUploads="0"> - </span> - <?php endif;?> - </a> </td> <td class="filesize" style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)"> |