diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 395c8a67..c99d86ac 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -38,6 +38,7 @@ class QSO extends CI_Controller { $data['iota'] = $this->logbook_model->fetchIota(); $data['modes'] = $this->modes->active(); $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); + $data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->library('form_validation'); diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 42fac1b1..41002e02 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Login'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL of Mastodonserver'; -$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map'; +$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation'; $lang['account_gridmap_default_band'] = 'Default Band'; -$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)'; - - +$lang['account_qsl_settings'] = 'Default QSL-Methods'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index cf72c87d..cec2a367 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -96,8 +96,6 @@ $lang['account_login'] = 'Anmeldung'; $lang['account_mastodon'] = 'Mastodonserver'; $lang['account_user_mastodon'] = 'URL des Mastodonservers'; -$lang['account_gridmap_settings'] = 'Einstellung der Planquadratkarte'; +$lang['account_default_band_settings'] = 'Einstellung für Standardband und -bestätigungsmethode'; $lang['account_gridmap_default_band'] = 'Standardband'; -$lang['account_qsl_settings'] = 'QSL-Methoden, die in der Planquadratkarte und beim anlegen eines QSOs angezeigt werden'; - - +$lang['account_qsl_settings'] = 'Standard QSL-Methoden'; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3f9a6850..66dda593 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -107,8 +107,10 @@ echo ''; foreach($bandgroup as $band) { echo ''."\n"; + if ($this->session->userdata('band') == $band || $user_gridmap_default_band == $band) { + echo ' selected'; + } + echo '>' . $band . ''."\n"; } echo ''; } diff --git a/application/views/user/add.php b/application/views/user/add.php index 2c57e394..3003333f 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -546,7 +546,7 @@
- +
@@ -564,7 +564,7 @@
- +
- +
@@ -562,13 +562,8 @@ } ?>
-
-
- -
-
- +