Merge branch 'master' of https://github.com/openclassify/openclassify

addons/default/visiosoft/advs-module/resources/config/settings/sections.php

@@ -4,22 +4,29 @@ return [
     'monitoring' => [
         'stacked' => true,
         'tabs' => [
-
-
             'general' => [
                 'title' => 'visiosoft.module.advs::section.general',
                 'fields' => [
-                    'iban_numbers', 'google_statistic_code', 'ogImage', 'free_currencyconverterapi_key',
+                    'iban_numbers',
+                    'google_statistic_code',
+                    'ogImage',
+                    'free_currencyconverterapi_key',
                     'enabled_currencies'
-
                 ],
             ],
-
             'ads' => [
                 'title' => 'visiosoft.module.advs::section.ads',
                 'fields' => [
-                    'latest-limit', 'auto_approve', 'default_published_time', 'default_adv_limit', 'default_GET',
+                    'latest-limit',
-                    'watermark_type', 'watermark_text', 'watermark_image', 'watermark_position', 'watermark_opacity',
+                    'auto_approve',
+                    'default_published_time',
+                    'default_adv_limit',
+                    'default_GET',
+                    'watermark_type',
+                    'watermark_text',
+                    'watermark_image',
+                    'watermark_position',
+                    'watermark_opacity',
                     'listing_page_image',
                 ],
             ],

addons/default/visiosoft/advs-module/resources/config/settings/settings.php

@@ -1,15 +1,12 @@
 <?php
 
 return [
-
     'register_email_field' => [
         'type' => 'anomaly.field_type.boolean',
         'config' => [
             'default_value' => true,
         ],
     ],
-
-
     'latest-limit' => [
         'type' => 'anomaly.field_type.integer',
         'config' => [
@@ -124,7 +121,8 @@ return [
         'env' => 'ADV_WATERMARK_POSITION',
         'required' => true,
         'config' => [
-            'options' => ['top-right' => 'Top Right', 'top-left' => 'Top Left', 'bottom-right' => 'Bottom Right', 'bottom-left' => 'Bottom Left', 'center' => 'Middle'],
+            'options' => ['top-right' => 'Top Right', 'top-left' => 'Top Left', 'bottom-right' => 'Bottom Right',
+                'bottom-left' => 'Bottom Left', 'center' => 'Middle'],
             'default_value' => 'top-right',
         ]
     ],
@@ -146,7 +144,6 @@ return [
             'mode' => 'upload',
         ]
     ],
-
     'enabled_currencies' => [
         'bind' => 'streams::currencies.enabled',
         'env' => 'ADV_ENABLED_CURRENCIES',

addons/default/visiosoft/media-field_type/resources/css/imgList.css

@@ -51,3 +51,7 @@
         margin: 10px;
     }
 }
+
+.img-thumbnail {
+    padding: 0;
+}

addons/default/visiosoft/media-field_type/resources/js/upload.js

@@ -16,8 +16,8 @@ $(function () {
     var dropzone = new Dropzone('.dropzone:not(data-initialized)',
         {
             paramName: 'upload',
-            resizeWidth: 1920,
+            resizeWidth: 800,
-            resizeHeight: 1920,
+            resizeHeight: 600,
             autoProcessQueue: true,
             parallelUploads: 1,
             resizeMethod: 'contain',

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

@@ -61,7 +61,8 @@ class UploadController extends AdminController
             $position = $settings->value('visiosoft.module.advs::watermark_position');
 
             $img = WaterMark::make($this->request->file('upload')->getRealPath())
-                ->resizeCanvas(800, 600, 'center', false, '464646');
+                               ->resize( null,600)
+                                ->resizeCanvas(800, 600, 'center', false, 'fff');
             if ($watermarktype == 'image') {
 
                 $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image');

addons/default/visiosoft/profile-module/resources/views/ad-detail/contact-with.twig

@@ -1,25 +1,32 @@
-{% set profile = findUserProfile(params.adv.created_by_id) %}
+{% if params.showTheme is defined %}
-{% if profile.gsm_phone is not null %}
+    {% set showTheme = params.showTheme %}
+{% else %}
+    {% set showTheme = true %}
+{% endif %}
+{% if showTheme %}
+    {% set profile = findUserProfile(params.adv.created_by_id) %}
+    {% if profile.gsm_phone is not null %}
         <div class="col-md-12 m-2 number-container">
             <button class="btn btn-secondary w-100">
                 <i class="fas fa-mobile hide-number text-warning"></i>
                 <span class="hide-number">{{ profile.gsm_phone }}</span>
             </button>
         </div>
-{% endif %}
+    {% endif %}
-{% if profile.office_phone is not empty %}
+    {% if profile.office_phone is not empty %}
         <div class="col-md-12 m-2 number-container">
             <button class="btn btn-secondary w-100">
                 <i class="fas fa-headset hide-number text-warning"></i>
                 <span class="hide-number">{{ profile.office_phone }}</span>
             </button>
         </div>
-{% endif %}
+    {% endif %}
-{% if profile.land_phone is not empty %}
+    {% if profile.land_phone is not empty %}
         <div class="col-md-12 m-2 number-container">
             <button class="btn btn-secondary w-100">
                 <i class="fa fa-phone-square hide-number text-warning"></i>
                 <span class="hide-number">{{ profile.land_phone }}</span>
             </button>
         </div>
+    {% endif %}
 {% endif %}