diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
| commit | 2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9 (patch) | |
| tree | f25b463c90992764887416c3082098fed6ecac65 /apps/files/templates | |
| parent | 40f95ffdf3edf9ab45c15bd5b9018d7f4d92baa9 (diff) | |
| parent | 127796218314c6b1f19ba86f74caa913375aac8d (diff) | |
| download | nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.tar.gz nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/index.php | 5 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 3571950467e..fc385e1ed3a 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -22,6 +22,11 @@ <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> </form> </div> + <div id="upload"> + <div id="uploadprogressbar"></div> + <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Cancel upload');?>" onclick="javascript:Files.cancelUploads();" /> + </div> + </div> <div id="file_action_panel"></div> <?php else:?> diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 5a5941fc7ae..b2db4cbb8df 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -21,6 +21,10 @@ <?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span> <?php endif;?> </span> + <?php if($file['type'] == 'dir'):?> + <span class="uploadtext" currentUploads="0"> + </span> + <?php endif;?> </a> </td> <td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td> |