diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
| commit | de135e3b9bdcb58358b872003fd1e98f51554912 (patch) | |
| tree | c16b0beeb84a6835ff0ebce5d1be1a4d789e8a25 /files/templates/index.php | |
| parent | 9d91e53027e0a0c64f36a7eb5812dbe70c6dfaa7 (diff) | |
| parent | 965a8ba2c60eb04e2f65a4ace215113ac61f7c98 (diff) | |
| download | nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.tar.gz nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.zip | |
resolve merge conflicts
Diffstat (limited to 'files/templates/index.php')
| -rw-r--r-- | files/templates/index.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/files/templates/index.php b/files/templates/index.php index b21cf0aeb02..3c76eb0187d 100644 --- a/files/templates/index.php +++ b/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:?> |