From 12e9d4e679824f9f4ee307a0991d052e71c938c8 Mon Sep 17 00:00:00 2001
From: Fabian Berg <fabian.berg@datapark.ch>
Date: Mon, 28 Apr 2025 13:32:24 +0200
Subject: [PATCH] Move Dashboard Settings to the Dashboard Settings tab instead
 General Tab

---
 application/views/user/edit.php | 43 +++++++++++++++++----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index db4fa7eea..545482245 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -226,27 +226,6 @@
 										</select>
 										<small id="user_measurement_base_Help" class="form-text text-muted"><?= __("Choose which unit distances will be shown in"); ?></small>
 									</div>
-
-									<div class="mb-3">
-										<label for="user_dashboard_map"><?= __("Show Dashboard Map"); ?></label>
-										<?php if(!isset($user_dashboard_map)) { $user_dashboard_map='Y'; }?>
-										<select class="form-select" id="user_dashboard_map" name="user_dashboard_map" aria-describedby="user_dashboard_map_Help" required>
-											<option value='Y' <?php if($user_dashboard_map == "Y") { echo "selected=\"selected\""; } ?>><?= __("Yes"); ?></option>
-											<option value='map_at_right' <?php if($user_dashboard_map == "map_at_right") { echo "selected=\"selected\""; } ?>><?= __("Map at right"); ?></option>
-											<option value='N' <?php if($user_dashboard_map == "N") { echo "selected=\"selected\""; } ?>><?= __("No"); ?></option>
-										</select>
-										<small id="user_dashboard_map_Help" class="form-text text-muted"><?= __("Choose whether to show map on dashboard or not"); ?></small>
-									</div>
-
-									<div class="mb-3">
-										<label for="user_dashboard_banner"><?= __("Dashboard Notification Banner"); ?></label>
-										<?php if(!isset($user_dashboard_banner)) { $user_dashboard_banner='Y'; }?>
-										<select class="form-select" id="user_dashboard_banner" name="user_dashboard_banner" aria-describedby="user_dashboard_banner_Help" required>
-											<option value='true' <?php if($user_dashboard_banner == "true") { echo "selected=\"selected\""; } ?>><?= __("Enabled"); ?></option>
-											<option value='false' <?php if($user_dashboard_banner == "false") { echo "selected=\"selected\""; } ?>><?= __("Disabled"); ?></option>
-										</select>
-										<small id="user_dashboard_banner_Help" class="form-text text-muted"><?= __("This allows to disable the global notification banner on the dashboard."); ?></small>
-									</div>
 								</div>
 							</div>
 						</div>
@@ -633,6 +612,28 @@
 													printf("<option value=\"{$i}\"{$selected_attribute_value}>{$i}</option>");
 												} ?>
 											</select>
+											<small id="SelectDateFormatHelp" class="form-text text-muted"><?= __("Choose the number of latest QSOs to be displayed on dashboard."); ?></small>
+										</div>
+
+										<div class="mb-3">
+											<label for="user_dashboard_map"><?= __("Show Dashboard Map"); ?></label>
+											<?php if(!isset($user_dashboard_map)) { $user_dashboard_map='Y'; }?>
+											<select class="form-select" id="user_dashboard_map" name="user_dashboard_map" aria-describedby="user_dashboard_map_Help" required>
+												<option value='Y' <?php if($user_dashboard_map == "Y") { echo "selected=\"selected\""; } ?>><?= __("Yes"); ?></option>
+												<option value='map_at_right' <?php if($user_dashboard_map == "map_at_right") { echo "selected=\"selected\""; } ?>><?= __("Map at right"); ?></option>
+												<option value='N' <?php if($user_dashboard_map == "N") { echo "selected=\"selected\""; } ?>><?= __("No"); ?></option>
+											</select>
+											<small id="user_dashboard_map_Help" class="form-text text-muted"><?= __("Choose whether to show map on dashboard or not"); ?></small>
+										</div>
+
+										<div class="mb-3">
+											<label for="user_dashboard_banner"><?= __("Dashboard Notification Banner"); ?></label>
+											<?php if(!isset($user_dashboard_banner)) { $user_dashboard_banner='Y'; }?>
+											<select class="form-select" id="user_dashboard_banner" name="user_dashboard_banner" aria-describedby="user_dashboard_banner_Help" required>
+												<option value='true' <?php if($user_dashboard_banner == "true") { echo "selected=\"selected\""; } ?>><?= __("Enabled"); ?></option>
+												<option value='false' <?php if($user_dashboard_banner == "false") { echo "selected=\"selected\""; } ?>><?= __("Disabled"); ?></option>
+											</select>
+											<small id="user_dashboard_banner_Help" class="form-text text-muted"><?= __("This allows to disable the global notification banner on the dashboard."); ?></small>
 										</div>
 									</div>
 								</div>