Skip to content

Commit d0bcabd

Browse files
dmitriituxdmitriitux
committed
Версия 1.1.5
1 parent fbf37ad commit d0bcabd

10 files changed

Lines changed: 180 additions & 46 deletions

File tree

‎administrator/components/com_quantummanager/filesystem/local.php‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -278,17 +278,24 @@ public static function getMetaFile($path, $file)
278278
'value' => implode('.', $splitFile),
279279
];
280280

281+
$globalInfo[] = [
282+
'key' => Text::_('COM_QUANTUMMANAGER_FILE_METAINFO_EXS'),
283+
'value' => $exs,
284+
];
285+
281286
$stat = stat($filePath);
282287

283288
if ($stat !== false) {
284-
if (isset($stat['mtime'])) {
289+
if (isset($stat['mtime']))
290+
{
285291
$globalInfo[] = [
286292
'key' => Text::_('COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME'),
287293
'value' => date(Text::_('DATE_FORMAT_LC5'), $stat['mtime'])
288294
];
289295
}
290296

291-
if (isset($stat['size'])) {
297+
if (isset($stat['size']))
298+
{
292299
$globalInfo[] = [
293300
'key' => Text::_('COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE'),
294301
'value' => QuantummanagerHelper::formatFileSize((int)$stat['size'])
@@ -297,7 +304,8 @@ public static function getMetaFile($path, $file)
297304

298305
}
299306

300-
if (in_array($exs, ['jpg', 'jpeg', 'png', 'gif'])) {
307+
if (in_array($exs, ['jpg', 'jpeg', 'png', 'gif']))
308+
{
301309
list($width, $height, $type, $attr) = getimagesize($filePath);
302310

303311
$globalInfo[] = [
@@ -308,28 +316,34 @@ public static function getMetaFile($path, $file)
308316

309317

310318

311-
if (in_array($exs, ['jpg', 'jpeg'])) {
319+
if (in_array($exs, ['jpg', 'jpeg']))
320+
{
312321

313322
try
314323
{
315324
$tmp = exif_read_data($filePath);
316-
foreach ($tmp as $key => $section) {
325+
foreach ($tmp as $key => $section)
326+
{
317327
if (is_array($section)) {
318-
foreach ($section as $name => $val) {
328+
foreach ($section as $name => $val)
329+
{
319330
$meta['find'][] = [
320331
'key' => $key . '.' . $name,
321332
'value' => $val
322333
];
323334
}
324-
} else {
335+
}
336+
else
337+
{
325338

326339
if (!in_array(mb_strtolower($key), [
327340
'filename',
328341
'filedatetime',
329342
'filesize',
330343
'filetype',
331344
'mimetype',
332-
])) {
345+
]))
346+
{
333347
$meta['find'][] = [
334348
'key' => $key,
335349
'value' => $section,
@@ -453,15 +467,26 @@ public static function getFiles($path)
453467
}
454468

455469
$exs = array_pop($fileParse);
470+
$fileDate = filemtime($directory . DIRECTORY_SEPARATOR . $file);
471+
472+
$stat = stat($directory . DIRECTORY_SEPARATOR . $file);
473+
474+
if ($stat !== false)
475+
{
476+
if (isset($stat['mtime']))
477+
{
478+
$fileDate = $stat['mtime'];
479+
}
480+
}
456481

457482
$fileMeta = [
458483
'size' => filesize($directory . DIRECTORY_SEPARATOR . $file),
459484
'name' => implode('.', $fileParse),
460485
'exs' => $exs,
461486
'file' => $file,
462487
'fileP' => $file,
463-
'dateC' => filemtime($directory . DIRECTORY_SEPARATOR . $file),
464-
'dateM' => filemtime($directory . DIRECTORY_SEPARATOR . $file),
488+
'dateC' => $fileDate,
489+
'dateM' => $fileDate,
465490
];
466491

467492
if(in_array(strtolower($exs), ['jpg', 'png', 'jpeg', 'gif', 'svg']))

‎administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,19 @@ COM_QUANTUMMANAGER_HELP_AUTHOR="Contact with the author"
107107
COM_QUANTUMMANAGER_WINDOW_CLOSE="Close"
108108
COM_QUANTUMMANAGER_WINDOW_INSERT="Insert file"
109109

110-
COM_QUANTUMMANAGER_FILE_METAINFO_DIRECTORYNAME="Folder Name"
110+
COM_QUANTUMMANAGER_FILE_METAINFO_DIRECTORYNAME="Folder name"
111111
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTDORECTORIES="Folders"
112112
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTFILES="Files"
113-
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="File Size"
114-
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="File Name"
115-
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Change Time"
116-
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="File Size"
113+
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="File size"
114+
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="File name"
115+
COM_QUANTUMMANAGER_FILE_METAINFO_EXS="File extension"
116+
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Change time"
117+
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="File size"
117118
COM_QUANTUMMANAGER_FILE_METAINFO_FILETYPE="Type"
118119
COM_QUANTUMMANAGER_FILE_METAINFO_RESOLUTION="Resolution"
119120
COM_QUANTUMMANAGER_FILE_METAINFO_WIDTH="Width"
120121
COM_QUANTUMMANAGER_FILE_METAINFO_HEIGHT="Height"
121-
COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="Mime Type"
122+
COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="Mime type"
122123
COM_QUANTUMMANAGER_FILE_METAINFO_SECTIONSFOUND="Found section"
123124
COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all tags"
124125
COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide tags"

‎administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,19 @@ COM_QUANTUMMANAGER_HELP_AUTHOR="Contact with the author"
107107
COM_QUANTUMMANAGER_WINDOW_CLOSE="Close"
108108
COM_QUANTUMMANAGER_WINDOW_INSERT="Insert file"
109109

110-
COM_QUANTUMMANAGER_FILE_METAINFO_DIRECTORYNAME="Folder Name"
110+
COM_QUANTUMMANAGER_FILE_METAINFO_DIRECTORYNAME="Folder name"
111111
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTDORECTORIES="Folders"
112112
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTFILES="Files"
113-
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="File Size"
114-
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="File Name"
115-
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Change Time"
116-
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="File Size"
113+
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="File size"
114+
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="File name"
115+
COM_QUANTUMMANAGER_FILE_METAINFO_EXS="File extension"
116+
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Change time"
117+
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="File size"
117118
COM_QUANTUMMANAGER_FILE_METAINFO_FILETYPE="Type"
118119
COM_QUANTUMMANAGER_FILE_METAINFO_RESOLUTION="Resolution"
119120
COM_QUANTUMMANAGER_FILE_METAINFO_WIDTH="Width"
120121
COM_QUANTUMMANAGER_FILE_METAINFO_HEIGHT="Height"
121-
COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="Mime Type"
122+
COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="Mime type"
122123
COM_QUANTUMMANAGER_FILE_METAINFO_SECTIONSFOUND="Found section"
123124
COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all tags"
124125
COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide tags"

‎administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ COM_QUANTUMMANAGER_FILE_METAINFO_COUNTDORECTORIES="Папок"
113113
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTFILES="Файлов"
114114
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="Размер файлов"
115115
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="Название файла"
116+
COM_QUANTUMMANAGER_FILE_METAINFO_EXS="Расширение файла"
116117
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Время изменения"
117118
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="Размер файла"
118119
COM_QUANTUMMANAGER_FILE_METAINFO_FILETYPE="Тип"

‎administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.sys.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ COM_QUANTUMMANAGER_FILE_METAINFO_COUNTDORECTORIES="Папок"
113113
COM_QUANTUMMANAGER_FILE_METAINFO_COUNTFILES="Файлов"
114114
COM_QUANTUMMANAGER_FILE_METAINFO_FILESSIZE="Размер файлов"
115115
COM_QUANTUMMANAGER_FILE_METAINFO_FILENAME="Название файла"
116+
COM_QUANTUMMANAGER_FILE_METAINFO_EXS="Расширение файла"
116117
COM_QUANTUMMANAGER_FILE_METAINFO_FILEDATETIME="Время изменения"
117118
COM_QUANTUMMANAGER_FILE_METAINFO_FILESIZE="Размер файла"
118119
COM_QUANTUMMANAGER_FILE_METAINFO_FILETYPE="Тип"

‎changelog.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.1.5
2+
- добавлен фон для метаинформации
3+
- в режиме списка появилась метаинформация о файле
4+
- исправлен чекбокс при клике в режиме списка
5+
- добавление в метаинформации расширение файла
6+
17
1.1.4
28
- исправление ошибки загрузки класса
39
- теперь показывается метаинформация папок

‎media/com_quantummanager/css/quantumviewfiles.css‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
position: relative;
4646
max-width: 100%;
4747
vertical-align: middle;
48+
z-index: 2;
4849
}
4950
.quantumviewfiles-module .filter-search .uk-form-icon {
5051
position: absolute;
@@ -206,6 +207,9 @@
206207
.quantumviewfiles-module .meta-file {
207208
position: relative;
208209
width: 25%;
210+
margin-top: -45px;
211+
margin-right: -15px;
212+
background: #f6f6f6;
209213
}
210214
.quantumviewfiles-module .meta-file.hidden {
211215
display: none;
@@ -226,14 +230,17 @@
226230
}
227231
.quantumviewfiles-module .meta-file .meta-file-list > div {
228232
padding: 10px;
233+
padding-top: 45px;
229234
}
230235
.quantumviewfiles-module .meta-file .meta-hidden {
231236
display: none;
232237
}
233238
.quantumviewfiles-module .meta-file .show-all-tags {
234239
display: inline-block;
240+
margin-top: 10px;
235241
padding: 6px;
236242
color: #000000;
243+
font-weight: bold;
237244
}
238245
.quantumviewfiles-module .meta-file .show-all-tags:hover {
239246
color: #444444;
@@ -263,22 +270,17 @@
263270
border-spacing: 0;
264271
width: 100%;
265272
}
266-
.quantumviewfiles-module .meta-file table>tr:not(:first-child),
267-
.quantumviewfiles-module .meta-file table>:not(:first-child)>tr,
268-
.quantumviewfiles-module .meta-file table>:first-child>tr:not(:first-child) {
269-
border-top: 1px solid #e5e5e5;
270-
}
271-
.quantumviewfiles-module .meta-file table tr {
273+
.quantumviewfiles-module .meta-file .meta-table > div {
274+
display: flex;
275+
align-items: center;
272276
transition: background-color .1s linear;
273277
}
274-
.quantumviewfiles-module .meta-file table td {
278+
.quantumviewfiles-module .meta-file .meta-table > div > div {
279+
width: 50%;
275280
padding: 6px;
276281
vertical-align: middle;
277282
}
278-
.quantumviewfiles-module .meta-file table td {
279-
width: 50%;
280-
}
281-
.quantumviewfiles-module .meta-file table td:last-child {
283+
.quantumviewfiles-module .meta-file .meta-table > div > div:last-child {
282284
font-weight: bold;
283285
}
284286
.quantumviewfiles-module .field-list-files {
@@ -304,7 +306,7 @@
304306
background: #f3dd8c73;
305307
}
306308
.quantumviewfiles-module .field-list-files .file {
307-
width: 100%;
309+
width: 50%;
308310
display: flex;
309311
align-self: center;
310312
align-items: center;
@@ -324,6 +326,14 @@
324326
line-height: 14px;
325327
white-space: normal;
326328
}
329+
.quantumviewfiles-module .field-list-files .fields {
330+
display: flex;
331+
flex: 1;
332+
padding: 5px 0;
333+
}
334+
.quantumviewfiles-module .field-list-files .fields > div {
335+
width: 50%;
336+
}
327337
.quantumviewfiles-module .field-list-files .empty {
328338
width: 100%;
329339
height: 100%;
@@ -564,6 +574,10 @@
564574
background-color: #fcf8e3;
565575
color: #444444;
566576
}
577+
.quantumviewfiles-module .field-list-files .list-table .file-item input:checked ~ .fields {
578+
background-color: #fcf8e3;
579+
color: #444444;
580+
}
567581
.quantumviewfiles-module .field-list-files .list-table .file-item .file {
568582
padding: 8px 4px;
569583
}

‎media/com_quantummanager/js/quantumviewfiles.js‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -348,21 +348,21 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
348348
}
349349

350350
if(response.global !== undefined) {
351-
html += '<table><tbody>';
351+
html += '<div class="meta-table">';
352352
for (let i in response.global) {
353-
html += '<tr><td>' + response.global[i].key + '</td><td>' + response.global[i].value + '</td></tr>';
353+
html += '<div><div>' + response.global[i].key + '</div><div>' + response.global[i].value + '</div></div>';
354354
}
355-
html += '</tbody></table>';
355+
html += '</div>';
356356
}
357357

358358
if(response.find !== undefined) {
359359
if(Object.keys(response.find).length > 0) {
360360
html += '<span class="show-all-tags">' + QuantumviewfilesLang.metaFileShow + '</span>';
361-
html += '<table class="meta-find meta-hidden"><tbody>';
361+
html += '<div class="meta-table meta-find meta-hidden">';
362362
for (let i in response.find) {
363-
html += '<tr><td>' + response.find[i].key + '</td><td>' + response.find[i].value + '</td></tr>';
363+
html += '<div><div>' + response.find[i].key + '</div><div>' + response.find[i].value + '</div></div>';
364364
}
365-
html += '</tbody></table>';
365+
html += '</div>';
366366
}
367367
}
368368

@@ -434,21 +434,21 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
434434
}
435435

436436
if(response.global !== undefined) {
437-
html += '<table><tbody>';
437+
html += '<div class="meta-table">';
438438
for (let i in response.global) {
439-
html += '<tr><td>' + response.global[i].key + '</td><td>' + response.global[i].value + '</td></tr>';
439+
html += '<div><div>' + response.global[i].key + '</div><div>' + response.global[i].value + '</div></div>';
440440
}
441441
html += '</tbody></table>';
442442
}
443443

444444
if(response.find !== undefined) {
445445
if(Object.keys(response.find).length > 0) {
446446
html += '<span class="show-all-tags">' + QuantumviewfilesLang.metaFileShow + '</span>';
447-
html += '<table class="meta-find meta-hidden"><tbody>';
447+
html += '<div class="meta-find meta-hidden">';
448448
for (let i in response.find) {
449-
html += '<tr><td>' + response.find[i].key + '</td><td>' + response.find[i].value + '</td></tr>';
449+
html += '<div><div>' + response.find[i].key + '</div><div>' + response.find[i].value + '</div></div>';
450450
}
451-
html += '</tbody></table>';
451+
html += '</div>';
452452
}
453453
}
454454

@@ -691,6 +691,7 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
691691
};
692692

693693
this.reloadTypeViewFiles = function(path) {
694+
let self = this;
694695
let filesAll = ViewfilesElement.querySelectorAll('.field-list-files .file-item');
695696
let viewFiles = ViewfilesElement.querySelector('.field-list-files .list');
696697

@@ -762,6 +763,12 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
762763
let fileExs = filesAll[i].getAttribute('data-exs');
763764
let filePreview = filesAll[i].querySelector('.file-exs');
764765
let exsImage = ['jpg', 'png', 'svg', 'jpeg', 'gif'];
766+
let fields = filesAll[i].querySelector('.fields');
767+
768+
if(fields !== null) {
769+
fields.remove();
770+
}
771+
765772
if(exsImage.indexOf(fileExs.toLowerCase()) !== -1) {
766773

767774
let file;
@@ -800,9 +807,20 @@ window.Quantumviewfiles = function(Filemanager, ViewfilesElement, options) {
800807
}
801808

802809
if(this.lastTypeViewFiles === 'list-table') {
810+
let htmlFields = '';
803811
let filePreview = filesAll[i].querySelector('.file-exs');
804812
filePreview.style.backgroundImage = "";
805813
filePreview.innerHTML = '';
814+
815+
htmlFields += '<div class="fields">';
816+
htmlFields += '<div data-type="size">' + QuantumUtils.bytesToSize(filesAll[i].getAttribute('data-size')) + '</div>';
817+
htmlFields += '<div data-type="date">' + QuantumUtils.fromUnixTimeToDate(filesAll[i].getAttribute('data-datec')) + '</div>';
818+
htmlFields += '</div>';
819+
filesAll[i].innerHTML += htmlFields;
820+
filesAll[i].querySelector('.import-files-check-file').addEventListener('click', function (ev) {
821+
self.fileClick(filesAll[i], self);
822+
ev.preventDefault();
823+
});
806824
}
807825

808826
}

0 commit comments

Comments
 (0)