diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-03 15:59:17 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-03 15:59:17 +0100 |
| commit | e40be93e87e5a401039f0ce1a3e47e9a44635936 (patch) | |
| tree | 25a3cbe8b62447e9b0dde39590034f248981f561 /apps/files/templates | |
| parent | 6a6d6756b7a6495d044d44c8d6081505880d96b9 (diff) | |
| parent | b673748151b4e46b03592459f6eea4e250fc473a (diff) | |
| download | nextcloud-server-e40be93e87e5a401039f0ce1a3e47e9a44635936.tar.gz nextcloud-server-e40be93e87e5a401039f0ce1a3e47e9a44635936.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/admin.php | 5 | ||||
| -rw-r--r-- | apps/files/templates/part.breadcrumb.php | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 0de12edcba5..ad69b5519d9 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -6,7 +6,10 @@ <?php if($_['uploadChangable']):?> <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 if($_['displayMaxPossibleUploadSize']):?> + (<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>) + <?php endif;?> + <br/> <?php endif;?> <input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>" diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index f7b1a6076d8..a298f1ccc4b 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -1,6 +1,7 @@ <?php for($i=0; $i<count($_["breadcrumb"]); $i++): - $crumb = $_["breadcrumb"][$i]; - $dir = str_replace('+', '%20', urlencode($crumb["dir"])); ?> + $crumb = $_["breadcrumb"][$i]; + $dir = str_replace('+', '%20', urlencode($crumb["dir"])); + $dir = str_replace('%2F', '/', $dir); ?> <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $dir;?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'> |