From ec474cb80e11861630c6c15e84e28e88addacc2c Mon Sep 17 00:00:00 2001
From: Johnny <johnny@pop-os.localdomain>
Date: Tue, 24 Nov 2020 23:16:39 -0500
Subject: [PATCH] Moved Country in edit/add location to bottom

---
 add_location_modal.php  | 30 +++++++++++++++---------------
 edit_location_modal.php | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/add_location_modal.php b/add_location_modal.php
index b30c6cbf..0adb3a65 100644
--- a/add_location_modal.php
+++ b/add_location_modal.php
@@ -59,21 +59,6 @@
 
             <div class="tab-pane fade" id="pills-address">
 
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
               <div class="form-group">
                 <label>Address</label>
                 <div class="input-group">
@@ -119,6 +104,21 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Country</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country">
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-contact">
diff --git a/edit_location_modal.php b/edit_location_modal.php
index 19d2b5d8..47a1ddaf 100644
--- a/edit_location_modal.php
+++ b/edit_location_modal.php
@@ -60,21 +60,6 @@
             </div>
 
             <div class="tab-pane fade" id="pills-address<?php echo $location_id; ?>">
-             
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if($location_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
 
               <div class="form-group">
                 <label>Address</label>
@@ -120,6 +105,21 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Country</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country">
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option <?php if($location_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-contact<?php echo $location_id; ?>">