diff --git a/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css b/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css
index 8838f19c1..d5f8f222f 100644
--- a/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css
+++ b/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css
@@ -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";
}
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
index d4f55f0c1..cbc0af57c 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
@@ -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%}
\ No newline at end of file
diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js
index 778d1a9eb..1eabb537c 100644
--- a/addons/default/visiosoft/media-field_type/resources/js/upload.js
+++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js
@@ -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(`
-
- ${ response.name }
+ $('.doc_list').append(`
+
+ ${response.name}
`)
- setTimeout(function () {
+ setTimeout(function () {
- addAppendByData(docsUploaded[0])
- file.previewElement.remove();
- }, 500);
+ addAppendByData(docsUploaded[0])
+ file.previewElement.remove();
+ }, 500);
+ }
}
});
diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
index 92046f66b..94df2818d 100644
--- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
+++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
@@ -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 {
diff --git a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php
index 8d0f55333..7dc77212f 100644
--- a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php
+++ b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php
@@ -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',