diff options
| author | Dawid Opis <ncore@ncore.com.pl> | 2011-08-11 22:29:48 +0200 |
|---|---|---|
| committer | Dawid Opis <ncore@ncore.com.pl> | 2011-08-11 22:29:48 +0200 |
| commit | 11b3c10cc61b42174c3f3bc46276c59135dff856 (patch) | |
| tree | 40912e1a8326b9f13eb132ba0fa6ba3b093279dd /files | |
| parent | 9683d44633cd24696573a0c3ca193a3b5d06f1b7 (diff) | |
| parent | ce9b36fd3ed2f229886abe32b84698733321d399 (diff) | |
| download | nextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.tar.gz nextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.zip | |
resolved merge conflicts
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 2 | ||||
| -rw-r--r-- | files/templates/index.php | 7 | ||||
| -rw-r--r-- | files/templates/part.list.php | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/files/css/files.css b/files/css/files.css index 2e96e113f1f..e0282d2ce05 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -21,6 +21,8 @@ .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;} .file_upload_filename { z-index:100; cursor:pointer;} +.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; } + /* FILE TABLE */ span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } table { position:relative; top:37px; width:100%; } diff --git a/files/templates/index.php b/files/templates/index.php index 4d0212896a0..a2cf037c756 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -5,15 +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'];?>)"/> + <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 34d727dde2f..942f749c828 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -7,9 +7,9 @@ $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 svg" 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=""> + <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"> <?php if($file['type'] == 'dir'):?> <?php echo htmlspecialchars($file['name']);?> |