PR from AndreasK79 changing the popups to bootstrapdialog

This commit changes Cloudlogs popups from Fancybox to bootstrapdialog

application/controllers/Logbook.php

@@ -556,7 +556,7 @@ class Logbook extends CI_Controller {
 		if ($query->num_rows() > 0)
 		{
 			$data['results'] = $query;
-			$this->load->view('view_log/partial/log.php', $data);
+			$this->load->view('view_log/partial/log_ajax.php', $data);
 		} else {
 			$this->load->model('search');
 
@@ -565,7 +565,7 @@ class Logbook extends CI_Controller {
 			if ($iota_search->num_rows() > 0)
 			{
 				$data['results'] = $iota_search;
-				$this->load->view('view_log/partial/log.php', $data);
+				$this->load->view('view_log/partial/log_ajax.php', $data);
 			} else {
 				if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null) {
 					// Lookup using QRZ

application/controllers/Timeline.php

@@ -37,9 +37,9 @@ class Timeline extends CI_Controller {
     public function details() {
         $this->load->model('logbook_model');
 
-        $adif = str_replace('"', "", $this->input->get("Adif"));
+        $adif = str_replace('"', "", $this->input->post("Adif"));
         $country = $this->logbook_model->get_entity($adif);
-        $band = str_replace('"', "", $this->input->get("Band"));
+        $band = str_replace('"', "", $this->input->post("Band"));
         $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band);
 
         // Render Page
@@ -50,9 +50,7 @@ class Timeline extends CI_Controller {
             $data['filter'] .= " and " . $band;
         }
 
-        $this->load->view('interface_assets/header', $data);
+        $this->load->view('timeline/details', $data);
-        $this->load->view('timeline/details');
-        $this->load->view('interface_assets/footer');
     }
 
 }

application/views/dashboard/index.php

@@ -71,9 +71,7 @@
 					<?php } else { ?>
 					<?php } ?>
 					<td>
-						<a data-fancybox data-type="iframe" data-width="800" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;">
+                        <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
-							<?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?>
-						</a>
 					</td>
 					<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 					<td class="d-none d-sm-table-cell"><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>

application/views/interface_assets/footer.php

@@ -90,8 +90,7 @@ $(".search-results-box").hide();
           } else {
             band = item.COL_BAND;
           }
-
+          var callsign = '<a href="javascript:displayQso(' + item.COL_PRIMARY_KEY + ');" >' + item.COL_CALL + '</a>';
-          var callsign = '<a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view');?>/' + item.COL_PRIMARY_KEY + '" data-src="" href="javascript:;">' + item.COL_CALL + '</a>';
           if (item.COL_SUBMODE == '' || item.COL_SUBMODE == null) {
             $('#results').append('<tr class="qso"><td>' + item.COL_TIME_ON + '</td><td>' + callsign + '</td><td>' + item.COL_MODE + '</td><td>' + item.COL_RST_SENT + '</td><td>' + item.COL_RST_RCVD + '</td><td>' + band + '</td><td>' + item.COL_COUNTRY + '</td><td></td></tr>');
           }
@@ -1433,7 +1432,7 @@ $(document).ready(function(){
                                 var lat = $("#lat").text();
                                 var long = $("#long").text();
                                 var callsign = $("#callsign").text();
-                                var mymap = L.map('map').setView([lat,long], 5);
+                                var mymap = L.map('mapqso').setView([lat,long], 5);
 
                                 L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
                                     maxZoom: 18,
@@ -1761,6 +1760,36 @@ $(document).ready(function(){
             });
         }
         </script>
+    <?php if ($this->uri->segment(1) == "timeline") { ?>
+        <script>
+            function displayTimelineContacts(adif, band) {
+                var baseURL= "<?php echo base_url();?>";
+                $.ajax({
+                    url: baseURL + 'index.php/timeline/details',
+                    type: 'post',
+                    data: {'Adif': adif,
+                        'Band': band
+                    },
+                    success: function(html) {
+                        BootstrapDialog.show({
+                            title: 'QSO Data',
+                            size: BootstrapDialog.SIZE_WIDE,
+                            cssClass: 'qso-was-dialog',
+                            nl2br: false,
+                            message: html,
+                            buttons: [{
+                                label: 'Close',
+                                action: function (dialogItself) {
+                                    dialogItself.close();
+                                }
+                            }]
+                        });
+                    }
+                });
+            }
+        </script>
+        <?php } ?>
+
 
   </body>
 </html>

application/views/qso/index.php

@@ -462,7 +462,9 @@
               foreach ($query->result() as $row) { ?>
                     <?php  echo '<tr class="tr'.($i & 1).'">'; ?>
                     <td><?php echo date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?></td>
-                    <td><a class="qsobox" data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
+                  <td>
+                      <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
+                  </td>
                     <td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
                     <td><?php echo $row->COL_RST_SENT; ?></td>
                     <td><?php echo $row->COL_RST_RCVD; ?></td>

application/views/search/result_search.php

@@ -33,7 +33,7 @@
 			<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
 			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
-			<td><a data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
+			<td><a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
 			<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
 			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>

application/views/timeline/details.php

@@ -4,4 +4,4 @@
 
     <h3>Filtering on <?php echo $filter ?></h3>
 
-    <?php $this->load->view('view_log/partial/log') ?>
+    <?php $this->load->view('view_log/partial/log_ajax') ?>

application/views/timeline/index.php

@@ -68,7 +68,7 @@
             if (!empty($line->end)) echo 'Yes';
             echo '</td>
                 <td>' . $line->end . '</td>
-                <td><a href=\'timeline\details?Adif="' . $line->adif . '"&Band="'. $bandselect . '"\'>Show</a></td>
+                <td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '")>Show</a></td>
                </tr>';
         }
         echo '</tfoot></table></div>';

application/views/view_log/index.php

@@ -13,4 +13,4 @@
 	<div id="map" style="width: 100%; height: 350px"></div> 
 
 <div style="padding-top: 10px; margin-top: 0px;" class="container logbook">
-	<?php $this->load->view('view_log/partial/log') ?>
+	<?php $this->load->view('view_log/partial/log_ajax') ?>

application/views/view_log/qso.php

@@ -245,7 +245,7 @@
 		</div>
 		<div class="col">
 			
-			<div id="map" style="width: 340px; height: 250px"></div> 
+			<div id="mapqso" style="width: 340px; height: 250px"></div>
 			
 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
 				<br>