diff --git a/application/config/migration.php b/application/config/migration.php index 7756a324..f855e92f 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 150; +$config['migration_version'] = 151; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/User.php b/application/controllers/User.php index 7bb77a03..79b740d9 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -91,6 +91,8 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); + $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -127,6 +129,8 @@ class User extends CI_Controller { $this->input->post('user_default_band'), ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''), $this->input->post('user_qso_end_times'), + $this->input->post('user_quicklog'), + $this->input->post('user_quicklog_enter'), $this->input->post('language'), )) { // Check for errors @@ -175,6 +179,8 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); + $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -398,6 +404,18 @@ class User extends CI_Controller { $data['user_qso_end_times'] = $q->user_qso_end_times; } + if($this->input->post('user_quicklog')) { + $data['user_quicklog'] = $this->input->post('user_quicklog', true); + } else { + $data['user_quicklog'] = $q->user_quicklog; + } + + if($this->input->post('user_quicklog_enter')) { + $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter', true); + } else { + $data['user_quicklog_enter'] = $q->user_quicklog_enter; + } + if($this->input->post('user_show_profile_image')) { $data['user_show_profile_image'] = $this->input->post('user_show_profile_image', false); } else { @@ -539,6 +557,8 @@ class User extends CI_Controller { $data['user_default_band'] = $this->input->post('user_default_band'); $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); + $data['user_quicklog'] = $this->input->post('user_quicklog'); + $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 71f8718b..6b714ba4 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index e7c8a468..805cdfb2 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -11,7 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; -$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; @@ -86,6 +88,6 @@ $lang['menu_help'] = 'Help'; $lang['menu_forum'] = 'Forum'; $lang['menu_logout'] = 'Logout'; -$lang['menu_ffma'] = "Fred Fish Memorial Award"; -$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; +$lang['menu_ffma'] = "Fred Fish Memorial Award"; +$lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 2b407ba0..da0bb79d 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предишни контакти'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Посочете стойността на мощността във ватове. Въведете само цифри.'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 069c0a14..f188aa05 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -37,6 +37,12 @@ $lang['account_timezone'] = '时区'; $lang['account_date_format'] = '日期格式'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = '距离单位偏好'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '选择您登录账户时要显示的日期格式'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '选择距离单位'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 24c7b816..e2816873 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = '更新国家文件'; $lang['menu_debug_information'] = '调试信息'; $lang['menu_search_text'] = '搜索呼号'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = '搜索'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = '登录'; $lang['menu_account'] = '账户'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index a5efba4d..6cddddd2 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = '建议'; $lang['qso_title_previous_contacts'] = '先前通联'; $lang['qso_title_image'] = '操作员照片'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = '以瓦特为单位设置功率值。在输入中仅填写数值。'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index c295f5d1..fe962bca 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -37,6 +37,12 @@ $lang['account_timezone'] = 'Časové pásmo'; $lang['account_date_format'] = 'Formát data'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Nastavení měření'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 0281ab9d..3c2a0056 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Aktualizace souborů'; $lang['menu_debug_information'] = 'Informace pro ladění'; $lang['menu_search_text'] = 'Hledat značku'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Hledat'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Přihlásit se'; $lang['menu_account'] = 'Účet'; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 10778550..199d81d8 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Návrhy'; $lang['qso_title_previous_contacts'] = 'Předchozí spojení'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Zadej výkon ve Wattech. Jsou povolen pouz čísla'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 32280eb6..652a9724 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index b2abb354..e863dfe3 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 0eb9e3d5..da6abe60 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggesties'; $lang['qso_title_previous_contacts'] = 'Eerdere verbindingen'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Geef vermogen in Watt. Vermeld alleen cijfers.'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 753a3165..8b809bce 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index 56561034..46a39937 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index ccec36be..e941d170 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Previous Contacts'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Give power value in Watts. Include only numbers in the input.'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index c680f524..e4c69843 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Aikavyöhyke'; $lang['account_date_format'] = 'Päivämäärämuoto'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Mittayksikkömuoto'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Valitse, miten haluat päivämäärät näkyvän, kun olet kirjautunut tilillesi.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Valitse, mitä mittayksikkömuotoa käytetään'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Näytä "Muistio" päävalikossa.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index 2cf11dcc..17041bb7 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Päivitä Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Etsi kutsulla'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Etsi'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Kirjaudu'; $lang['menu_account'] = 'Käyttäjätili'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index b84dcf8b..c6f6a8c8 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Kutsumerkkiehdotukset'; $lang['qso_title_previous_contacts'] = 'Edelliset yhteydet'; $lang['qso_title_image'] = 'Profiilikuva'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Anna teholukema Watteina käyttäen vain numeroita.'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index db4d2c02..dd239ac7 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -37,6 +37,12 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Format de la date'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Unité de mesure'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = '(Sélectionnez le format de date à afficher)'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = '(Choisiez l\'unité de mesure à afficher)'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 56561034..46a39937 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_search_button'] = 'Search'; $lang['menu_login_button'] = 'Login'; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 1519c7d2..6f047690 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_previous_contacts'] = 'Contacts précédents'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Saisissez la ouissance en Watts en utilisant uniquement des chiffres.'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 10e65ccf..68ce2814 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Zeitzone'; $lang['account_date_format'] = 'Datumsformat'; $lang['account_log_end_time'] = 'Logge Endzeiten für QSOs separat'; $lang['account_log_end_time_hint'] = 'Wenn aktiviert, werden QSO Endzeiten separat erfasst. Falls nicht, ist die QSO Endzeit gleich der Startzeit.'; +$lang['account_quicklog_feature'] = "Quicklog Feld"; +$lang['account_quicklog_feature_hint'] = "Mit dieser Option kannst du Rufzeichen auch direkt aus dem Suchfeld in der Menüleiste heraus loggen."; +$lang['account_quicklog_enter'] = "Quicklog - Aktion mit Enter Taste"; +$lang['account_quicklog_enter_hint'] = "Welche Aktion soll ausgeführt werden, wenn Enter gedrückt wird?"; +$lang['account_quicklog_enter_log'] = "Logge Rufzeichen"; +$lang['account_quicklog_enter_search'] = "Suche Rufzeichen"; $lang['account_measurement_preferences'] = 'Entfernungsformat'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.'; $lang['account_cloudlog_language'] = 'Cloudlog Sprache'; $lang['account_choose_cloudlog_language'] = 'Wähle eine Sprache für Cloudlog.'; -$lang['account_main_menu'] = 'Hauptmenü'; +$lang['account_main_menu'] = 'Menü Optionen'; $lang['account_show_notes_in_the_main_menu'] = 'Zeige Notizen im Hauptmenü'; $lang['account_gridsquare_and_location_autocomplete'] = 'Vervollständigung von Planquadrat und Lokation'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 8a0c244e..53898632 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -53,14 +53,16 @@ $lang['menu_user_account'] = 'Benutzerkonten'; $lang['menu_global_options'] = 'Globale Optionen'; $lang['menu_modes'] = 'Modi'; $lang['menu_contests'] = 'Conteste'; -$lang['menu_themes'] = 'Layouts'; +$lang['menu_themes'] = 'Themes'; $lang['menu_backup'] = 'Backup'; $lang['menu_update_country_files'] = 'Update Länderinformationen'; $lang['menu_debug_information'] = 'Debug Informationen'; $lang['menu_search_text'] = 'Rufzeichensuche'; +$lang['menu_search_text_quicklog'] = "Logge/Suche Call"; //"Rufzeichen" wäre zu lang, daher nur "Call". Das wird verstanden. $lang['menu_search_button'] = 'Suche'; +$lang['menu_search_button_qicksearch_log'] = "Logge"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 9e86c42b..470f91e3 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Vorschläge'; $lang['qso_title_previous_contacts'] = 'Vorherige Kontakte'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Rufzeichen'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a4f5d22b..c416f98e 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 31d11350..7036d36f 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Εισήγησης'; $lang['qso_title_previous_contacts'] = 'Προηγούμενες Επαφές'; $lang['qso_title_image'] = 'Εικόνα προφίλ'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Δώστε τιμή ισχύος σε Watts. Συμπεριλάβετε μόνο αριθμούς στην εισαγωγή.'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 65cad6b6..8cd812b1 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 4d28e9ee..ebe78cb7 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Suggerimenti'; $lang['qso_title_previous_contacts'] = 'Contatti Precedenti'; $lang['qso_title_image'] = 'Immagine Profilo'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Dare valore di potenza in Watt. Includere solo numeri nell input.'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 873da71e..6991e02e 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index f56812d6..e6609b67 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugestie'; $lang['qso_title_previous_contacts'] = 'Poprzednie łączności'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Wpisz wartość mocy w watach. W polu podaj same cyfry.'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 51497241..344fd224 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -37,6 +37,12 @@ $lang['account_timezone'] = 'Часовой пояс'; $lang['account_date_format'] = 'Формат даты'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Единицы измерения'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Выберите представление даты для отображения в вашем аккаунте.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Выберите единицы измерения расстояния'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index f812cc5e..e773f528 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Обновить файлы стран'; $lang['menu_debug_information'] = 'Отладочная информация'; $lang['menu_search_text'] = 'Поиск позывного'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Поиск'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Вход'; $lang['menu_account'] = 'Аккаунт'; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 0d5acd81..c2985f2b 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Предложения'; $lang['qso_title_previous_contacts'] = 'Предыдущие контакты'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Укажите мощность в Ваттах (только цифры).'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index f5d04adf..ea813087 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 091150cd..0342107e 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Sugerencias'; $lang['qso_title_previous_contacts'] = 'Contactos previos'; $lang['qso_title_image'] = 'Profile Picture'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Especifique el valor de potencia en Watios (W). Incluya solo números.'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index b9e40395..8e02945f 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,8 +13,8 @@ $lang['account_create_user_account'] = 'Skapa användarkonto'; $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; -$lang['account_user'] = "User"; -$lang['account_word_edited'] = "edited"; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; @@ -37,6 +37,12 @@ $lang['account_timezone'] = 'Tidszon'; $lang['account_date_format'] = 'Datumformat'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Välj hur du vill att datum ska visas när du är inloggad på ditt konto.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Välj i vilken enhetsavstånd som ska visas'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 786d8e1a..95e2a6d6 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Uppdatera landsfiler'; $lang['menu_debug_information'] = 'Debug Info'; $lang['menu_search_text'] = 'Sök Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Sök'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Logga in'; $lang['menu_account'] = 'Konto'; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index a8ba6b0d..0a6343e4 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Förslag'; $lang['qso_title_previous_contacts'] = 'Föregående QSOn'; $lang['qso_title_image'] = 'Profilbild'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Ange effekt i watt, enbart med siffror.'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 8dbffce2..915e113b 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -37,13 +37,19 @@ $lang['account_timezone'] = 'Timezone'; $lang['account_date_format'] = 'Date Format'; $lang['account_log_end_time'] = 'Log End Times for QSOs Separately'; $lang['account_log_end_time_hint'] = 'Choose yes here if you want to log QSO start and end times separately. If set to \'No\' the end time will be the same as start time.'; +$lang['account_quicklog_feature'] = "Quicklog Field"; +$lang['account_quicklog_feature_hint'] = "With this feature, you can log callsigns using the search field in the header."; +$lang['account_quicklog_enter'] = "Quicklog - Action on press Enter"; +$lang['account_quicklog_enter_hint'] = "What action should be performed when Enter is pressed in the quicklog field?"; +$lang['account_quicklog_enter_log'] = "Log Callsign"; +$lang['account_quicklog_enter_search'] = "Search Callsign"; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; $lang['account_cloudlog_language'] = 'Cloudlog Language'; $lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.'; -$lang['account_main_menu'] = 'Main Menu'; +$lang['account_main_menu'] = 'Menu Options'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; $lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index ef9418a1..c511cf4b 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -59,8 +59,10 @@ $lang['menu_update_country_files'] = 'Update Country Files'; $lang['menu_debug_information'] = 'Debug Information'; $lang['menu_search_text'] = 'Search Callsign'; +$lang['menu_search_text_quicklog'] = "Add/Search Callsign"; $lang['menu_search_button'] = 'Search'; +$lang['menu_search_button_qicksearch_log'] = "Log"; $lang['menu_login_button'] = 'Login'; $lang['menu_account'] = 'Account'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index b0d8bdd8..1662b282 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -8,6 +8,9 @@ $lang['qso_title_suggestions'] = 'Öneriler'; $lang['qso_title_previous_contacts'] = 'Önceki Görüşmeler'; $lang['qso_title_image'] = 'Profil Resmi'; +// Quicklog on Dashboard +$lang['qso_quicklog_enter_callsign'] = 'QUICKLOG Enter Callsign'; + // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gücü Watt olarak veriniz. Sadece rakamları giriniz.'; diff --git a/application/migrations/151_user_quicklog.php b/application/migrations/151_user_quicklog.php new file mode 100644 index 00000000..acde25e9 --- /dev/null +++ b/application/migrations/151_user_quicklog.php @@ -0,0 +1,39 @@ +db->field_exists('user_quicklog', 'users')) { + $fields = array( + 'user_quicklog integer DEFAULT 0 AFTER user_default_confirmation', + ); + + $this->dbforge->add_column('users', $fields); + } + if (!$this->db->field_exists('user_quicklog_enter', 'users')) { + $fields = array( + 'user_quicklog_enter integer DEFAULT 0 AFTER user_default_confirmation', + ); + + $this->dbforge->add_column('users', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('user_quicklog', 'users')) { + $this->dbforge->drop_column('users', 'user_quicklog'); + } + if ($this->db->field_exists('user_quicklog_enter', 'users')) { + $this->dbforge->drop_column('users', 'user_quicklog_enter'); + } + } +} \ No newline at end of file diff --git a/application/models/User_model.php b/application/models/User_model.php index 46eb03da..1757fe34 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,7 @@ class User_Model extends CI_Model { $measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup, $user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, - $user_default_band, $user_default_confirmation, $user_qso_end_times, $language) { + $user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $user_quicklog_enter, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -157,6 +157,8 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($user_default_band), 'user_default_confirmation' => xss_clean($user_default_confirmation), 'user_qso_end_times' => xss_clean($user_qso_end_times), + 'user_quicklog' => xss_clean($user_quicklog), + 'user_quicklog_enter' => xss_clean($user_quicklog_enter), 'language' => xss_clean($language), ); @@ -219,6 +221,8 @@ class User_Model extends CI_Model { 'user_default_band' => xss_clean($fields['user_default_band']), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), + 'user_quicklog' => xss_clean($fields['user_quicklog']), + 'user_quicklog_enter' => xss_clean($fields['user_quicklog_enter']), 'language' => xss_clean($fields['language']), 'winkey' => xss_clean($fields['user_winkey']), ); @@ -346,6 +350,8 @@ class User_Model extends CI_Model { 'user_default_band' => $u->row()->user_default_band, 'user_default_confirmation' => $u->row()->user_default_confirmation, 'user_qso_end_times' => isset($u->row()->user_qso_end_times) ? $u->row()->user_qso_end_times : 1, + 'user_quicklog' => isset($u->row()->user_quicklog) ? $u->row()->user_quicklog : 1, + 'user_quicklog_enter' => isset($u->row()->user_quicklog_enter) ? $u->row()->user_quicklog_enter : 1, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index dc686380..2e66e543 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -188,7 +188,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
- + diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 9278c2c0..eaf61e65 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -168,21 +168,25 @@ config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>