Merge pull request #1012 from AndreasK79/was_map_tweak

[WAS MAP] Minor tweaks. Always show button. Fetches band directly fro…
This commit is contained in:
Peter Goodhall
2021-05-02 15:28:22 +01:00
committed by GitHub
3 changed files with 5 additions and 9 deletions

View File

@@ -516,10 +516,9 @@ class Awards extends CI_Controller {
$data['was_array'] = $this->was->get_was_array($bands, $postdata);
$data['was_summary'] = $this->was->get_was_summary($bands);
$data['page_title'] = "";
$this->load->view('awards/was/map', $data);
}
}

View File

@@ -59,16 +59,13 @@
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
<button type="button" onclick="load_was_map();" class="btn btn-info"><i class="fas fa-globe-americas"></i> Show WAS Map</button>
</div>
</div>
</fieldset>
</form>
<?php if ($this->input->post('band')) { ?>
<button type="button" onclick="load_was_map();" class="btn btn-info" style="margin-bottom: 15px;"><i class="fas fa-globe-americas"></i> Show WAS Map</button>
<?php } ?>
<?php
if ($was_array) {
$i = 1;
@@ -127,4 +124,4 @@
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
}

View File

@@ -23,9 +23,9 @@
function load_was_map() {
BootstrapDialog.show({
title: 'Worked All States Map (<?php echo $this->input->post('band'); ?>)',
title: 'Worked All States Map ('+$('#band2').val()+')',
cssClass: 'was-map-dialog',
message: $('<div></div>').load(site_url + '/awards/was_map/<?php echo $this->input->post('band'); ?>')
message: $('<div></div>').load(site_url + '/awards/was_map/' + $('#band2').val())
});
}