summaryrefslogtreecommitdiffstats
path: root/files/templates
diff options
context:
space:
mode:
authorMichael Gapczynski <GapczynskiM@gmail.com>2011-08-11 17:42:37 -0400
committerMichael Gapczynski <GapczynskiM@gmail.com>2011-08-11 17:42:37 -0400
commit4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5 (patch)
tree1d6c150ca0c725abb854afc2ab76422ebdcd4d85 /files/templates
parent9e35d5a886b192b1ab3e19ca0e1b9608a39d60ac (diff)
parent52df7accfd1a1a8f4ac35d29e00d60961469c063 (diff)
downloadnextcloud-server-4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5.tar.gz
nextcloud-server-4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5.zip
Merge branch 'master' into sharing
Conflicts: .gitignore
Diffstat (limited to 'files/templates')
-rw-r--r--files/templates/index.php10
-rw-r--r--files/templates/part.list.php2
2 files changed, 7 insertions, 5 deletions
diff --git a/files/templates/index.php b/files/templates/index.php
index 137c5ce5922..008051492d0 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -5,14 +5,16 @@
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
- <div class="file_upload_wrapper">
- <input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');?> (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
- <input class="file_upload_start" type="file" name='files[]'/>
+ <div class="file_upload_wrapper" class="svg">
+ <input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');
+ if($_['uploadMaxFilesize']<(10000000000)){echo ' (max. '.$_['uploadMaxHumanFilesize'].')';}?>"/>
+ <input id="file_upload_start" class="file_upload_start" type="file" name='files[]'/>
+ <a href="#" id="file_upload_button_wrapper" onclick="return false;"></a>
</div>
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
</form>
<form id="file_newfolder_form">
- <input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" />
+ <input class="svg" type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" />
</form>
</div>
<div id="file_action_panel">
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 8b3823f391b..942f749c828 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -7,7 +7,7 @@
$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
if($relative_date_color>200) $relative_date_color = 200; ?>
<tr data-file="<?php echo $file['name'];?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
- <td class="filename" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
+ <td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
<input type="checkbox" />
<a class="name" href="<?php if($file['type'] == 'dir') echo link_to('files', 'index.php?dir='.$file['directory'].'/'.$file['name']); else echo link_to('files', 'download.php?file='.$file['directory'].'/'.$file['name']); ?>" title="">
<span class="nametext">