mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2602 from phl0/beautifyStats 

Make legend look a little nicer
pull/2603/head
Peter Goodhall 2023-10-20 15:35:01 +01:00 zatwierdzone przez GitHub
rodzic 3126757d76 a847da0764
commit ca38f6af40
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 18 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/views/awards/ffma/index.php
Wyświetl plik

@ -3,7 +3,7 @@
<style>
/*Legend specific*/
.legend {
padding: 6px 8px;
padding: 10px 10px 10px 10px;
font: 14px Arial, Helvetica, sans-serif;
background: white;
line-height: 24px;

2
application/views/awards/gridmaster/index.php
Wyświetl plik

@ -3,7 +3,7 @@
<style>
/*Legend specific*/
.legend {
padding: 6px 8px;
padding: 10px 10px 10px 10px;
font: 14px Arial, Helvetica, sans-serif;
background: white;
line-height: 24px;

12
assets/js/sections/ffma.js
Wyświetl plik

@ -26,6 +26,7 @@ function gridPlot(form) {
$(".ld-ext-right-plot").removeClass('running');
$(".ld-ext-right-plot").prop('disabled', false);
$('#plot').prop("disabled", false);
grid_max = 488;
grid_four = data.grid_4char;
grid_four_lotw = data.grid_4char_lotw;
grid_four_paper = data.grid_4char_paper;
@ -66,10 +67,13 @@ function gridPlot(form) {
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>" + gridsquares_gridsquares + "</h4>";
div.innerHTML += '<i style="background: #90ee90"></i><span>' + gridsquares_gridsquares_lotw + ' ('+grid_four_lotw.length+')</span><br>';
div.innerHTML += '<i style="background: #00b0f0"></i><span>' + gridsquares_gridsquares_paper + ' ('+paper_count+')</span><br>';
div.innerHTML += '<i style="background: #ffd757"></i><span>' + gridsquares_gridsquares_worked + ' ('+(grid_four.length)+')</span><br>';
//div.innerHTML += "<h4>" + gridsquares_gridsquares + "</h4>";
html = "<table border=\"0\">";
html += '<tr><td><i style="background: #90ee90"></i><span>' + gridsquares_gridsquares_lotw + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+grid_four_lotw.length+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: #00b0f0"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: #ffd757"></i><span>' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+(grid_four.length)+' / '+grid_max+'</span></td></tr>';
html += "</table>";
div.innerHTML = html;
return div;
};

12
assets/js/sections/gridmaster.js
Wyświetl plik

@ -26,6 +26,7 @@ function gridPlot(form) {
$(".ld-ext-right-plot").removeClass('running');
$(".ld-ext-right-plot").prop('disabled', false);
$('#plot').prop("disabled", false);
grid_max = 488;
grid_four = data.grid_4char;
grid_four_lotw = data.grid_4char_lotw;
grid_four_paper = data.grid_4char_paper;
@ -66,10 +67,13 @@ function gridPlot(form) {
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>" + gridsquares_gridsquares + "</h4>";
div.innerHTML += '<i style="background: #90ee90"></i><span>' + gridsquares_gridsquares_lotw + ' ('+grid_four_lotw.length+')</span><br>';
div.innerHTML += '<i style="background: #00b0f0"></i><span>' + gridsquares_gridsquares_paper + ' ('+paper_count+')</span><br>';
div.innerHTML += '<i style="background: #ffd757"></i><span>' + gridsquares_gridsquares_worked + ' ('+(grid_four.length)+')</span><br>';
//div.innerHTML += "<h4>" + gridsquares_gridsquares + "</h4>";
html = "<table border=\"0\">";
html += '<tr><td><i style="background: #90ee90"></i><span>' + gridsquares_gridsquares_lotw + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+grid_four_lotw.length+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: #00b0f0"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: #ffd757"></i><span>' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+(grid_four.length)+' / '+grid_max+'</span></td></tr>';
html += "</table>";
div.innerHTML = html;
return div;
};