summaryrefslogtreecommitdiffstats
path: root/apps/files/templates
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-11 23:57:59 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-11 23:57:59 +0100
commit7969d6e64617235744889df42d0e671085a779a8 (patch)
tree23733e41a7d58cb2903429e3dfb417327c39d835 /apps/files/templates
parentcc0a0df88b3b6fdd2b1f9c85349683eb640f9670 (diff)
parentf7f462f2733117cc2e3be0421e7ebca85bac1562 (diff)
downloadnextcloud-server-7969d6e64617235744889df42d0e671085a779a8.tar.gz
nextcloud-server-7969d6e64617235744889df42d0e671085a779a8.zip
Merge branch 'master' into filesystem
Diffstat (limited to 'apps/files/templates')
-rw-r--r--apps/files/templates/index.php27
1 files changed, 14 insertions, 13 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index de440a6f79c..bd34c9a76d9 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -3,7 +3,7 @@
<?php echo($_['breadcrumb']); ?>
<?php if ($_['isCreatable']):?>
<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
- <div id='new' class='button'>
+ <div id="new" class="button">
<a><?php echo $l->t('New');?></a>
<ul class="popup popupTop">
<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')"
@@ -14,7 +14,7 @@
data-type='web'><p><?php echo $l->t('From link');?></p></li>
</ul>
</div>
- <div class="file_upload_wrapper svg">
+ <div id="upload" class="button">
<form data-upload-id='1'
id="data-upload-form"
class="file_upload_form"
@@ -30,19 +30,20 @@
<input type="hidden" class="max_human_file_size"
value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
- <input class="file_upload_start" type="file" name='files[]'/>
- <a href="#" class="file_upload_button_wrapper" onclick="return false;"
- title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
- <button class="file_upload_filename"></button>
- <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
+ <input type="file" id="file_upload_start" name='files[]'/>
+ <a href="#" class="svg" onclick="return false;"
+ title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+
+ <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 id="uploadprogresswrapper">
+ <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>