diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
| commit | 11d162751381963e0c8a86cf15c811cc99003654 (patch) | |
| tree | 276b5b1e67a66491ef553346087b2959f35b3bc7 /files/templates | |
| parent | d13ba0ee2d93080ba56776442b9d39a53e2b6321 (diff) | |
| parent | d6faa89ed720da7319923cba33a83d0210216d57 (diff) | |
| download | nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.tar.gz nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.zip | |
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
lib/base.php
Diffstat (limited to 'files/templates')
| -rw-r--r-- | files/templates/admin.php | 2 | ||||
| -rw-r--r-- | files/templates/part.list.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/files/templates/admin.php b/files/templates/admin.php index 40880d34911..e0cf2608301 100644 --- a/files/templates/admin.php +++ b/files/templates/admin.php @@ -1,4 +1,4 @@ -<?php OC_UTIL::addScript('files','admin'); ?> +<?php OC_Util::addScript('files','admin'); ?> <form name="filesForm" action='#' method='post'> <?php if($_['htaccessWorking']):?> diff --git a/files/templates/part.list.php b/files/templates/part.list.php index d249455c55c..93ed70990b7 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -1,10 +1,10 @@ - <?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!</span><style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style>'; - foreach($_['files'] as $file): + <span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>>Nothing in here. Upload something!</span> + <?php foreach($_['files'] as $file): $simple_file_size = simple_file_size($file['size']); - $simple_size_color = 200-intval($file['size']/(1024*1024)*5); + $simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2 if($simple_size_color<0) $simple_size_color = 0; $relative_modified_date = relative_modified_date($file['mtime']); - $relative_date_color = round((time()-$file['mtime'])/60/60/24*7); //days ago + $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"> |