diff --git a/application/controllers/User.php b/application/controllers/User.php index 31cc70c4..50a04105 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -48,6 +48,8 @@ class User extends CI_Controller { $this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator'); $this->form_validation->set_rules('user_timezone', 'Timezone', 'required'); + $data['user_add'] = true; + $data['user_form_action'] = site_url('user/add'); $data['bands'] = $this->bands->get_user_bands(); // Get themes list @@ -94,9 +96,9 @@ class User extends CI_Controller { $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('user/edit', $data); } else { - $this->load->view('user/add', $data); + $this->load->view('user/edit', $data); } $this->load->view('interface_assets/footer'); } else { @@ -182,7 +184,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['language'] = $this->input->post('language'); - $this->load->view('user/add', $data); + $this->load->view('user/edit', $data); $this->load->view('interface_assets/footer'); } } @@ -225,6 +227,7 @@ class User extends CI_Controller { $this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator'); $this->form_validation->set_rules('user_timezone', 'Timezone', 'required'); + $data['user_form_action'] = site_url('user/edit')."/".$this->uri->segment(3);; $data['bands'] = $this->bands->get_user_bands(); // Get themes list diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 50253b4d..e71da6d1 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Избор за колона 5 (само за $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 3f2b8657..c51c855b 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = '样式表'; $lang['account_personal_information'] = '个人信息'; $lang['account_first_name'] = '姓'; $lang['account_last_name'] = '名'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = '呼号'; $lang['account_gridsquare'] = '梅登海德网格'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Cloudlog 中对 Winkeyer 的支持是实验性的，请在开启前先阅读 https://github.com/magicbug/Cloudlog/wiki/Winkey。"; $lang['account_winkeyer_enabled'] = "启用 Winkeyer 功能"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index 93b10d34..b524c7f2 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = 'Styl'; $lang['account_personal_information'] = 'Osobní informace'; $lang['account_first_name'] = 'Jméno'; $lang['account_last_name'] = 'Příjmení'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Značka'; $lang['account_gridsquare'] = 'Locátor'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; $lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 6380e241..72491743 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Choose column 5 (only for logbook)'; $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 893a02e9..a461e07e 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Choose column 5 (only for logbook)'; $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,8 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; $lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index eaa2157e..217044f2 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Sarake 5 (vain lokikirjassa)'; $lang['account_create_user_account'] = 'Luo käyttäjätili'; $lang['account_edit_account'] = 'Muokkaa käyttäjätiliä'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'käyttäjänimi'; @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = 'Tyylisivu'; $lang['account_personal_information'] = 'Henkilötiedot'; $lang['account_first_name'] = 'Etunimi'; $lang['account_last_name'] = 'Sukunimi'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Radioamatöörikutsu'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index 4767abd9..9f5dd6a3 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = "Contenu colonne 5 (uniquement pour logbook)"; $lang['account_create_user_account'] = "Créer un compte"; $lang['account_edit_account'] = "Editer un compte"; -$lang['account_account_information'] = "Informations du compte"; +$lang['account_account_information'] = "Compte"; $lang['account_user'] = "Compte"; $lang['account_word_edited'] = "mis à jour"; $lang['account_username'] = "Utilisateur"; @@ -118,4 +118,10 @@ $lang['account_winkeyer_enabled'] = "Activer Winkeyer"; $lang['account_map_params'] = "Paramètre de la carte"; $lang['account_map_qso_by_default'] = "QSO (par défaut)"; $lang['account_map_qso_confirm'] = "QSO (confirmé)"; -$lang['account_map_qso_confirm_same_qso'] = "(Si 'Non', sera affiché comme ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(Si 'Non', sera affiché comme ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "Informations Générales"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Valeur par défaut"; +$lang['account_miscellaneous'] = "Divers"; \ No newline at end of file diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 13f9a5f8..e9e4cac6 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -16,7 +16,7 @@ $lang['account_account_information'] = 'Benutzerkonto Informationen'; $lang['account_user'] = "Benutzer"; $lang['account_word_edited'] = "bearbeitet"; $lang['account_username'] = 'Benutzername'; -$lang['account_email_address'] = 'Emailadresse'; +$lang['account_email_address'] = 'E-Mail Adresse'; $lang['account_password'] = 'Passwort'; $lang['account_roles'] = 'Rollen'; @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = 'Stylesheet'; $lang['account_personal_information'] = 'Informationen'; $lang['account_first_name'] = 'Vorname'; $lang['account_last_name'] = 'Nachname'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Rufzeichen'; $lang['account_gridsquare'] = 'Planquadrat'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Die Winkeyer Unterstützung in Cloudlog ist sehr experimentell. Lese zuerst den Wikieintrag auf https://github.com/magicbug/Cloudlog/wiki/Winkey bevor du ihn einschaltest."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Eingeschaltet"; -$lang['account_map_params'] = "Settings for map"; -$lang['account_map_qso_by_default'] = "QSO (by default)"; -$lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_params'] = "Karten Einstellungen"; +$lang['account_map_qso_by_default'] = "QSO (standardmässig)"; +$lang['account_map_qso_confirm'] = "QSO (bestätigte)"; +$lang['account_map_qso_confirm_same_qso'] = "(Falls 'Nein', wird '".$lang['account_map_qso_by_default']."' verwendet)"; + +$lang['account_general_information'] = "Generelle Informationen"; +$lang['account_qso_logging_options'] = "QSO-Logging Optionen"; +$lang['account_third_party_services'] = "Externe Dienste"; +$lang['account_default_values'] = "Standardwerte / Favoriten"; +$lang['account_miscellaneous'] = "Verschiedenes"; \ No newline at end of file diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index ea760e02..d832b6cc 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Επιλογή στήλης 5 (Μόνο για $lang['account_create_user_account'] = "Create User Account"; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index ec9f3eab..439380ef 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Scegli colonna 5 (solo per il logbook)'; $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index fc9b44e1..b163ed3f 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Kolumna 5 (tylko dla logu)'; $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 23fc1cef..fb94eb67 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = 'Шаблон'; $lang['account_personal_information'] = 'Персональная информация'; $lang['account_first_name'] = 'Имя'; $lang['account_last_name'] = 'Фамилия'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Позывной'; $lang['account_gridsquare'] = 'QTH локатор'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Поддержка Winkeyer в Cloudlog в стадии эксперимента, прочитайте сначала вики (https://github.com/magicbug/Cloudlog/wiki/Winkey) перед включением."; $lang['account_winkeyer_enabled'] = "Функционал Winkeyer включен"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index af08dfce..526337b6 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = 'Columna 5 (solo en logbook)'; $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index 910bb173..5cad692a 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -29,6 +29,8 @@ $lang['account_stylesheet'] = 'Stilmall'; $lang['account_personal_information'] = 'Personlig information'; $lang['account_first_name'] = 'Förnamn'; $lang['account_last_name'] = 'Efternamn'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 0dc5828c..60ba989f 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -12,7 +12,7 @@ $lang['account_column5_text'] = '5. sütunu seçin (sadece kayıt defteri için) $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; -$lang['account_account_information'] = 'Account Information'; +$lang['account_account_information'] = "Account"; $lang['account_user'] = "User"; $lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; @@ -26,9 +26,11 @@ $lang['account_word_admin'] = 'Admin'; $lang['account_theme'] = 'Theme'; $lang['account_stylesheet'] = 'Stylesheet'; -$lang['account_personal_information'] = 'Personal Information'; +$lang['account_personal_information'] = "Personal"; $lang['account_first_name'] = 'First Name'; $lang['account_last_name'] = 'Last Name'; + +$lang['account_hamradio_information'] = "Ham Radio"; $lang['account_callsign'] = 'Callsign'; $lang['account_gridsquare'] = 'Gridsquare'; @@ -84,7 +86,7 @@ $lang['account_eqsl'] = 'eQSL'; $lang['account_eqslcc_username'] = 'eQSL.cc Username'; $lang['account_eqslcc_password'] = 'eQSL.cc Password'; -$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_save_account_changes'] = "Save Account"; $lang['account_create_account'] = 'Create Account'; $lang['account_delete_user_account'] = 'Delete User Account'; @@ -115,7 +117,13 @@ $lang['account_winkeyer'] = 'Winkeyer'; $lang['account_winkeyer_hint'] = "Winkeyer support in Cloudlog is very experimental read the wiki first at https://github.com/magicbug/Cloudlog/wiki/Winkey before enabling."; $lang['account_winkeyer_enabled'] = "Winkeyer Features Enabled"; -$lang['account_map_params'] = "Settings for map"; +$lang['account_map_params'] = "Map Settings"; $lang['account_map_qso_by_default'] = "QSO (by default)"; $lang['account_map_qso_confirm'] = "QSO (confirmed)"; -$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; \ No newline at end of file +$lang['account_map_qso_confirm_same_qso'] = "(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"; + +$lang['account_general_information'] = "General Information"; +$lang['account_qso_logging_options'] = "QSO Logging Options"; +$lang['account_third_party_services'] = "Third Party Services"; +$lang['account_default_values'] = "Default Values"; +$lang['account_miscellaneous'] = "Miscellaneous"; \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 6b255491..70ffb28a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -3067,7 +3067,7 @@ function viewEqsl(picture, callsign) { -uri->segment(1) == "user") && ($this->uri->segment(2) == "edit")) { ?> +uri->segment(1) == "user") { ?> diff --git a/application/views/user/add.php b/application/views/user/add.php deleted file mode 100644 index ca269bd4..00000000 --- a/application/views/user/add.php +++ /dev/null @@ -1,649 +0,0 @@ -
-

- -

- session->flashdata('notice')) { ?> -
- session->flashdata('notice'); ?> -
- - - load->helper('form'); ?> - - -
-
-
-
-
- -
-
- -
- - - ".$username_error."
"; } ?> -
- -
- - - ".$email_error."
"; } ?> -
- -
- - - ".$password_error."
"; } ?> -
- -
-
- - -
-
-
- -
-
-
- - -
- -
-
- -
- -
-
-
- -
-
- -
- - -
-
-
- -
- -
-
-
-
-
- -
-
- -
- - - ".$firstname_error."
"; } ?> -
-
- - - ".$lastname_error."
"; } ?> -
- -
- - - ".$callsign_error."
"; } ?> -
- -
- - - ".$locator_error."
"; } ?> -
- - - - - - -
-
-
- -
-
- -
- - -
- -
- - - -
- -
- - - - -
- - -
- - - -
- config->item('cl_multilanguage')) { ?> -
- - - -
- - -
-
- -
- -
-
-
-
-
- -
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
-
-
- -
-
-
-
- -
-
- -
-
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- - -
- -
-
- -
-
- -
- -
-
-
- -
-
-
- -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
- -
-
-
-
-
-
-
-
-
-
- -
-
- -
- - -
-
-
-
- -
-
-
- -
-
- -
- - -
- -
- -
-
-
-
-
-
-
-
-
- -
-
- -
- - -
-
-
-
-
-
-
- -
-
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
- -
- '; ?> - -
-
- '; ?> - -
-
- '; ?> - -
-
- '; ?> - -
-
-
-
-
-
- - -
- -
-
- - diff --git a/application/views/user/edit.php b/application/views/user/edit.php index c5f9bd98..0e8d4923 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -1,7 +1,12 @@

- - + ".$user_name.""; + } + ?> +

session->flashdata('success')) { ?> @@ -27,724 +32,743 @@ load->helper('form'); ?> -
uri->segment(3); ?>" name="users" autocomplete="off"> -
-
-
-
- + +
+ +
+

+ +

+
+
+
+ +
+
+
+
+
+ + + ".$username_error.""; } ?> +
+ +
+ + + ".$email_error.""; } ?> +
+ +
+ +
+ + +
+ ".$password_error.""; } else { ?> + + +
+ +
+
+ + session->userdata('user_type') == 99) { ?> + + config->item('auth_level'); + echo $l[$user_type]; + }?> +
+
+
+
+ + +
+
+
+
+
+ + + ".$firstname_error.""; } else { ?> + +
+ +
+ + + ".$lastname_error.""; } else { ?> + +
+
+
+
+ +
+
+
+
+
+ + + ".$callsign_error.""; } else { ?> + +
+ +
+ + + ".$locator_error.""; } else { ?> + +
+
+
+
-
-
- - - ".$username_error."
"; } ?> +
+
+
+ +
+

+ +

+
+
+
+ +
+
+
+
+
+ + + +
+
+ config->item('cl_multilanguage')) { ?> +
+ + + +
+ + +
+ + +
+ +
+ + + + +
+ +
+ + + + +
+
+
+
+ + +
+
+
+
+
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+
+
+
+ + +
+
+
+
+
+ + + + +
+ +
+
+ + + + +
+ +
+
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+
+
+
-
- - - ".$email_error."
"; } ?> -
+
+ +
+
+
+
+
+ + + +
+ +
+
+ + + + +
-
- - - ".$password_error."
"; } else { ?> -
+
+ + + + +
+
+
+
+ + + session->userdata('user_id') == $this->uri->segment(3)) { ?> +
+
+
lang->line('account_map_params'); ?>
+
+
+
+
+
+
+
+
+ +
lang->line('general_word_not_display'),0,10).'.':("")); ?>
+
+
+ ".(($val=="0")?$this->lang->line('general_word_not_display'):("")).""; + } ?> +
+
+
+
" data-icon="station" />
+
+
+
+ +
+
+
+ +
"; ?>
+
+
+ "; + } ?> +
+
+
+ +
+
+
+
+ + +
+
+
+ +
lang->line('general_word_no'):("")); ?>
+
+
+ ".(($val=="0")?$this->lang->line('general_word_no'):("")).""; + } ?> +
+
+
+ " data-icon="qsoconfirm" /> +
+
+
+
+ +
+
+ +
+
+
+
+
-
-
-
-
-
-
- -
-
-
- +
+ +
+
+
+
+
+ + + +
- session->userdata('user_type') == 99) { ?> - - config->item('auth_level'); - echo $l[$user_type]; - }?> +
+
+
-
+
+ +
+

+ +

+
+
+
+ +
+
+ +
+
+ + + +
+
+ +
+ '; ?> + +
+
+ '; ?> + +
+
+ '; ?> + +
+
+ '; ?> + +
+
+
+
+
+
+
+
+
+ +
+

+ +

+
+
+
+ +
+
+
+
+
+ + + ".$userlotwname_error.""; } ?> +
-
-
-
- -
-
-
- - -
-
-
-
+
+ +
+ + +
+ ".$lotwpassword_error.""; } else { ?> + + +
+
+
+
+ + +
+
+
+
+
+ + + ".$eqslusername_error.""; } ?> +
+ +
+ +
+ + +
+ ".$eqslpassword_error.""; } else { ?> + + +
+
+
+
+ + +
+
+
+
+
+ + + + ".$userclublogname_error.""; } ?> +
+ +
+ +
+ + +
+ ".$clublogpassword_error.""; } else { ?> + + +
+
+
+
+
+
+
+
+ +
+

+ +

+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + + + +
+
+
+
+
+
+
+
- -
-
- -
-
-
- -
-
-
- - - ".$firstname_error."
"; } else { ?> - -
- -
- - - ".$lastname_error."
"; } else { ?> - -
- -
- - - ".$callsign_error."
"; } else { ?> - -
- -
- - - ".$locator_error."
"; } else { ?> - -
-
-
-
- -
-
-
- -
-
-
- - -
- -
- - - -
- -
- - - -
- -
- - - -
- - config->item('cl_multilanguage')) { ?> -
- - - -
- -
-
-
-
- -
-
- -
-
-
- -
-
-
- - - ".$userlotwname_error."
"; } ?> -
- -
- - - ".$lotwpassword_error."
"; } else { ?> -
- -
-
-
-
- - -
-
-
- -
-
-
- - - ".$eqslusername_error."
"; } ?> -
- -
- - - ".$eqslpassword_error."
"; } else { ?> -
- -
-
- - - - -
-
- -
-
-
- -
-
-
- - -
- ".$userclublogname_error."
"; } ?> - -
- -
- - - ".$clublogpassword_error."
"; } else { ?> -
- -
-
-
- -
-
-
- -
-
-
- - -
-
- - - -
-
- - - -
-
-
-
- -
-
-
-
-
- -
-
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
-
-
-
- -
-
-
- -
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
-
- - -
-
- -
-
-
-
-
-
-
-
-
- -
-
-
- - -
- -
-
-
- - -
-
-
- -
-
-
- - -
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
- - -
- -
-
-
-
-
-
- -
-
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
- -
- '; ?> - -
-
- '; ?> - -
-
- '; ?> - -
-
- '; ?> - -
-
-
-
-
- - session->userdata('user_id') == $this->uri->segment(3)) { ?> - -
-
-
- lang->line('account_map_params'); ?> -
-
-
-
-
-
-
-
-
- -
lang->line('general_word_not_display'),0,10).'.':("")); ?>
-
-
- ".(($val=="0")?$this->lang->line('general_word_not_display'):("")).""; - } ?> -
-
-
-
" data-icon="station" />
-
-
-
- -
-
-
- -
"; ?>
-
-
- "; - } ?> -
-
-
- -
-
-
-
- -
-
-
-
- -
lang->line('general_word_no'):("")); ?>
-
-
- ".(($val=="0")?$this->lang->line('general_word_no'):("")).""; - } ?> -
-
-
- " data-icon="qsoconfirm" /> -
-
-
-
- -
-
- -
-
-
-
-
- -
- -
- -
-
-
-
- -
-
-
- -

- - - - - -
-
-
-
-
-
- -
- -
-
+ diff --git a/assets/css/blue/overrides.css b/assets/css/blue/overrides.css index 8a17cd6d..545b8e09 100644 --- a/assets/css/blue/overrides.css +++ b/assets/css/blue/overrides.css @@ -1,9 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-bg: #2b3e50; + --cl-border-btn-pwd: var(--cl-bg); +} body { - background-color: #2b3e50; + background-color: var(--cl-bg); } .table { @@ -12,7 +16,7 @@ body { --bs-table-active-color: #fff; --bs-table-hover-color: #fff; --bs-table-bg: #3d4e5e; - --bs-table-accent-bg: #2b3e50; + --bs-table-accent-bg: var(--cl-bg); } .table-striped tbody > tr.activeRow { @@ -106,7 +110,7 @@ div.alert-danger { } .bootstrap-dialog.type-primary .modal-header { - background-color: #2b3e50; + background-color: var(--cl-bg); } .selectize-dropdown, @@ -175,3 +179,15 @@ div.alert-danger { #edit_qso:not(.btn) { float: left; } + +.accordion { + --bs-accordion-bg: var(--cl-bg); + --bs-accordion-btn-bg: #4e5e6c; + --bs-accordion-active-bg: #4e5e6c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--cl-bg); +} +.accordion-body { + border: 1px solid #4e5e6c; +} diff --git a/assets/css/blue_wide/overrides.css b/assets/css/blue_wide/overrides.css index f356c767..75bd3269 100644 --- a/assets/css/blue_wide/overrides.css +++ b/assets/css/blue_wide/overrides.css @@ -1,9 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-bg: #2b3e50; + --cl-border-btn-pwd: var(--cl-bg); +} body { - background-color: #2b3e50; + background-color: var(--cl-bg); } .table { @@ -12,7 +16,7 @@ body { --bs-table-active-color: #fff; --bs-table-hover-color: #fff; --bs-table-bg: #3d4e5e; - --bs-table-accent-bg: #2b3e50; + --bs-table-accent-bg: var(--cl-bg); } .table-striped tbody > tr.activeRow { @@ -106,7 +110,7 @@ div.alert-danger { } .bootstrap-dialog.type-primary .modal-header { - background-color: #2b3e50; + background-color: var(--cl-bg); } .selectize-dropdown, @@ -229,3 +233,15 @@ div.alert-danger { #qsomap { height: 400px !important; } + +.accordion { + --bs-accordion-bg: var(--cl-bg); + --bs-accordion-btn-bg: #4e5e6c; + --bs-accordion-active-bg: #4e5e6c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--cl-bg); +} +.accordion-body { + border: 1px solid #4e5e6c; +} \ No newline at end of file diff --git a/assets/css/cosmo/overrides.css b/assets/css/cosmo/overrides.css index 15c914e3..a30ec2ab 100644 --- a/assets/css/cosmo/overrides.css +++ b/assets/css/cosmo/overrides.css @@ -2,6 +2,10 @@ * No overrides for the default theme as it aligns with general.css */ +:root{ + --cl-border-btn-pwd:var(--bs-border-color); +} + .selectize-input { border-radius: 0; } @@ -29,4 +33,9 @@ TD.qrz { white-space: nowrap; +} + +.accordion { + --bs-accordion-btn-bg: #f9f9f9; + --bs-accordion-active-bg: #f9f9f9; } \ No newline at end of file diff --git a/assets/css/cosmo_wide/overrides.css b/assets/css/cosmo_wide/overrides.css index 5e0d8f97..b6742d6c 100644 --- a/assets/css/cosmo_wide/overrides.css +++ b/assets/css/cosmo_wide/overrides.css @@ -2,6 +2,10 @@ * No overrides for the default theme as it aligns with general.css */ +:root{ + --cl-border-btn-pwd:var(--bs-border-color); +} + .selectize-input { border-radius: 0; } @@ -92,4 +96,10 @@ TD.qrz { white-space: nowrap; -} \ No newline at end of file +} + +.accordion { + --bs-accordion-btn-bg: #f9f9f9; + --bs-accordion-active-bg: #f9f9f9; +} + diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 04347ff1..47d0475c 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -1,6 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root{ + --cl-border-btn-pwd:#333; +} + +.card-header { + color: white; +} .awardsBgDanger a { color: white; @@ -168,3 +175,16 @@ path.grid-worked { text-align: left !important; white-space: nowrap; } + +.accordion { + --bs-accordion-active-color: #FFFFFF; + --bs-accordion-bg: var(--bs-body-bg); + --bs-accordion-btn-bg: #2c2c2c; + --bs-accordion-active-bg: #2c2c2c; + --bs-accordion-btn-focus-border-color: #FFFFFF; + --bs-accordion-btn-focus-box-shadow: initial; + --bs-accordion-border-color: #2c2c2c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--bs-body-bg); +} \ No newline at end of file diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index c849ac0a..5051981d 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -1,6 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root{ + --cl-border-btn-pwd:#333; +} + +.card-header { + color: white; +} .awardsBgDanger a { color: white; @@ -222,3 +229,17 @@ path.grid-worked { #qsomap { height: 400px !important; } + + +.accordion { + --bs-accordion-active-color: #FFFFFF; + --bs-accordion-bg: var(--bs-body-bg); + --bs-accordion-btn-bg: #2c2c2c; + --bs-accordion-active-bg: #2c2c2c; + --bs-accordion-btn-focus-border-color: #FFFFFF; + --bs-accordion-btn-focus-box-shadow: initial; + --bs-accordion-border-color: #2c2c2c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--bs-body-bg); +} \ No newline at end of file diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 919eb531..a5cf98bf 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -1,6 +1,9 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-border-btn-pwd: var(--bs-body-bg); +} .table { --bs-table-border-color: #444444; @@ -187,3 +190,14 @@ div.alert-danger { white-space: nowrap; } +.accordion { + --bs-accordion-active-color: #FFFFFF; + --bs-accordion-btn-bg: #444444; + --bs-accordion-active-bg: #444444; + --bs-accordion-border-color: #444444; +} +.accordion-button.collapsed { + border-bottom:1px solid var(--bs-body-bg); +} + + diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index 5027a0fb..fd50f4b1 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -1,6 +1,9 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-border-btn-pwd: var(--bs-body-bg); +} .table { --bs-table-border-color: #444444; @@ -242,3 +245,13 @@ div.alert-danger { #qsomap { height: 400px !important; } + +.accordion { + --bs-accordion-active-color: #FFFFFF; + --bs-accordion-btn-bg: #444444; + --bs-accordion-active-bg: #444444; + --bs-accordion-border-color: #444444; +} +.accordion-button.collapsed { + border-bottom:1px solid var(--bs-body-bg); +} \ No newline at end of file diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index c8b304fc..97cdbb74 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -1,3 +1,7 @@ +:root { + --cl-border-btn-pwd:var(--bs-border-color); +} + thead > tr > td { background-color: aliceblue !important; } @@ -48,3 +52,8 @@ thead > tr > td { text-align: left !important; white-space: nowrap; } + +.accordion { + --bs-accordion-btn-bg: #f9f9f9; + --bs-accordion-active-bg: #f9f9f9; +} \ No newline at end of file diff --git a/assets/css/default_wide/overrides.css b/assets/css/default_wide/overrides.css index 4178bdbb..9e5ba3dc 100644 --- a/assets/css/default_wide/overrides.css +++ b/assets/css/default_wide/overrides.css @@ -1,3 +1,7 @@ +:root { + --cl-border-btn-pwd:var(--bs-border-color); +} + thead > tr > td { background-color: aliceblue !important; } @@ -88,3 +92,8 @@ thead > tr > td { #qsomap { height: 400px !important; } + +.accordion { + --bs-accordion-btn-bg: #f9f9f9; + --bs-accordion-active-bg: #f9f9f9; +} \ No newline at end of file diff --git a/assets/css/general.css b/assets/css/general.css index c71c61a6..c9386e75 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -333,7 +333,7 @@ TD.lotw { * Debug CSS */ -.debug_main .card { +.card { margin-bottom: 10px; } @@ -743,4 +743,12 @@ table.dataTable tfoot td { #partial_view .table-responsive { overflow-x: unset; +} + +label { + margin-bottom: 0.25rem; +} + +.btn-pwd-showhide, .btn-pwd-showhide:hover { + border: 1px solid var(--cl-border-btn-pwd); } \ No newline at end of file diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index b8f883a8..3f2770a6 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -1,9 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-bg: #2b3e50; + --cl-border-btn-pwd: var(--cl-bg); +} body { - background-color: #2b3e50; + background-color: var(--cl-bg); } .table { @@ -12,7 +16,7 @@ body { --bs-table-active-color: #fff; --bs-table-hover-color: #fff; --bs-table-bg: #3d4e5e; - --bs-table-accent-bg: #2b3e50; + --bs-table-accent-bg: var(--cl-bg); } .table-striped tbody > tr.activeRow { @@ -106,7 +110,7 @@ div.alert-danger { } .bootstrap-dialog.type-primary .modal-header { - background-color: #2b3e50; + background-color: var(--cl-bg); } .selectize-dropdown, @@ -175,3 +179,15 @@ div.alert-danger { #edit_qso:not(.btn) { float: left; } + +.accordion { + --bs-accordion-bg: var(--cl-bg); + --bs-accordion-btn-bg: #4e5e6c; + --bs-accordion-active-bg: #4e5e6c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--cl-bg); +} +.accordion-body { + border: 1px solid #4e5e6c; +} \ No newline at end of file diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index 1d8fb064..b3302bb4 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -1,9 +1,13 @@ /*! * No overrides for the default theme as it aligns with general.css */ +:root { + --cl-bg: #2b3e50; + --cl-border-btn-pwd: var(--cl-bg); +} body { - background-color: #2b3e50; + background-color: var(--cl-bg); } .table { @@ -12,7 +16,7 @@ body { --bs-table-active-color: #fff; --bs-table-hover-color: #fff; --bs-table-bg: #3d4e5e; - --bs-table-accent-bg: #2b3e50; + --bs-table-accent-bg: var(--cl-bg); } .table-striped tbody > tr.activeRow { @@ -148,7 +152,7 @@ div.alert-danger { } .bootstrap-dialog.type-primary .modal-header { - background-color: #2b3e50; + background-color: var(--cl-bg); } .selectize-dropdown, @@ -229,3 +233,15 @@ div.alert-danger { max-width: 1800px } } + +.accordion { + --bs-accordion-bg: var(--cl-bg); + --bs-accordion-btn-bg: #4e5e6c; + --bs-accordion-active-bg: #4e5e6c; +} +.accordion-button.collapsed { + border-bottom: 1px solid var(--cl-bg); +} +.accordion-body { + border: 1px solid #4e5e6c; +} \ No newline at end of file diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 2c557560..e4e8a2dc 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -572,4 +572,16 @@ function qso_set_eqsl_qslmsg(station_id, force_diff_to_origin=false, object='') }, error: function() { }, }); -} \ No newline at end of file +} + +// [PWD] button show/hide // +function btn_pwd_showhide() { + if ($(this).closest('div').find('input[type="password"]').length>0) { + $(this).closest('div').find('input[type="password"]').attr('type','text'); + $(this).closest('div').find('.fa-eye-slash').removeClass('fa-eye-slash').addClass('fa-eye'); + } else { + $(this).closest('div').find('input[type="text"]').attr('type','password'); + $(this).closest('div').find('.fa-eye').removeClass('fa-eye').addClass('fa-eye-slash'); + } +} +$('.user_edit .btn-pwd-showhide').off('click').on('click', btn_pwd_showhide ); \ No newline at end of file