From cf6144bd5a88803596905c77ddabffcd754531b1 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sat, 29 Aug 2020 12:51:53 +0200
Subject: [PATCH 1/2] Added dropdown for CQ and ITU zone when creating and
 editing station profile.

---
 application/views/station_profile/create.php | 36 +++++++++++++-----
 application/views/station_profile/edit.php   | 40 +++++++++++++++-----
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index e7d77451..9a558a65 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -123,17 +123,33 @@
 		    <small id="stationCntyInputHelp" class="form-text text-muted">Station Cnty #get def from ADIF Spec#</small>
 		  </div>
 
-		  <div class="form-group">
-		    <label for="stationCQZoneInput">CQ Zone</label>
-		    <input type="text" class="form-control" name="station_cq" id="stationCQZoneInput" aria-describedby="stationCQInputHelp" required>
-		    <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
-		  </div>
+            <div class="form-group">
+                <label for="stationCQZoneInput">CQ Zone</label>
+                <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+                    <?php
+                    for ($i = 1; $i<=40; $i++) {
+                        echo '<option value='. $i;
 
-		  <div class="form-group">
-		    <label for="stationITUZoneInput">ITU Zone</label>
-		    <input type="text" class="form-control" name="station_itu" id="stationITUZoneInput" aria-describedby="stationITUInputHelp" required>
-		    <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
-		  </div>
+                        echo '>'. $i .'</option>';
+                    }
+                    ?>
+                </select>
+                <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
+            </div>
+
+            <div class="form-group">
+                <label for="stationITUZoneInput">ITU Zone</label>
+                <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                    <?php
+                    for ($i = 1; $i<=90; $i++) {
+                        echo '<option value='. $i;
+
+                        echo '>'. $i .'</option>';
+                    }
+                    ?>
+                </select>
+                <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+            </div>
 
 		  <div class="form-group">
 		    <label for="stationGridsquareInput">Gridsquare</label>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index f6417181..1eb76c98 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -137,17 +137,37 @@
 		    <small id="stationCntyInputHelp" class="form-text text-muted">Station Cnty #get def from ADIF Spec#</small>
 		  </div>
 
-		  <div class="form-group">
-		    <label for="stationCQZoneInput">CQ Zone</label>
-		    <input type="text" class="form-control" name="station_cq" id="stationCQZoneInput" aria-describedby="stationCQInputHelp" value="<?php if(set_value('station_cq') != "") { echo set_value('station_cq'); } else { echo $my_station_profile->station_cq; } ?>" required>
-		    <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
-		  </div>
+            <div class="form-group">
+                <label for="stationCQZoneInput">CQ Zone</label>
+                <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+                    <?php
+                    for ($i = 1; $i<=40; $i++) {
+                        echo '<option value='. $i;
+                        if ($my_station_profile->station_cq == $i) {
+                            echo " selected=\"selected\"";
+                        }
+                        echo '>'. $i .'</option>';
+                    }
+                    ?>
+                </select>
+                <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
+            </div>
 
-		  <div class="form-group">
-		    <label for="stationITUZoneInput">ITU Zone</label>
-		    <input type="text" class="form-control" name="station_itu" id="stationITUZoneInput" aria-describedby="stationITUInputHelp" value="<?php if(set_value('station_itu') != "") { echo set_value('station_itu'); } else { echo $my_station_profile->station_itu; } ?>" required>
-		    <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
-		  </div>
+            <div class="form-group">
+                <label for="stationITUZoneInput">ITU Zone</label>
+                <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                    <?php
+                    for ($i = 1; $i<=90; $i++) {
+                        echo '<option value='. $i;
+                        if ($my_station_profile->station_itu == $i) {
+                            echo " selected=\"selected\"";
+                        }
+                        echo '>'. $i .'</option>';
+                    }
+                    ?>
+                </select>
+                <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+            </div>
 
 		  <div class="form-group">
 		    <label for="stationGridsquareInput">Gridsquare</label>

From d2a977e30134129c6bd7cb3f0556adcc733171ee Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sat, 29 Aug 2020 12:57:14 +0200
Subject: [PATCH 2/2] Placed CQ and ITU side by side in edit and create station
 profile.

---
 application/views/station_profile/create.php | 48 +++++++++--------
 application/views/station_profile/edit.php   | 56 ++++++++++----------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 9a558a65..e1116501 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -123,32 +123,34 @@
 		    <small id="stationCntyInputHelp" class="form-text text-muted">Station Cnty #get def from ADIF Spec#</small>
 		  </div>
 
-            <div class="form-group">
-                <label for="stationCQZoneInput">CQ Zone</label>
-                <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
-                    <?php
-                    for ($i = 1; $i<=40; $i++) {
-                        echo '<option value='. $i;
+            <div class="form-row">
+                <div class="form-group col-sm-6">
+                    <label for="stationCQZoneInput">CQ Zone</label>
+                    <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+                        <?php
+                        for ($i = 1; $i<=40; $i++) {
+                            echo '<option value='. $i;
 
-                        echo '>'. $i .'</option>';
-                    }
-                    ?>
-                </select>
-                <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
-            </div>
+                            echo '>'. $i .'</option>';
+                        }
+                        ?>
+                    </select>
+                    <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
+                </div>
 
-            <div class="form-group">
-                <label for="stationITUZoneInput">ITU Zone</label>
-                <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
-                    <?php
-                    for ($i = 1; $i<=90; $i++) {
-                        echo '<option value='. $i;
+                <div class="form-group col-sm-6">
+                    <label for="stationITUZoneInput">ITU Zone</label>
+                    <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                        <?php
+                        for ($i = 1; $i<=90; $i++) {
+                            echo '<option value='. $i;
 
-                        echo '>'. $i .'</option>';
-                    }
-                    ?>
-                </select>
-                <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+                            echo '>'. $i .'</option>';
+                        }
+                        ?>
+                    </select>
+                    <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+                </div>
             </div>
 
 		  <div class="form-group">
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 1eb76c98..fec8a0ca 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -137,36 +137,38 @@
 		    <small id="stationCntyInputHelp" class="form-text text-muted">Station Cnty #get def from ADIF Spec#</small>
 		  </div>
 
-            <div class="form-group">
-                <label for="stationCQZoneInput">CQ Zone</label>
-                <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
-                    <?php
-                    for ($i = 1; $i<=40; $i++) {
-                        echo '<option value='. $i;
-                        if ($my_station_profile->station_cq == $i) {
-                            echo " selected=\"selected\"";
+            <div class="form-row">
+                <div class="form-group col-sm-6">
+                    <label for="stationCQZoneInput">CQ Zone</label>
+                    <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+                        <?php
+                        for ($i = 1; $i<=40; $i++) {
+                            echo '<option value='. $i;
+                            if ($my_station_profile->station_cq == $i) {
+                                echo " selected=\"selected\"";
+                            }
+                            echo '>'. $i .'</option>';
                         }
-                        echo '>'. $i .'</option>';
-                    }
-                    ?>
-                </select>
-                <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
-            </div>
+                        ?>
+                    </select>
+                    <small id="stationCQInputHelp" class="form-text text-muted">If you do not know your CQ Zone <a href="http://www4.plala.or.jp/nomrax/CQ/" target="_blank">click Here to find it!</a></small>
+                </div>
 
-            <div class="form-group">
-                <label for="stationITUZoneInput">ITU Zone</label>
-                <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
-                    <?php
-                    for ($i = 1; $i<=90; $i++) {
-                        echo '<option value='. $i;
-                        if ($my_station_profile->station_itu == $i) {
-                            echo " selected=\"selected\"";
+                <div class="form-group col-sm-6">
+                    <label for="stationITUZoneInput">ITU Zone</label>
+                    <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                        <?php
+                        for ($i = 1; $i<=90; $i++) {
+                            echo '<option value='. $i;
+                            if ($my_station_profile->station_itu == $i) {
+                                echo " selected=\"selected\"";
+                            }
+                            echo '>'. $i .'</option>';
                         }
-                        echo '>'. $i .'</option>';
-                    }
-                    ?>
-                </select>
-                <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+                        ?>
+                    </select>
+                    <small id="stationITUInputHelp" class="form-text text-muted">If you do not know your ITU Zone <a href="http://www4.plala.or.jp/nomrax/ITU/" target="_blank">click Here to find it!</a></small>
+                </div>
             </div>
 
 		  <div class="form-group">