diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-29 10:55:44 +0100 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-29 10:55:44 +0100 |
commit | 13ed59c1cf2598f28c415c0c2459b5a4495ff5ef (patch) | |
tree | 890efcfe462f19468e2aa05ca1a22049edc21ab6 /apps/files/templates | |
parent | c767ebcc03c604f3141af4c286ad099fdf64c561 (diff) | |
parent | cf2c061f1f2577b3a995d9e2423c93589d7df2b3 (diff) | |
download | nextcloud-server-13ed59c1cf2598f28c415c0c2459b5a4495ff5ef.tar.gz nextcloud-server-13ed59c1cf2598f28c415c0c2459b5a4495ff5ef.zip |
merge master into mobile-style
Diffstat (limited to 'apps/files/templates')
-rw-r--r-- | apps/files/templates/admin.php | 2 | ||||
-rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 697fc52526a..a5afd55fbc3 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -5,7 +5,7 @@ <h2><?php p($l->t('File handling')); ?></h2> <?php if($_['uploadChangable']):?> <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label> - <input name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>'/> + <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>'/> <?php if($_['displayMaxPossibleUploadSize']):?> (<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) <?php endif;?> diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 5188ca56281..ff78f0ca551 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -29,7 +29,7 @@ <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="file" id="file_upload_start" name='files[]' data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" /> - <a href="#" class="svg"></a> + <a href="#" class="svg icon icon-upload"></a> </div> <?php if ($_['trash']): ?> <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?> /> |