From d7a23d23a43fecd5d17c65d0d3f64fcd765ef000 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 3 Apr 2022 10:28:36 +0200 Subject: [PATCH 01/10] Pull image from qrz.com and display in QSO log window --- application/controllers/Logbook.php | 19 ++++++++++++++++++- application/language/english/qso_lang.php | 1 + application/libraries/Qrz.php | 1 + application/views/qso/index.php | 9 +++++++++ assets/css/general.css | 21 ++++++++++++++++++++- assets/js/sections/qso.js | 8 ++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 59a6a86e..f10b301b 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -126,11 +126,14 @@ class Logbook extends CI_Controller { "bearing" => "", "workedBefore" => false, "lotw_member" => $lotw_member, + "image" => "", ]; $return['dxcc'] = $this->dxcheck($callsign); $return['partial'] = $this->partial($callsign); + $callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); + // Do we have local data for the Callsign? if($this->logbook_model->call_name($callsign) != null) { @@ -148,6 +151,15 @@ class Logbook extends CI_Controller { $return['callsign_state'] = $this->logbook_model->call_state($callsign); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode); + if (isset($callbook)) { + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } + } else { + $return['image'] = "n/a"; + } if ($return['callsign_qra'] != "") { $return['latlng'] = $this->qralatlng($return['callsign_qra']); @@ -157,7 +169,7 @@ class Logbook extends CI_Controller { return; } - $callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); + //$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); if (isset($callbook)) { @@ -167,6 +179,11 @@ class Logbook extends CI_Controller { $return['callsign_iota'] = $callbook['iota']; $return['callsign_state'] = $callbook['state']; $return['callsign_us_county'] = $callbook['us_county']; + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } if(isset($callbook['qslmgr'])) { $return['qsl_manager'] = $callbook['qslmgr']; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 944f0d2a..cede1158 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -6,6 +6,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['qso_title_qso_map'] = 'QSO Map'; $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_pervious_contacts'] = 'Previous Contacts'; +$lang['qso_title_image'] = 'Image'; // 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/libraries/Qrz.php b/application/libraries/Qrz.php index d1a26f30..1e0289d4 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -88,6 +88,7 @@ class Qrz { $data['long'] = (string)$xml->Callsign->lon; $data['iota'] = (string)$xml->Callsign->iota; $data['qslmgr'] = (string)$xml->Callsign->qslmgr; + $data['image'] = (string)$xml->Callsign->image; if ($xml->Callsign->country == "United States") { $data['state'] = (string)$xml->Callsign->state; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 096def04..951a3cf4 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -521,6 +521,15 @@
+ +

lang->line('qso_title_pervious_contacts'); ?>

diff --git a/assets/css/general.css b/assets/css/general.css index f5f2854a..30b84b29 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -145,6 +145,25 @@ TD.lotw{ margin-bottom: 0px; } +.callsign-image .card-title { + margin-bottom: 0px; +} + +.callsign-image { + margin-bottom: 10px; + margin-left: auto; + margin-right: auto; +} + +.callsign-image-content { + display: block; + max-height: 300px; +} + +.callsign-image-pic { + max-height: 250px; +} + .qso-map .card-title { margin-bottom: 0px; } @@ -255,4 +274,4 @@ color: #ffffff; .modal-body { max-height: calc(100vh - 200px); overflow-y: auto; -} \ No newline at end of file +} diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 8f19929a..3fbae45f 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -279,6 +279,8 @@ function reset_fields() { $('#callsign_info').removeClass("badge-secondary"); $('#callsign_info').removeClass("badge-success"); $('#callsign_info').removeClass("badge-danger"); + $('#callsign-image').attr('style', 'display: none;'); + $('#callsign-image-content').text(""); $('#qsl_via').val(""); $('#callsign_info').text(""); $('#input_usa_state').val(""); @@ -441,6 +443,12 @@ $("#callsign").focusout(function() { $('#qth').val(result.callsign_qth); } + /* Find link to qrz.com picture */ + if (result.image != "n/a") { + $('#callsign-image-content').html(''); + $('#callsign-image').attr('style', 'display: true;'); + } + /* * Update state with returned value */ From f67ef05f8102305bc41388b1ebb7b600e5a52f4a Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 3 Apr 2022 10:30:41 +0200 Subject: [PATCH 02/10] Add German translation --- application/language/german/qso_lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 462a43a8..4ff7ec72 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -6,6 +6,7 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt'); $lang['qso_title_qso_map'] = 'QSO-Karte'; $lang['qso_title_suggestions'] = 'Vorschläge'; $lang['qso_title_pervious_contacts'] = 'Vorherige Kontakte'; +$lang['qso_title_image'] = 'Bild'; // Input Help Text on the /QSO Display $lang['qso_transmit_power_helptext'] = 'Gib die Ausgangsleistung in Watt an. Erfasse nur Zahlen bei der Eingabe.'; From ddf745645a2c0305954521442b75059908caba30 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 3 Apr 2022 14:05:05 +0200 Subject: [PATCH 03/10] Add config option for qrz.com image display --- application/config/cloudlog.php | 15 +++++++++++++++ application/controllers/Logbook.php | 26 ++++++++++++++------------ application/views/qso/index.php | 2 ++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/application/config/cloudlog.php b/application/config/cloudlog.php index 1070e5b5..9e5cc5e0 100644 --- a/application/config/cloudlog.php +++ b/application/config/cloudlog.php @@ -139,3 +139,18 @@ $config['map_6digit_grids'] = FALSE; */ $config['qso_auto_qth'] = FALSE; + +/* +|-------------------------------------------------------------------------- +| Pull qrz.com image on logging +|-------------------------------------------------------------------------- +| +| Setting this to TRUE allows Cloudlog to pull and show +| the profile picture of the qrz.com profile of your QSO +| partner upon QSO logging. +| +| Default is: FALSE +| +*/ + +$config['show_qrz_image'] = FALSE; diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index f10b301b..456254bd 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -151,14 +151,16 @@ class Logbook extends CI_Controller { $return['callsign_state'] = $this->logbook_model->call_state($callsign); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode); - if (isset($callbook)) { - if ($callbook['image'] == "") { - $return['image'] = "n/a"; + if ($this->config->item('show_qrz_image')) { + if (isset($callbook)) { + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } } else { - $return['image'] = $callbook['image']; + $return['image'] = "n/a"; } - } else { - $return['image'] = "n/a"; } if ($return['callsign_qra'] != "") { @@ -169,8 +171,6 @@ class Logbook extends CI_Controller { return; } - //$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname')); - if (isset($callbook)) { $return['callsign_name'] = $callbook['name']; @@ -179,10 +179,12 @@ class Logbook extends CI_Controller { $return['callsign_iota'] = $callbook['iota']; $return['callsign_state'] = $callbook['state']; $return['callsign_us_county'] = $callbook['us_county']; - if ($callbook['image'] == "") { - $return['image'] = "n/a"; - } else { - $return['image'] = $callbook['image']; + if ($this->config->item('show_qrz_image')) { + if ($callbook['image'] == "") { + $return['image'] = "n/a"; + } else { + $return['image'] = $callbook['image']; + } } if(isset($callbook['qslmgr'])) { diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 951a3cf4..c5c6ae19 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -521,6 +521,7 @@
+ config->item('show_qrz_image')) { ?> +

lang->line('qso_title_pervious_contacts'); ?>

From 926742ddbd521e86201b78f6379f790e286f303e Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 11:19:34 +0200 Subject: [PATCH 04/10] Remove qrz image stuff from (static) config file --- application/config/cloudlog.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/application/config/cloudlog.php b/application/config/cloudlog.php index 9e5cc5e0..1070e5b5 100644 --- a/application/config/cloudlog.php +++ b/application/config/cloudlog.php @@ -139,18 +139,3 @@ $config['map_6digit_grids'] = FALSE; */ $config['qso_auto_qth'] = FALSE; - -/* -|-------------------------------------------------------------------------- -| Pull qrz.com image on logging -|-------------------------------------------------------------------------- -| -| Setting this to TRUE allows Cloudlog to pull and show -| the profile picture of the qrz.com profile of your QSO -| partner upon QSO logging. -| -| Default is: FALSE -| -*/ - -$config['show_qrz_image'] = FALSE; From 73ce098676411669377a11ec04ab37199ebb0076 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 11:38:21 +0200 Subject: [PATCH 05/10] Add user config option to select whether to show qrz.com images --- application/config/migration.php | 2 +- .../migrations/087_add_qrz_image_option.php | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 application/migrations/087_add_qrz_image_option.php diff --git a/application/config/migration.php b/application/config/migration.php index 976c37a6..46d1487d 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 86; +$config['migration_version'] = 87; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/087_add_qrz_image_option.php b/application/migrations/087_add_qrz_image_option.php new file mode 100644 index 00000000..f817c7b9 --- /dev/null +++ b/application/migrations/087_add_qrz_image_option.php @@ -0,0 +1,29 @@ +db->field_exists('show_qrz_image', 'users')) { + $fields = array( + 'show_qrz_image BOOLEAN DEFAULT FALSE', + ); + $this->dbforge->add_column('users', $fields); + } + } + + public function down() + { + $this->dbforge->drop_column('users', 'show_qrz_image'); + } +} From 828429312e2e5ae3789066c7edb7b0419c6d5043 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 13:17:33 +0200 Subject: [PATCH 06/10] Add option to en-/disable showing of qrz.com images to user account menu --- application/controllers/Logbook.php | 4 ++-- application/controllers/User.php | 14 +++++++++-- .../migrations/087_add_qrz_image_option.php | 8 +++---- application/models/User_model.php | 5 +++- application/views/qso/index.php | 2 +- application/views/user/add.php | 9 ++++++++ application/views/user/edit.php | 23 +++++++++++++++++++ 7 files changed, 55 insertions(+), 10 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 456254bd..abf00390 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -151,7 +151,7 @@ class Logbook extends CI_Controller { $return['callsign_state'] = $this->logbook_model->call_state($callsign); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode); - if ($this->config->item('show_qrz_image')) { + if ($this->session->userdata('user_show_qrz_image')) { if (isset($callbook)) { if ($callbook['image'] == "") { $return['image'] = "n/a"; @@ -179,7 +179,7 @@ class Logbook extends CI_Controller { $return['callsign_iota'] = $callbook['iota']; $return['callsign_state'] = $callbook['state']; $return['callsign_us_county'] = $callbook['us_county']; - if ($this->config->item('show_qrz_image')) { + if ($this->session->userdata('user_show_qrz_image')) { if ($callbook['image'] == "") { $return['image'] = "n/a"; } else { diff --git a/application/controllers/User.php b/application/controllers/User.php index dbb48912..a2de73ce 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -74,6 +74,7 @@ class User extends CI_Controller { $data['user_column3'] = $this->input->post('user_column3'); $data['user_column4'] = $this->input->post('user_column4'); $data['user_column5'] = $this->input->post('user_column5'); + $data['user_show_qrz_image'] = $this->input->post('user_show_qrz_image'); $this->load->view('user/add', $data); } else { $this->load->view('user/add', $data); @@ -100,7 +101,8 @@ class User extends CI_Controller { $this->input->post('user_column2'), $this->input->post('user_column3'), $this->input->post('user_column4'), - $this->input->post('user_column5'))) { + $this->input->post('user_column5'), + $this->input->post('user_show_qrz_image'))) { // Check for errors case EUSERNAMEEXISTS: $data['username_error'] = 'Username '.$this->input->post('user_name').' already in use!'; @@ -137,6 +139,7 @@ class User extends CI_Controller { $data['user_column3'] = $this->input->post('user_column3'); $data['user_column4'] = $this->input->post('user_column4'); $data['user_column5'] = $this->input->post('user_column5'); + $data['user_show_qrz_image'] = $this->input->post('user_show_qrz_image'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); } @@ -308,6 +311,12 @@ class User extends CI_Controller { $data['user_show_notes'] = $q->user_show_notes; } + if($this->input->post('user_show_qrz_image')) { + $data['user_show_qrz_image'] = $this->input->post('user_show_qrz_image', false); + } else { + $data['user_show_qrz_image'] = $q->user_show_qrz_image; + } + if($this->input->post('user_column1')) { $data['user_column1'] = $this->input->post('user_column1', true); } else { @@ -387,6 +396,7 @@ class User extends CI_Controller { $data['user_column4'] = $this->input->post('user_column4'); $data['user_column4'] = $this->input->post('user_column4'); $data['user_column5'] = $this->input->post('user_column5'); + $data['user_show_qrz_image'] = $this->input->post('user_show_qrz_image'); $this->load->view('user/edit'); $this->load->view('interface_assets/footer'); } @@ -599,4 +609,4 @@ class User extends CI_Controller { redirect('user/login'); } } -} \ No newline at end of file +} diff --git a/application/migrations/087_add_qrz_image_option.php b/application/migrations/087_add_qrz_image_option.php index f817c7b9..2abf6593 100644 --- a/application/migrations/087_add_qrz_image_option.php +++ b/application/migrations/087_add_qrz_image_option.php @@ -14,16 +14,16 @@ class Migration_add_qrz_image_option extends CI_Migration { public function up() { - if (!$this->db->field_exists('show_qrz_image', 'users')) { + if (!$this->db->field_exists('user_show_qrz_image', 'users')) { $fields = array( - 'show_qrz_image BOOLEAN DEFAULT FALSE', + 'user_show_qrz_image BOOLEAN DEFAULT FALSE', ); - $this->dbforge->add_column('users', $fields); + $this->dbforge->add_column('users', $fields, 'user_column5'); } } public function down() { - $this->dbforge->drop_column('users', 'show_qrz_image'); + $this->dbforge->drop_column('users', 'user_show_qrz_image'); } } diff --git a/application/models/User_model.php b/application/models/User_model.php index 5f18f212..d9e2b360 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -113,7 +113,7 @@ class User_Model extends CI_Model { // Add a user function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone, $measurement, $user_date_format, $user_stylesheet, $user_sota_lookup, $user_show_notes, - $user_column1, $user_column2, $user_column3, $user_column4, $user_column5) { + $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_show_qrz_image) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -136,6 +136,7 @@ class User_Model extends CI_Model { 'user_column3' => xss_clean($user_column3), 'user_column4' => xss_clean($user_column4), 'user_column5' => xss_clean($user_column5), + 'user_show_qrz_image' => xss_clean($user_show_qrz_image), ); // Check the password is valid @@ -184,6 +185,7 @@ class User_Model extends CI_Model { 'user_column3' => xss_clean($fields['user_column3']), 'user_column4' => xss_clean($fields['user_column4']), 'user_column5' => xss_clean($fields['user_column5']), + 'user_show_qrz_image' => xss_clean($fields['user_show_qrz_image']), ); // Check to see if the user is allowed to change user levels @@ -293,6 +295,7 @@ class User_Model extends CI_Model { 'user_stylesheet' => $u->row()->user_stylesheet, 'user_sota_lookup' => isset($u->row()->user_sota_lookup) ? $u->row()->user_sota_lookup : 0, 'user_show_notes' => isset($u->row()->user_show_notes) ? $u->row()->user_show_notes : 1, + 'user_show_qrz_image' => isset($u->row()->user_show_qrz_image) ? $u->row()->user_show_qrz_image : 0, 'user_column1' => isset($u->row()->user_column1) ? $u->row()->user_column1: 'Mode', 'user_column2' => isset($u->row()->user_column2) ? $u->row()->user_column2: 'RSTS', 'user_column3' => isset($u->row()->user_column3) ? $u->row()->user_column3: 'RSTR', diff --git a/application/views/qso/index.php b/application/views/qso/index.php index c5c6ae19..c2019933 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -521,7 +521,7 @@
- config->item('show_qrz_image')) { ?> + session->userdata('user_show_qrz_image')) { ?> +
+ + +
Please set your qrz.com credentials in the station locations configuration (XML subscription required).
+
+ diff --git a/application/views/user/edit.php b/application/views/user/edit.php index d1c086de..c823f23b 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -414,6 +414,29 @@ +
+
+ +
+
+
+ qrz.com Images +
+
+
+ + +
Please set your qrz.com credentials in the station locations configuration (XML subscription required).
+
+ +
+
+
+ +

From 24b9b91f896e44bd0e8b7ca693967ddde99f8ff4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 13:25:02 +0200 Subject: [PATCH 07/10] fix comment --- application/views/user/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/user/edit.php b/application/views/user/edit.php index c823f23b..90c8a43f 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -416,7 +416,7 @@
- +
From 8d917f20c176cf2a60bb0b72687f6ea65ef127eb Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 19:45:52 +0200 Subject: [PATCH 08/10] Optimize css and rephrase some descriptions --- application/language/english/qso_lang.php | 2 +- application/language/german/qso_lang.php | 2 +- application/views/user/add.php | 4 ++-- application/views/user/edit.php | 4 ++-- assets/css/general.css | 4 ---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index cede1158..a59ce307 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -6,7 +6,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['qso_title_qso_map'] = 'QSO Map'; $lang['qso_title_suggestions'] = 'Suggestions'; $lang['qso_title_pervious_contacts'] = 'Previous Contacts'; -$lang['qso_title_image'] = 'Image'; +$lang['qso_title_image'] = 'Profile Picture from qrz.com'; // 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/german/qso_lang.php b/application/language/german/qso_lang.php index 4ff7ec72..3d3bac52 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -6,7 +6,7 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt'); $lang['qso_title_qso_map'] = 'QSO-Karte'; $lang['qso_title_suggestions'] = 'Vorschläge'; $lang['qso_title_pervious_contacts'] = 'Vorherige Kontakte'; -$lang['qso_title_image'] = 'Bild'; +$lang['qso_title_image'] = 'Profilbild von qrz.com'; // 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/views/user/add.php b/application/views/user/add.php index ac8888b4..ed291225 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -228,12 +228,12 @@
- + -
Please set your qrz.com credentials in the station locations configuration (XML subscription required).
+
Please set your qrz.com API key in the station locations configuration (XML subscription required).
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 90c8a43f..2fe437ae 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -424,12 +424,12 @@
- + -
Please set your qrz.com credentials in the station locations configuration (XML subscription required).
+
Please set your qrz.com API key in the station locations configuration (XML subscription required).
diff --git a/assets/css/general.css b/assets/css/general.css index 604f9733..427b04da 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -304,10 +304,6 @@ div#station_logbooks_linked_table_paginate { /* qrz.com profile picture Styles */ .callsign-image .card-title { - margin-bottom: 0px; -} - -.callsign-image { margin-bottom: 10px; margin-left: auto; margin-right: auto; From 10f8349961cb35e9ea11dbca80f3191cc906c761 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Apr 2022 20:30:01 +0200 Subject: [PATCH 09/10] Fix css and config hint --- application/views/user/add.php | 2 +- application/views/user/edit.php | 2 +- assets/css/general.css | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/views/user/add.php b/application/views/user/add.php index ed291225..c0bee047 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -233,7 +233,7 @@ -
Please set your qrz.com API key in the station locations configuration (XML subscription required).
+
Please set your qrz.com credentials in the general config file.
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 2fe437ae..dad01ebe 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -429,7 +429,7 @@ -
Please set your qrz.com API key in the station locations configuration (XML subscription required).
+
Please set your qrz.com credentials in the general config file.
diff --git a/assets/css/general.css b/assets/css/general.css index 427b04da..77a5a28b 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -303,7 +303,11 @@ div#station_logbooks_linked_table_paginate { /* qrz.com profile picture Styles */ -.callsign-image .card-title { +.card-title { + margin-bottom: 0px; + } + +.callsign-image { margin-bottom: 10px; margin-left: auto; margin-right: auto; From d2ffa34ca08b6664ccaf336ea4e65151626f2137 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 5 Apr 2022 16:41:50 +0100 Subject: [PATCH 10/10] Made a few changes to handle mobile devices --- assets/css/general.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index 77a5a28b..8ac0f8a2 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -309,15 +309,15 @@ div#station_logbooks_linked_table_paginate { .callsign-image { margin-bottom: 10px; - margin-left: auto; - margin-right: auto; } .callsign-image-content { display: block; max-height: 300px; + text-align: center; } .callsign-image-pic { max-height: 250px; + max-width: 100%; }