diff --git a/application/controllers/User.php b/application/controllers/User.php index e34e91f1..bdddf958 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -11,6 +11,7 @@ class User extends CI_Controller { 'account', 'lotw', 'eqsl', + 'admin', )); } @@ -21,7 +22,7 @@ class User extends CI_Controller { $data['results'] = $this->user_model->users(); - $data['page_title'] = "User Accounts"; + $data['page_title'] = $this->lang->line('admin_user_accounts'); $this->load->view('interface_assets/header', $data); $this->load->view('user/main'); diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 7db5d0ed..f73f79bb 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -8,3 +8,84 @@ $lang['account_column2_text'] = 'Choose column 2'; $lang['account_column3_text'] = 'Choose column 3'; $lang['account_column4_text'] = 'Choose column 4'; $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_username'] = 'Username'; +$lang['account_email_address'] = 'Email Address'; +$lang['account_password'] = 'Password'; + +$lang['account_roles'] = 'Roles'; +$lang['account_user_role'] = 'User Role'; + +$lang['account_theme'] = 'Theme'; +$lang['account_stylesheet'] = 'Stylesheet'; + +$lang['account_personal_iformation'] = 'Personal Information'; +$lang['account_first_name'] = 'First Name'; +$lang['account_last_name'] = 'Last Name'; +$lang['account_callsign'] = 'Callsign'; +$lang['account_gridsquare'] = 'Gridsquare'; + +$lang['account_cloudlog_preferences'] = 'Cloudlog Preferences'; +$lang['account_timezone'] = 'Timezone'; +$lang['account_date_format'] = 'Date Format'; +$lang['account_measurement_preference'] = '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_main_menu'] = 'Main Menu'; +$lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; + +$lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; +$lang['account_location_auto_lookup'] = 'Location auto lookup.'; +$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'If set, gridsquare is fetched based on location name.'; +$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'SOTA auto lookup gridsquare and name for summit.'; +$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'WWFF auto lookup gridsquare and name for reference.'; +$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'POTA auto lookup gridsquare and name for park.'; +$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'If set, name and gridsquare is fetched from the API and filled in location and locator.'; + +$lang['account_previous_qsl_type'] = 'Previous QSL Type'; +$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Select the type of QSL to show in the previous QSOs section.'; + +$lang['account_qrzcom_hamqthcom_images'] = 'qrz.com/hamqth.com Images'; +$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Show profile picture of QSO partner from qrz.com/hamqth.com profile in the log QSO section.'; +$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Please set your qrz.com/hamqth.com credentials in the general config file.'; + +$lang['account_amsat_status_upload'] = 'AMSAT Status Upload'; +$lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; + +$lang['account_logbook_of_the_world'] = 'Logbook of the World'; +$lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; +$lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; +$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; + +$lang['account_clublog'] = 'Club Log'; +$lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; +$lang['account_clublog_password'] = 'Club Log Password'; +$lang['account_the_email_or_callsign_you_use_to_login_to_club_log'] = 'The Email or Callsign you use to login to Club Log'; + +$lang['account_eqsl'] = 'eQSL'; +$lang['account_eqsl_username'] = 'eQSL.cc Username'; +$lang['account_eqsl_password'] = 'eQSL.cc Password'; + +$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_create_account'] = 'Create Account'; + +$lang['account_delete_user_account'] = 'Delete User Account'; +$lang['account_are_you_sure_you_want_to_delete_the_user_account'] = 'Are you sure you want to delete the user account'; +$lang['account_yes_delete_this_user'] = 'Yes, delete this user'; +$lang['account_no_do_not_delete_this_user'] = 'No, do not delete this user'; + +$lang['account_forgot_password'] = 'Forgot Password?'; +$lang['account_you_can_reset_your_password_here'] = 'You can reset your password here.'; +$lang['account_reset_password'] = 'Reset Password'; +$lang['account_the_email_field_is_required'] = 'The Email field is required'; +$lang['account_confirm_password'] = 'Confirm Password'; + +$lang['account_forgot_your_password'] = 'Forgot your password?'; + +$lang['account_login_to_cloudlog'] = 'Login to Cloudlog'; +$lang['account_login'] = 'Login'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php new file mode 100644 index 00000000..5b3568c8 --- /dev/null +++ b/application/language/english/admin_lang.php @@ -0,0 +1,18 @@ +

- Create User Account +

session->flashdata('notice')) { ?>
@@ -16,26 +16,26 @@
- Account Information +
- + ".$username_error."
"; } ?>
- + ".$email_error."
"; } ?>
- + ".$password_error."
"; } ?> @@ -48,11 +48,11 @@
- Roles +
- +
- Personal Information +
- + ".$firstname_error."
"; } ?>
- + ".$lastname_error."
"; } ?>
- + ".$callsign_error."
"; } ?>
- + ".$locator_error."
"; } ?> @@ -144,12 +144,12 @@
- Cloudlog Preferences +
- +
- + - Select how you would - like dates shown when logged into your account. +
- + - Choose which - unit distances will be shown in. +
@@ -203,11 +201,11 @@
- Main Menu +
- + -
If set, gridsquare is fetched based on - location name.
+
- + -
If set, name and gridsquare is fetched - from the API and filled in location and locator.
+
- + -
If set, name and gridsquare is fetched - from the API and filled in location and locator.
+
- + -
If set, name and gridsquare is fetched - from the API and filled in location and locator.
+
@@ -291,7 +283,7 @@
- Logbook fields +
@@ -456,13 +448,12 @@
- Previous QSL Type +
- + -
Please set your qrz.com/hamqth.com - credentials in the general config file.
+
@@ -501,12 +490,12 @@
- AMSAT Status Upload +
- + - No, do not delete this user +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 4f775eb0..ee9a8522 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -1,6 +1,6 @@

- Edit Account +

@@ -32,23 +32,23 @@
- Account Information +
- + ".$username_error."
"; } ?>
- + ".$email_error."
"; } ?>
- + ".$password_error."
"; } else { ?>
Leave blank to keep existing password
@@ -61,11 +61,11 @@
- Roles +
- + session->userdata('user_type') == 99) { ?>
- Personal Information +
- + ".$firstname_error."
"; } else { ?>
- + ".$lastname_error."
"; } else { ?>
- + ".$callsign_error."
"; } else { ?>
- + ".$locator_error."
"; } else { ?> @@ -157,16 +157,16 @@
- Cloudlog Preferences +
- +
- + - Select how you would like dates shown when logged into your account. +
- + - Choose which unit distances will be shown in. +
@@ -202,20 +202,20 @@
- Logbook of the World +
- + ".$userlotwname_error."
"; } ?>
- + ".$lotwpassword_error."
"; } else { ?> -
Leave blank to keep existing password
+
@@ -226,20 +226,20 @@
- eQSL +
- + ".$eqslusername_error."
"; } ?>
- + ".$eqslpassword_error."
"; } else { ?> -
Leave blank to keep existing password
+
@@ -253,22 +253,22 @@
- Club Log +
- + -
The Email or Callsign you use to login to Club Log
+
".$userclublogname_error."
"; } ?>
- + ".$clublogpassword_error."
"; } else { ?> -
Leave blank to keep existing password
+
@@ -277,11 +277,11 @@
- Main menu +
- + -
If set, gridsquare is fetched based on location name.
+
- + -
If set, name and gridsquare is fetched from the API and filled in location and locator.
+
- + -
If set, name and gridsquare is fetched from the API and filled in location and locator.
+
- + -
If set, name and gridsquare is fetched from the API and filled in location and locator.
+
@@ -451,7 +451,7 @@
- Previous QSL Type +
@@ -471,16 +471,16 @@
- qrz.com/hamqth.com Images +
- + -
Please set your qrz.com/hamqth.com credentials in the general config file.
+
@@ -493,11 +493,11 @@
- AMSAT Status Upload +
- +
- +

diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php index 6f8003d3..e26a5131 100644 --- a/application/views/user/forgot_password.php +++ b/application/views/user/forgot_password.php @@ -30,8 +30,8 @@ input[type="email"] {
-

Forgot Password?

-

You can reset your password here.

+

+

@@ -44,11 +44,11 @@ input[type="email"] {
- +
- +
diff --git a/application/views/user/login.php b/application/views/user/login.php index f5aaba68..3847cb66 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -33,26 +33,26 @@ body {
-

Login to Cloudlog

+

form_validation->set_error_delimiters('', ''); ?>
- - +
- + + placeholder="">
load->view('layout/messages'); ?> - +
diff --git a/application/views/user/main.php b/application/views/user/main.php index 15d67aea..8dc9ddd2 100644 --- a/application/views/user/main.php +++ b/application/views/user/main.php @@ -14,20 +14,20 @@
- User List +
-

Cloudlog needs at least one user configured in order to operate.

-

Users can be assigned roles which give them different permissions, such as adding QSOs to the logbook and accessing Cloudlog APIs.

-

The currently logged-in user is displayed at the upper-right of each page.

+

+

+

- - - - + + + + @@ -41,10 +41,10 @@ @@ -54,7 +54,7 @@
UserE-mailTypeOptions
user_email; ?> config->item('auth_level'); echo $l[$row->user_type]; ?> - user_id; ?>" class="btn btn-outline-primary btn-sm"> Edit + user_id; ?>" class="btn btn-outline-primary btn-sm"> user_id) { - echo "user_id . " class=\"btn btn-danger btn-sm\"> Delete"; + echo "user_id . " class=\"btn btn-danger btn-sm\"> ".lang('admin_delete').""; } ?>

- Create user +

diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php index f5e84bb4..23184ce7 100644 --- a/application/views/user/reset_password.php +++ b/application/views/user/reset_password.php @@ -5,8 +5,8 @@

-

Reset Password?

-

You can reset your password here.

+

?

+

@@ -18,21 +18,21 @@
- +
- +
- +
- +
- +
diff --git a/assets/js/sections/statistics.js b/assets/js/sections/statistics.js index 8ffc5b7f..40b4102d 100644 --- a/assets/js/sections/statistics.js +++ b/assets/js/sections/statistics.js @@ -64,14 +64,14 @@ function totalQsosPerYear() { success: function (data) { if (data.length > 0) { - $(".years").append('

Years

'); + $(".years").append('

Year

'); $("#yearContainer").append(""); // appending table to hold the data $("#yearTable").append('' + '' + '' + - '' + + '' + '' + '' + '' +
#Year'+'Year'+'# of QSO\'s worked