diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-25 14:29:29 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-25 14:29:29 +0100 |
| commit | 7e36f730ecfe452681f44771b28d1d3c4a5535df (patch) | |
| tree | 578e604c170219151239e2da345d332b079ed920 /apps/files/templates | |
| parent | bf05ff351faa693337107ed4a316e36e9aacd296 (diff) | |
| parent | 5d59ac07391841677e204958ea20be3fe05cd8ef (diff) | |
| download | nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.tar.gz nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/admin.php | 6 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 66fec4cd536..0de12edcba5 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -15,11 +15,11 @@ <input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>" - <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /> - <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br /> + <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br /> + <em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br /> <input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" /> <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/> </fieldset> -</form>
\ No newline at end of file +</form> diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index bd34c9a76d9..edf048c7e13 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -5,7 +5,7 @@ <div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>"> <div id="new" class="button"> <a><?php echo $l->t('New');?></a> - <ul class="popup popupTop"> + <ul> <li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li> <li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')" |