diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-02 23:33:50 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-02 23:33:50 +0200 |
| commit | 9c23c3449b8f9c9d847a64c9a2c7127b87054c7c (patch) | |
| tree | 60f2d7e76ee2fd11bf1dabec1b7243a3d8349448 /apps/files/templates | |
| parent | 8b08b1b455b474de3fa376dfafa3de63727364ea (diff) | |
| parent | de175a4b0f0971c9cbbf912bbc3fd8cbc190b53d (diff) | |
| download | nextcloud-server-9c23c3449b8f9c9d847a64c9a2c7127b87054c7c.tar.gz nextcloud-server-9c23c3449b8f9c9d847a64c9a2c7127b87054c7c.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
core/css/share.css
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/index.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 35077e7dc1a..e578a1f563c 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -9,7 +9,7 @@ data-type='file'><p><?php p($l->t('Text file'));?></p></li> <li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')" data-type='folder'><p><?php p($l->t('Folder'));?></p></li> - <li style="background-image:url('<?php p(OCP\image_path('core', 'filetypes/web.svg')) ?>')" + <li style="background-image:url('<?php p(OCP\image_path('core', 'places/link.svg')) ?>')" data-type='web'><p><?php p($l->t('From link'));?></p></li> </ul> </div> diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 1e4d4d11c98..0679da334de 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -30,16 +30,15 @@ $totalsize = 0; ?> <?php endif; ?> <?php if($file['type'] == 'dir'): ?> <a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title=""> + <span class="nametext"> + <?php print_unescaped(htmlspecialchars($file['name']));?> + </span> <?php else: ?> - <a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title=""> + <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> + </a> <?php endif; ?> - <span class="nametext"> - <?php if($file['type'] == 'dir'):?> - <?php print_unescaped(htmlspecialchars($file['name']));?> - <?php else:?> - <?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span> - <?php endif;?> - </span> <?php if($file['type'] == 'dir'):?> <span class="uploadtext" currentUploads="0"> </span> |