Merge pull request #2761 from phl0/gridmapNotNeededOnPublicDashboard

application/views/visitor/layout/footer.php

@@ -59,6 +59,7 @@
 <?php if ($this->uri->segment(2) == "satellites") { ?>
 
 <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.MaidenheadColoured.js"></script>
+<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/gridmap.js?"></script>
 
 <script>
 
@@ -136,7 +137,6 @@
 <?php } ?>
 <?php } ?>
     </script>
-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/gridmap.js?"></script>
     <?php if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/dataTables.buttons.min.js"></script>

assets/js/sections/gridmap.js

@@ -17,7 +17,7 @@ if (typeof(visitor) !== 'undefined' && visitor != true) {
    var grid_six_confirmed = '';
 }
 
-function gridPlot(form, visitor) {
+function gridPlot(form, visitor=true) {
     $(".ld-ext-right-plot").addClass('running');
     $(".ld-ext-right-plot").prop('disabled', true);
     $('#plot').prop("disabled", true);
@@ -30,6 +30,7 @@ function gridPlot(form, visitor) {
         $("#gridmapcontainer").append('<div id="gridsquare_map" style="width: 100%; height: 800px"></div>');
     }
 
+    if (typeof type == 'undefined') { type=''; }
     if (type == "activated") {
         ajax_url = site_url + '/activated_gridmap/getGridsjs';
     } else if (type == "worked") {