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

Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

浏览代码
这个提交包含在：
root 2023-02-02 05:28:03 +00:00
当前提交 93b261ef68
共有 5 个文件被更改，包括 87 次插入 和 7 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

54
application/views/debug/main.php
查看文件

@ -5,6 +5,26 @@
<div class="row">
<div class="col">
<div class="card">
<div class="card-header">Cloudlog Information</div>
<div class="card-body">
<table width="100%">
<tr>
<td>Version</td>
<td><?php echo $this->config->item('app_version')."\n"; ?></td>
</tr>
<tr>
<td>Language</td>
<td><?php echo ucfirst($this->config->item('language'))."\n"; ?></td>
</tr>
<tr>
<td>Base URL</td>
<td><span id="baseUrl"><a href="<?php echo $this->config->item('base_url')?>" target="_blank"><?php echo $this->config->item('base_url'); ?></a></span> <span data-toggle="tooltip" data-original-title="<?php echo $this->lang->line('copy_to_clipboard'); ?>" onclick='copyURL("<?php echo $this->config->item('base_url'); ?>")'><i class="copy-icon fas fa-copy"></span></td>
</tr>
</table>
</div>
</div>
<div class="card">
<div class="card-header">Server Information</div>
<div class="card-body">
@ -139,13 +159,28 @@
</div>
</div>
<?php if (file_exists('.git')) { ?>
<div class="card">
<?php
$commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
$branch = trim(exec('git branch --show-current'));
$tag = trim(exec('git describe --tags '.$commitHash));
// only proceed here if git can actually be executed
if ($commitHash != "") {
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
$line = trim(exec('git log -n 1 --pretty=%D HEAD'));
$pieces = explode(', ', $line);
$remote = substr($pieces[1], 0, strpos($pieces[1], '/'));
$branch = substr($pieces[1], strpos($pieces[1], '/')+1);
$url = trim(exec('git remote get-url '.$remote));
$owner = '';
if (strpos($url, 'https://github.com') !== false) {
$owner = preg_replace('/https:\/\/github\.com\/(\w+)\/Cloudlog\.git/', '$1', $url);
} else if (strpos($url, 'git@github.com') !== false) {
$owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
}
$tag = trim(exec('git describe --tags '.$commitHash));
}
?>
<?php if($commitHash != "") { ?>
<div class="card">
<div class="card-header">Git Information</div>
<div class="card-body">
<table width="100%">
@ -153,7 +188,13 @@
<td>Branch</td>
<td>
<?php if($branch != "") { ?>
<a target="_blank" href="https://github.com/magicbug/Cloudlog/tree/<?php echo $branch?>"><span class="badge badge-success"><?php echo $branch; ?></span></a>
<?php if($owner != "") { ?>
<a target="_blank" href="https://github.com/<?php echo $owner; ?>/Cloudlog/tree/<?php echo $branch?>">
<?php } ?>
<span class="badge badge-success"><?php echo $branch; ?></span>
<?php if($owner != "") { ?>
</a>
<?php } ?>
<?php } else { ?>
<span class="badge badge-danger">n/a</span>
<?php } ?>
@ -185,7 +226,8 @@
</div>
</div>
<?php } ?>
<?php } ?>
</div>
</div>
</div>
</div>

18
application/views/interface_assets/footer.php
查看文件

@ -122,6 +122,24 @@ function load_was_map() {
<script src="<?php echo base_url() ;?>assets/js/sections/station_logbooks.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "debug") { ?>
<script type="text/javascript">
function copyURL(url) {
var urlField = $('#baseUrl');
navigator.clipboard.writeText(url).then(function() {
});
urlField.addClass('flash-copy')
.delay('1000').queue(function() {
urlField.removeClass('flash-copy').dequeue();
});
}
$(function () {
$('[data-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
});
</script>
<?php } ?>
<?php if ($this->uri->segment(1) == "api" && $this->uri->segment(2) == "help") { ?>
<script type="text/javascript">
function copyApiKey(apiKey) {

2
application/views/qso/index.php
查看文件

@ -1,6 +1,6 @@
<div class="container qso_panel">
<div class="row">
<div class="row qsopane">
<div class="col-sm-5">
<div class="card">

17
assets/js/sections/common.js
查看文件

@ -430,4 +430,21 @@ function getLookupResult() {
$(".ld-ext-right").prop('disabled', false);
}
});
}
// This function executes the call to the backend for fetching dxcc summary and inserted table below qso entry
function getDxccResult(dxcc, name) {
$.ajax({
url: base_url + 'index.php/lookup/search',
type: 'post',
data: {
type: 'dxcc',
dxcc: dxcc,
},
success: function (html) {
$('.dxccsummary').remove();
$('.qsopane').append('<div class="dxccsummary col-sm-12"><br><div class="card"><div class="card-header" data-toggle="collapse" data-target=".dxccsummarybody">DXCC Summary for '+name+'</div><div class="card-body collapse dxccsummarybody"></div></div></div>');
$('.dxccsummarybody').append(html);
}
});
}

3
assets/js/sections/qso.js
查看文件

@ -368,6 +368,7 @@ function reset_fields() {
mymap.setView(pos, 12);
mymap.removeLayer(markers);
$('.callsign-suggest').hide();
$('.dxccsummary').remove();
}
$("#callsign").focusout(function() {
@ -406,6 +407,7 @@ $("#callsign").focusout(function() {
if(result.dxcc.entity != undefined) {
$('#country').val(convert_case(result.dxcc.entity));
$('#callsign_info').text(convert_case(result.dxcc.entity));
getDxccResult(result.dxcc.adif, convert_case(result.dxcc.entity));
if($("#sat_name" ).val() != "") {
//logbook/jsonlookupgrid/io77/SAT/0/0
@ -787,4 +789,5 @@ function resetDefaultQSOFields() {
$('#input_usa_state').val("");
$('#callsign-image').attr('style', 'display: none;');
$('#callsign-image-content').text("");
$('.dxccsummary').remove();
}