diff options
author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
---|---|---|
committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
commit | 4c2cf35050032002d01978f53201723330ebfe16 (patch) | |
tree | cb931972aae1381d0d46aa934fa56f462e4c873a /apps/files/templates | |
parent | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff) | |
parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
download | nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip |
fix merge conflicts
Diffstat (limited to 'apps/files/templates')
-rw-r--r-- | apps/files/templates/admin.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 9bcc40e9361..01fe1105260 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -7,9 +7,13 @@ <label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/> <?php endif;?> <input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/> - <fieldset class="personalblock"> - <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files:' ); ?> </label><input name="maxZipInputSize" id="maxZipInputSize" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /><br/> - </fieldset> + + <input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /> + <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br /> + <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/> </fieldset> </form> + + + |