hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed media field type and upload errors

Browse Source
This commit is contained in:
vedatakd 2021-02-01 12:38:07 +03:00
parent bc6fc0c08a
commit e05fa21c7d
5 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css vendored
View File

@ -4076,7 +4076,7 @@ readers do not read off random characters that represent icons */
content: "\f7bc";
}
.fa-redo:before {
.fa-redo:before, .fa-repeat:before {
content: "\f01e";
}

4
addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
View File

@ -2761,3 +2761,7 @@ body {
font-size: 2rem;
}
}
/** bootstrap 4.1 Column Fix**/
.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}

30
addons/default/visiosoft/media-field_type/resources/js/upload.js
View File

@ -2,8 +2,14 @@
Dropzone.autoDiscover = false;
$("div#myDrop").dropzone({url: "/file/post"});
var doc_input = $('input[name="doc_files"]');
var uploaded = $('input[name="files"]').val().split(',').map(Number);
var docsUploaded = $('input[name="doc_files"]').val().split(',').map(Number);
if (doc_input.length) {
var docsUploaded = doc_input.val().split(',').map(Number);
}
$(function () {
@ -69,7 +75,7 @@ $(function () {
var response = JSON.parse(file.xhr.response);
var mimeType = response.mime_type.split('/')
if (mimeType[0] === 'image'){
if (mimeType[0] === 'image') {
uploaded.push(response.id);
$('.media-selected-wrapper').load(
@ -87,21 +93,23 @@ $(function () {
file.previewElement.remove();
}, 500);
} else {
docsUploaded.push(response.id);
$('input[name="doc_files"]').val(docsUploaded.join(','))
if (doc_input.length) {
docsUploaded.push(response.id);
$('input[name="doc_files"]').val(docsUploaded.join(','))
$('.doc_list').append(`
<a id="${ response.id }" href="javascript:void(0)" onclick="deleteDocs(${ response.id })" class="text-dark">
${ response.name }
$('.doc_list').append(`
<a id="${response.id}" href="javascript:void(0)" onclick="deleteDocs(${response.id})" class="text-dark">
${response.name}
<i class="fa fa-trash text-danger"></i>
</a><br>
`)
setTimeout(function () {
setTimeout(function () {
addAppendByData(docsUploaded[0])
file.previewElement.remove();
}, 500);
addAppendByData(docsUploaded[0])
file.previewElement.remove();
}, 500);
}
}
});

5
addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
View File

@ -101,7 +101,6 @@ class UploadController extends AdminController
$constraint->aspectRatio();
});
if ($settings_value['add_canvas']) {
$fullImg->resizeCanvas(
@ -132,13 +131,15 @@ class UploadController extends AdminController
$w = $image->width() / 2;
$h1 = $image->height() / 2;
$font_size = $w / 20;
$image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) {
$image->text(setting_value('visiosoft.module.advs::watermark_text','Openclassify'), $w, $h1, function ($font) use ($v, $h, $font_size) {
$font->file(public_path('Antonio-Bold.ttf'));
$font->size($font_size);
$font->align($h);
$font->valign($v);
});
}
if ($key === "full") {
$fileName = $file->getAttributes()['name'];
} else {

4
addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php
View File

@ -65,7 +65,7 @@ class ValueTableBuilder extends TableBuilder
],
'rotate' => [
'target' => '_blank',
'icon' => 'fas fa-redo',
'icon' => 'fa fa-repeat',
'type' => 'info',
'text' => '',
'class' => 'col-4',
@ -76,7 +76,7 @@ class ValueTableBuilder extends TableBuilder
],
'deleteImage' => [
'target' => '_blank',
'icon' => 'fas fa-trash',
'icon' => 'fa fa-trash',
'type' => 'danger',
'text' => '',
'class' => 'col-4 deleteImage',