ソースを参照

fixed file size in TableAjax - use V::humanFileSize($bytes)

Piotr Labudda 9 年 前
コミット
a86b483604
1 ファイル変更8 行追加18 行削除
  1. 8 18
      SE/se-lib/TableAjax.php

+ 8 - 18
SE/se-lib/TableAjax.php

@@ -5079,12 +5079,7 @@ jQuery(document).ready(function(){
 			//$file->name = explode('/', $vFilePath);
 			//$file->name = explode('/', $vFilePath);
 			//$file->name = end($file->name);
 			//$file->name = end($file->name);
 			$file->size = filesize($vFilePath);
 			$file->size = filesize($vFilePath);
-			$file->sizeStr = round($file->size, 2) . "B";
-			if ($file->size > 1024 * 1024) {
-				$file->sizeStr = round(($file->size / (1024 * 1024)), 2) . "M";
-			} else if ($file->size > 1024) {
-				$file->sizeStr = round(($file->size / 1024), 2) . "K";
-			}
+			$file->sizeStr = V::humanFileSize($file->size);
 			$file->type = '';
 			$file->type = '';
 			$file->created = date("Y-m-d H:i:s", filectime($vFilePath));
 			$file->created = date("Y-m-d H:i:s", filectime($vFilePath));
 			$file->web = str_replace($localPath, $folderWeb, $vFilePath);
 			$file->web = str_replace($localPath, $folderWeb, $vFilePath);
@@ -5293,23 +5288,18 @@ jQuery(document).ready(function(){
 								</colgroup>
 								</colgroup>
 								<tbody>
 								<tbody>
 								<?php foreach ($skanyFiles as $vFilePath) : ?>
 								<?php foreach ($skanyFiles as $vFilePath) : ?>
-									<tr>
+									<tr onClick="jQuery(this).find('input[type=\'radio\']:first').checked = true; return false;">
 									<?php
 									<?php
 										$vFileName = explode('/', $vFilePath);
 										$vFileName = explode('/', $vFilePath);
 										$vFileName = end($vFileName);
 										$vFileName = end($vFileName);
 										$vFileSize = filesize($vFilePath);
 										$vFileSize = filesize($vFilePath);
-										$vFileSizeOut = round($vFileSize, 2) . "B";
-										if ($vFileSize > 1024 * 1024) {
-											$vFileSizeOut = round(($vFileSize / (1024 * 1024)), 2) . "M";
-										} else if ($vFileSize > 1024) {
-											$vFileSizeOut = round(($vFileSize / 1024), 0) . "K";
-										}
+										$vFileSizeOut = V::humanFileSize($vFileSize);
 									?>
 									?>
-									<td><input style="margin:0;" type="radio" name="SCANS_COLUMN_ADD" value="<?php echo $vFileName; ?>"></td>
-									<td><div style="overflow:hidden; white-space:nowrap;" title="<?php echo $vFileName; ?>"><?php echo $vFileName; ?></div></td>
-									<td style="white-space:nowrap; text-align:center;"><a href="<?php echo str_replace($skanyLocalPath, $skanyFolderWeb, $vFilePath); ?>" target="_blank" class="glyphicon glyphicon-download-alt"></a></td>
-									<td style="white-space:nowrap;"><?php echo $vFileSizeOut; ?></td>
-									<td style="white-space:nowrap;"><?php echo date("Y-m-d H:i:s", filectime($vFilePath)); ?></td>
+									<td><input style="margin:0" type="radio" name="SCANS_COLUMN_ADD" value="<?php echo $vFileName; ?>"></td>
+									<td><div style="overflow:hidden; white-space:nowrap" title="<?php echo $vFileName; ?>"><?php echo $vFileName; ?></div></td>
+									<td style="white-space:nowrap; text-align:center"><a href="<?php echo str_replace($skanyLocalPath, $skanyFolderWeb, $vFilePath); ?>" target="_blank" class="glyphicon glyphicon-download-alt"></a></td>
+									<td style="white-space:nowrap; text-align:right"><?php echo $vFileSizeOut; ?></td>
+									<td style="white-space:nowrap"><?php echo date("Y-m-d H:i:s", filectime($vFilePath)); ?></td>
 									</tr>
 									</tr>
 								<?php endforeach; ?>
 								<?php endforeach; ?>
 								</tbody>
 								</tbody>