diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 669398255..2491c8b79 100644 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -675,4 +675,20 @@ class QSO extends CI_Controller { redirect('dashboard'); } } + + /** + * Easy modal Loader + * Used for Share Modal in QSO Details view + */ + function getShareModal() { + + $data['qso'] = $this->input->post('qso_data', TRUE); + + if (empty($data['qso'])) { + echo "No QSO data provided."; + return; + } + + $this->load->view('qso/components/share_modal', $data, false); + } } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index ecab70c0a..b7f08aa10 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -30,6 +30,7 @@ */ var lang_general_word_qso_data = ""; var lang_general_edit_qso = ""; + var lang_general_share_qso = ""; var lang_general_word_danger = ""; var lang_general_word_error = ""; var lang_general_word_attention = ""; diff --git a/application/views/qso/components/share_modal.php b/application/views/qso/components/share_modal.php new file mode 100644 index 000000000..b074c3793 --- /dev/null +++ b/application/views/qso/components/share_modal.php @@ -0,0 +1,13 @@ +
+ + + + + + + session->userdata('user_mastodon_url') != null) { ?> + + + + +
\ No newline at end of file diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 5da9e1648..96ef900f7 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -585,15 +585,15 @@ $hashtags .= " #".$row->COL_SIG." ".$row->COL_SIG_INFO; } if (!isset($distance)) { - $twitter_string = urlencode("Just worked ".$row->COL_CALL." "); + $twitter_string = "Just worked ".$row->COL_CALL." "; if ($row->COL_DXCC != 0) { - $twitter_string .= urlencode("in ".ucwords(strtolower(($row->COL_COUNTRY)))." "); + $twitter_string .= "in ".ucwords(strtolower(($row->COL_COUNTRY)))." "; } - $twitter_string .= urlencode("on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags); + $twitter_string .= "on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags; } else { - $twitter_string = urlencode("Just worked ".$row->COL_CALL." "); + $twitter_string = "Just worked ".$row->COL_CALL." "; if ($row->COL_DXCC != 0) { - $twitter_string .= urlencode("in ".ucwords(strtolower(($row->COL_COUNTRY)))." "); + $twitter_string .= "in ".ucwords(strtolower(($row->COL_COUNTRY)))." "; if ($dxccFlag != null) { $twitter_string .= $dxccFlag." "; } @@ -610,14 +610,10 @@ $distancestring = "(Grids: ".$row->COL_VUCC_GRIDS.")"; } } - $twitter_string .= urlencode($distancestring." on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags); + $twitter_string .= $distancestring." on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags; } ?> - -
Tweet
-
Post
- session->userdata('user_mastodon_url') != null) { echo '
Toot
'; } ?> - + diff --git a/assets/css/general.css b/assets/css/general.css index 81462de5f..8e1e3c18a 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -266,6 +266,11 @@ thead > tr > td { text-transform: uppercase; } +#share_modal { + display: grid; + grid-template-columns: auto; +} + #oqrssearch:valid { text-transform: uppercase; } diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 399058675..4abb7ec31 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -1159,6 +1159,31 @@ function enableMap() { map.keyboard.enable(); } +function shareModal(qso_data) { + console.log(qso_data); + $.ajax({ + url: base_url + 'index.php/qso/getShareModal', + type: 'post', + data: { + qso_data: qso_data + }, + success: function (html) { + BootstrapDialog.show({ + title: lang_general_share_qso, + cssClass: 'bg-black bg-opacity-50', + nl2br: false, + message: html, + buttons: [{ + label: lang_admin_close, + action: function (dialogItself) { + dialogItself.close(); + } + }] + }); + } + }); +} + console.log("Ready to unleash your coding prowess and join the fun?\n\n" + "Check out our GitHub Repository and dive into the coding adventure:\n\n" + "🚀 https://www.github.com/wavelog/wavelog");