diff --git a/application/controllers/User.php b/application/controllers/User.php index 0c67da620..c344ca598 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -613,6 +613,7 @@ class User extends CI_Controller { 'qsoconfirm'=>array('0', 'fas fa-broadcast-tower', 'fas fa-user', 'fas fa-dot-circle', 'fas fa-check-circle' )); $data['user_locations_quickswitch'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false'); + $data['user_utc_headermenu'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'utc_headermenu'))->row()->option_value ?? 'false'); $this->load->view('interface_assets/header', $data); $this->load->view('user/edit', $data); @@ -661,6 +662,7 @@ class User extends CI_Controller { $this->user_options_model->del_option('map_custom','gridsquare'); } $this->user_options_model->set_option('header_menu', 'locations_quickswitch', array('boolean'=>xss_clean($this->input->post('user_locations_quickswitch', true)))); + $this->user_options_model->set_option('header_menu', 'utc_headermenu', array('boolean'=>xss_clean($this->input->post('user_utc_headermenu', true)))); $this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited')); redirect('user/edit/'.$this->uri->segment(3)); } else { @@ -703,6 +705,7 @@ class User extends CI_Controller { $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); $data['user_locations_quickswitch'] = $this->input->post('user_locations_quickswitch', true); + $data['user_utc_headermenu'] = $this->input->post('user_utc_headermenu', true); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $data['user_hamsat_key'] = $this->input->post('user_hamsat_key'); diff --git a/application/language/bulgarian/gridsquares_lang.php b/application/language/bulgarian/gridsquares_lang.php index 07bc32c96..5c6faed45 100644 --- a/application/language/bulgarian/gridsquares_lang.php +++ b/application/language/bulgarian/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/chinese_simplified/gridsquares_lang.php b/application/language/chinese_simplified/gridsquares_lang.php index 3efa55860..109e43c76 100644 --- a/application/language/chinese_simplified/gridsquares_lang.php +++ b/application/language/chinese_simplified/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = '网格'; $lang['gridsquares_total_count'] = '总数'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "最低数量"; $lang['gridsquares_show_qsos'] = "显示 QSO"; diff --git a/application/language/czech/gridsquares_lang.php b/application/language/czech/gridsquares_lang.php index 582dd55cb..fc37abfa8 100644 --- a/application/language/czech/gridsquares_lang.php +++ b/application/language/czech/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'lokátor'; $lang['gridsquares_total_count'] = 'Celkový počet'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/dutch/gridsquares_lang.php b/application/language/dutch/gridsquares_lang.php index 8e17c3d9d..f52b4bab8 100644 --- a/application/language/dutch/gridsquares_lang.php +++ b/application/language/dutch/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php index f75b472b2..5c6faed45 100644 --- a/application/language/english/gridsquares_lang.php +++ b/application/language/english/gridsquares_lang.php @@ -14,13 +14,13 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; $lang['gridsquares_show_map'] = "Show Map"; $lang['gridsquares_band'] = 'Band'; $lang['gridsquares_mode'] = 'Mode'; -$lang['gridsquares_orbit'] = 'Orbit'; $lang['gridsquares_sat'] = 'Satellite'; $lang['gridsquares_confirmation'] = 'Confirmation'; diff --git a/application/language/finnish/gridsquares_lang.php b/application/language/finnish/gridsquares_lang.php index 4d845ba5e..986127aca 100644 --- a/application/language/finnish/gridsquares_lang.php +++ b/application/language/finnish/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/french/gridsquares_lang.php b/application/language/french/gridsquares_lang.php index 32397533d..0ae8c3e87 100644 --- a/application/language/french/gridsquares_lang.php +++ b/application/language/french/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = "Grilles des Locators"; $lang['gridsquares_total_count'] = "Total"; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Nbre d'activation minimum"; $lang['gridsquares_show_qsos'] = "Afficher les QSO"; @@ -34,4 +35,3 @@ $lang['gridsquares_gridsquares_paper'] = "Locator confirmé par Carte QSL"; $lang['gridsquares_gridsquares_not_confirmed'] = "Locator non confirmés"; $lang['gridsquares_gridsquares_total_worked'] = "Total des Locator réalisés"; $lang['gridsquares_gridsquares_total_activated'] = "Total des Locator activatés"; - diff --git a/application/language/german/gridsquares_lang.php b/application/language/german/gridsquares_lang.php index 40eba1c21..9a0d4aa36 100644 --- a/application/language/german/gridsquares_lang.php +++ b/application/language/german/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_activated_but_not_confirmed_is_red'] = 'Aktiviert aber nicht $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'Diese Karte beinhaltet keine Satelliten-, Internet- oder Relais-QSOs'; $lang['gridsquares_grid_squares'] = 'Planquadrate'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_total_count'] = 'Summe'; $lang['gridsquares_minimum_count'] = "Minimale Anzahl"; $lang['gridsquares_show_qsos'] = "Zeige QSO's"; diff --git a/application/language/greek/gridsquares_lang.php b/application/language/greek/gridsquares_lang.php index 07bc32c96..5c6faed45 100644 --- a/application/language/greek/gridsquares_lang.php +++ b/application/language/greek/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/italian/gridsquares_lang.php b/application/language/italian/gridsquares_lang.php index 07bc32c96..5c6faed45 100644 --- a/application/language/italian/gridsquares_lang.php +++ b/application/language/italian/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/polish/gridsquares_lang.php b/application/language/polish/gridsquares_lang.php index 07bc32c96..5c6faed45 100644 --- a/application/language/polish/gridsquares_lang.php +++ b/application/language/polish/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/russian/gridsquares_lang.php b/application/language/russian/gridsquares_lang.php index c93f9108f..533992c62 100644 --- a/application/language/russian/gridsquares_lang.php +++ b/application/language/russian/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'квадрат(/-а/-ов)'; $lang['gridsquares_total_count'] = 'Всего'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Минимальное количество"; $lang['gridsquares_show_qsos'] = "Показать QSO"; diff --git a/application/language/spanish/gridsquares_lang.php b/application/language/spanish/gridsquares_lang.php index 3716fbecd..ddd006d72 100644 --- a/application/language/spanish/gridsquares_lang.php +++ b/application/language/spanish/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid squares'; $lang['gridsquares_total_count'] = 'Cuenta total'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Cuenta Mínima"; $lang['gridsquares_show_qsos'] = "Ver QSOs"; diff --git a/application/language/swedish/gridsquares_lang.php b/application/language/swedish/gridsquares_lang.php index 55122db15..f72af9e89 100644 --- a/application/language/swedish/gridsquares_lang.php +++ b/application/language/swedish/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Totalt antal'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/language/turkish/gridsquares_lang.php b/application/language/turkish/gridsquares_lang.php index 07bc32c96..5c6faed45 100644 --- a/application/language/turkish/gridsquares_lang.php +++ b/application/language/turkish/gridsquares_lang.php @@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos $lang['gridsquares_grid_squares'] = 'grid square'; $lang['gridsquares_total_count'] = 'Total count'; +$lang['gridsquares_orbit'] = "Orbit"; $lang['gridsquares_minimum_count'] = "Minimum Count"; $lang['gridsquares_show_qsos'] = "Show QSO's"; diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 3fc91f4f0..9a3b4795e 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -467,7 +467,16 @@