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

fixed trans && fixed watermark image

Browse Source
This commit is contained in:
vedatakd 2020-11-10 16:49:13 +03:00
parent ada9f7ffc7
commit 0450fb500a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/default/visiosoft/cats-module/resources/views/table/table.twig
View File

@ -31,7 +31,7 @@
{% set parent_url = url('admin/cats?cat='~parent.parent_category_id) %} {% set parent_url = url('admin/cats?cat='~parent.parent_category_id) %}
{% endif %} {% endif %}
<a class="btn btn-md btn-warning " href="{{ parent_url }}"> <a class="btn btn-md btn-warning " href="{{ parent_url }}">
<i class="fa fa-arrow-left"></i> {{ trans('module.field.go_to_parent') }} <i class="fa fa-arrow-left"></i> {{ trans('module::field.go_to_parent') }}
</a> </a>
</div> </div>
{% endif %} {% endif %}

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

@ -111,7 +111,7 @@ class UploadController extends AdminController
if ($settings_value['watermark_type'] == 'image') { if ($settings_value['watermark_type'] == 'image') {
if (!$watermarkimage = $this->files->find($settings_value['watermark_image'])) { if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) {
$watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path());
$image->insert($watermark, $settings_value['watermark_position']); $image->insert($watermark, $settings_value['watermark_position']);
} }