diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-11-02 13:36:01 +0100 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-11-02 13:36:01 +0100 |
commit | b05666219e43e59cfeab13a53b992cf71ad8bfad (patch) | |
tree | 2478c4be6b436a8dc3afae2b706f817d83db526f /apps/files/templates | |
parent | 01bd0efc36d2557196444a382ae701b4da8c4dd9 (diff) | |
parent | d9e97610999ddf9f3a060b786f22d0abb054521e (diff) | |
download | nextcloud-server-b05666219e43e59cfeab13a53b992cf71ad8bfad.tar.gz nextcloud-server-b05666219e43e59cfeab13a53b992cf71ad8bfad.zip |
Merge branch 'master' into navigation
Diffstat (limited to 'apps/files/templates')
-rw-r--r-- | apps/files/templates/admin.php | 1 | ||||
-rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index c4fe4c86569..5869ed21072 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -11,6 +11,7 @@ <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="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" /> <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/> </fieldset> </form> diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index f614f02b6c2..7cdff024ddf 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -8,7 +8,7 @@ <ul class="popup popupTop"> <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') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li> - <li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From url');?></p></li> + <li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li> </ul> </div> <div class="file_upload_wrapper svg"> |