Skip to content

Commit

Permalink
2.39.2 New 'Quick Upload' mini-form for admins to go directly to uplo…
Browse files Browse the repository at this point in the history
…ad a listener who has included their RXX ID in the log
  • Loading branch information
classaxe committed Jul 1, 2022
1 parent e37ba4c commit 7409268
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 8 deletions.
18 changes: 16 additions & 2 deletions public/css/style.css
@@ -1,8 +1,8 @@
/*
* Project: RXX - NDB Logging Database
* Homepage: https://rxx.classaxe.com
* Version: 2.39.0
* Date: 2022-06-30
* Version: 2.39.2
* Date: 2022-07-01
* Licence: LGPL
* Copyright: 2022 Martin Francis
*/
Expand Down Expand Up @@ -1665,6 +1665,20 @@ button.tiny {
.addLogFor a.pri {
font-weight: bold;
}
.addLogFor input {
display: inline;
margin: 4px 2px 4px 0;
text-align: center;
border-radius: 0;
height: 28px;
padding: 0.25em;
width: 4em;
}
.addLogFor #btn_rxxid_go {
display: inline;
margin: 0 0.125em;
padding: 6px;
}
.logon #form {
width: 300px;
}
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.min.css

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion public/js/functions.js
@@ -1,7 +1,7 @@
/*
* Project: RXX - NDB Logging Database
* Homepage: https://rxx.classaxe.com
* Version: 2.39.1
* Version: 2.39.2
* Date: 2022-07-01
* Licence: LGPL
* Copyright: 2022 Martin Francis
Expand Down Expand Up @@ -1108,6 +1108,11 @@ var LISTENERS_FORM = {
window.open('./listeners/new', 'listener_new', popWinSpecs['listeners_[id]']);
return false;
});
$('#btn_rxxid_go').click(function() {
window.open('./listeners/' + $('#rxxid').val() + '/upload', '_blank', popWinSpecs['listeners_[id]_upload']);
return false;
});

},

setActiveAction : function(enable) {
Expand Down
2 changes: 1 addition & 1 deletion public/js/functions.min.js

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions src/css/include/listeners/form.less
Expand Up @@ -16,4 +16,18 @@
font-weight: bold;
}
}
input {
display: inline;
margin: 4px 2px 4px 0;
text-align: center;
border-radius: 0;
height: 28px;
padding: 0.25em;
width: 4em;
}
#btn_rxxid_go {
display: inline;
margin: 0 0.125em;
padding: 6px;
}
}
5 changes: 5 additions & 0 deletions src/js/listeners.js
Expand Up @@ -42,6 +42,11 @@ var LISTENERS_FORM = {
window.open('./listeners/new', 'listener_new', popWinSpecs['listeners_[id]']);
return false;
});
$('#btn_rxxid_go').click(function() {
window.open('./listeners/' + $('#rxxid').val() + '/upload', '_blank', popWinSpecs['listeners_[id]_upload']);
return false;
});

},

setActiveAction : function(enable) {
Expand Down
9 changes: 7 additions & 2 deletions templates/listeners/addlogfor.html.twig
@@ -1,11 +1,16 @@
{% if isAdmin %}
<div class="links_left row addLogFor">
<div class="small-12 medium-1"><strong>{% trans %}Add Log for:{% endtrans %}</strong></div>
<div class="small-12 medium-1">
<strong>{% trans %}Add Log for:{% endtrans %}</strong><br>
<form class="form">
<div><input type="text" id="rxxid" placeholder="RXX ID"><a class="button tiny" id="btn_rxxid_go">GO</a></div>
</form>
</div>
<div class="small-12 medium-11">
{% for l in latestListeners %}
<div class="display-inline text-nowrap">
<a href="{{ url('listener_logsupload', { 'system' : system, 'id': l.id }) }}"
title="{{ l.name|raw}}, {{ l.qth }}{% if l.sp %}, {{ l.sp }}{% endif %}, {{ l.itu }} [{{ l.gsq }}]"
title="{{ l.id }} | {{ l.name|raw}}, {{ l.qth }}{% if l.sp %}, {{ l.sp }}{% endif %}, {{ l.itu }} [{{ l.gsq }}]"
data-popup="1"{% if l.primaryQth %} class="pri"{% endif %}>
{{ l.name|raw }}
</a> ({{ l.sp ? l.sp : l.itu }}){% if not loop.last %} &nbsp; | &nbsp; {% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/listeners/latestlogs.html.twig
Expand Up @@ -4,7 +4,7 @@
<div class="small-12 medium-11">
{% for l in latestLogs['listeners'] %}
<a href="{{ url('listener_logs', { 'system' : system, 'id': l.id }) }}"
title="{{ l.name|raw}}, {{ l.qth }}{% if l.sp %}, {{ l.sp }}{% endif %}, {{ l.itu }} [{{ l.gsq }}]"
title="{{ l.id }} | {{ l.name|raw}}, {{ l.qth }}{% if l.sp %}, {{ l.sp }}{% endif %}, {{ l.itu }} [{{ l.gsq }}]"
data-popup="1"{% if l.primaryQth %} class="pri"{% endif %}>
{{ l.name|raw }}
</a> ({{ l.sp ? l.sp : l.itu }})
Expand Down

0 comments on commit 7409268

Please sign in to comment.