goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #9 from HB9HIL/dev

浏览代码 
Dev
这个提交包含在：
HB9HIL 2023-10-20 16:36:41 +02:00 提交者 GitHub
当前提交 d5c219b656
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 4 个文件被更改，包括 18 次插入 和 10 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/views/awards/ffma/index.php
查看文件

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

2
application/views/awards/gridmaster/index.php
查看文件

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

12
assets/js/sections/ffma.js
查看文件

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

12
assets/js/sections/gridmaster.js
查看文件

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