From 42014c52b6fd4b25c891281fe64795f76ed064b0 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 6 Oct 2020 09:52:54 +0300
Subject: [PATCH] country name design

---
 .../ads-list/partials/location-fields.twig    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
index f4977f721..c86d0e9a5 100644
--- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
+++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
@@ -2,29 +2,30 @@
     {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
     {% set selectedCountry =  app.request.get('country') %}
 
+    {% set countryValue = '' %}
+    {% if selectedCountry %}
+        {% set countryName = getCountry(selectedCountry).name %}
+        {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
+    {% elseif defaultCountry %}
+        {% set countryName = getCountry(defaultCountry).name %}
+        {% set countryValue = defaultCountry %}
+    {% else %}
+        {% set countryName = trans("visiosoft.module.location::field.country.name") %}
+    {% endif %}
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 selected-country filter-country-btn"
                 data-toggle="modal">
-            <span class="float-left">{{ trans("visiosoft.module.location::field.country.name") }}</span>
+            <span class="float-left">
+                {{ trans("visiosoft.module.location::field.country.name") }}
+                    <small class="text-muted selected-country">{{ countryName }}</small>
+            </span>
             <i class="fas fa-sort-down float-right"></i>
         </button>
-        {% set countryValue = '' %}
-        {% if selectedCountry %}
-            {% set countryName = getCountry(selectedCountry).name %}
-            {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
-        {% elseif defaultCountry %}
-            {% set countryName = getCountry(defaultCountry).name %}
-            {% set countryValue = defaultCountry %}
-        {% else %}
-            {% set countryName = trans("visiosoft.module.location::field.country.name") %}
-        {% endif %}
-        <div class="text-muted selected-country">
-            <small>{{ countryName }}</small>
-        </div>
         <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
 
 
+
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"
                 data-parent="">