ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changing HTML stuff to accommodate generic paging display.

This commit is contained in:
Marat Fayzullin 2023-05-27 00:04:42 -04:00
parent defdf73396
commit c0ea503bf5
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/css/openwebrx.css
View File

@ -1198,23 +1198,32 @@ img.openwebrx-mirror-img
white-space: pre; white-space: pre;
} }
#openwebrx-panel-flex-message { #openwebrx-panel-page-message {
height: 310px; height: 310px;
} }
#openwebrx-panel-flex-message tbody { #openwebrx-panel-page-message tbody {
height: 280px; height: 280px;
} }
#openwebrx-panel-flex-message .address { #openwebrx-panel-page-message .address {
width: 100px; width: 120px;
font-weight: bold; font-weight: bold;
background-color: #fff; background-color: #fff;
text-align: center;
color: #000; color: #000;
} }
#openwebrx-panel-flex-message .timestamp { #openwebrx-panel-page-message .mode {
width: 486px; width: 120px;
font-weight: normal;
background-color: #fff;
text-align: center;
color: #000;
}
#openwebrx-panel-page-message .timestamp {
width: 346px;
max-width: 486px; max-width: 486px;
font-weight: bold; font-weight: bold;
background-color: #fff; background-color: #fff;
@ -1223,7 +1232,7 @@ img.openwebrx-mirror-img
white-space: pre; white-space: pre;
} }
#openwebrx-panel-flex-message .message { #openwebrx-panel-page-message .message {
width: 566px; width: 566px;
max-width: 566px; max-width: 566px;
column-span: all; column-span: all;

2
htdocs/index.html
View File

@ -83,7 +83,7 @@
<div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-js8-message" style="display:none; width: 619px;" data-panel-name="js8-message"></div> <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-js8-message" style="display:none; width: 619px;" data-panel-name="js8-message"></div>
<div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message"></div> <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message"></div>
<div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message"></div> <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message"></div>
<div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-flex-message" style="display: none; width: 619px;" data-panel-name="flex-message"></div> <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-page-message" style="display: none; width: 619px;" data-panel-name="page-message"></div>
<div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-m17" style="display: none;" data-panel-name="metadata-m17"> <div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-m17" style="display: none;" data-panel-name="metadata-m17">
<div class="openwebrx-meta-slot"> <div class="openwebrx-meta-slot">
<div class="openwebrx-meta-user-image"> <div class="openwebrx-meta-user-image">

2
htdocs/lib/DemodulatorPanel.js
View File

@ -166,7 +166,7 @@ DemodulatorPanel.prototype.updatePanels = function() {
toggle_panel("openwebrx-panel-js8-message", modulation == "js8"); toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
toggle_panel("openwebrx-panel-packet-message", ["packet", "ais"].indexOf(modulation) >= 0); toggle_panel("openwebrx-panel-packet-message", ["packet", "ais"].indexOf(modulation) >= 0);
toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag"); toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
toggle_panel("openwebrx-panel-flex-message", modulation === "flex"); toggle_panel("openwebrx-panel-page-message", modulation === "page");
toggle_panel("openwebrx-panel-sstv-message", modulation === "sstv"); toggle_panel("openwebrx-panel-sstv-message", modulation === "sstv");
toggle_panel("openwebrx-panel-fax-message", modulation === "fax"); toggle_panel("openwebrx-panel-fax-message", modulation === "fax");

24
htdocs/lib/MessagePanel.js
View File

@ -270,29 +270,30 @@ $.fn.pocsagMessagePanel = function() {
return this.data('panel'); return this.data('panel');
}; };
FlexMessagePanel = function(el) { PageMessagePanel = function(el) {
MessagePanel.call(this, el); MessagePanel.call(this, el);
this.initClearTimer(); this.initClearTimer();
this.modes = ['FLEX', 'POCSAG'];
} }
FlexMessagePanel.prototype = new MessagePanel(); PageMessagePanel.prototype = new MessagePanel();
FlexMessagePanel.prototype.supportsMessage = function(message) { PageMessagePanel.prototype.supportsMessage = function(message) {
return message['mode'] === 'FLEX'; return this.modes.indexOf(message['mode']) >= 0;
}; };
FlexMessagePanel.prototype.render = function() { PageMessagePanel.prototype.render = function() {
$(this.el).append($( $(this.el).append($(
'<table>' + '<table>' +
'<thead><tr>' + '<thead><tr>' +
'<th>FLEX</th>' + '<th>Paging</th>' +
'</tr></thead>' + '</tr></thead>' +
'<tbody></tbody>' + '<tbody></tbody>' +
'</table>' '</table>'
)); ));
}; };
FlexMessagePanel.prototype.pushMessage = function(msg) { PageMessagePanel.prototype.pushMessage = function(msg) {
var html_escape = function(input) { var html_escape = function(input) {
return $('<div/>').text(input).html() return $('<div/>').text(input).html()
}; };
@ -300,14 +301,15 @@ FlexMessagePanel.prototype.pushMessage = function(msg) {
var $b = $(this.el).find('tbody'); var $b = $(this.el).find('tbody');
$b.append($( $b.append($(
'<tr>' + '<tr>' +
'<td class="address">' + msg.capcode + '</td>' + '<td class="address">' + msg.address + '</td>' +
'<td class="mode">' + msg.mode + msg.baud + '</td>' +
'<td class="timestamp">' + msg.timestamp + '</td>' + '<td class="timestamp">' + msg.timestamp + '</td>' +
'</tr>' '</tr>'
)); ));
if (msg.hasOwnProperty('message')) { if (msg.hasOwnProperty('message')) {
$b.append($( $b.append($(
'<tr><td class="message" colspan="2">' + '<tr><td class="message" colspan="3">' +
html_escape(msg.message) + html_escape(msg.message) +
'</td></tr>' '</td></tr>'
)); ));
@ -315,9 +317,9 @@ FlexMessagePanel.prototype.pushMessage = function(msg) {
$b.scrollTop($b[0].scrollHeight); $b.scrollTop($b[0].scrollHeight);
}; };
$.fn.flexMessagePanel = function() { $.fn.pageMessagePanel = function() {
if (!this.data('panel')) { if (!this.data('panel')) {
this.data('panel', new FlexMessagePanel(this)); this.data('panel', new PageMessagePanel(this));
} }
return this.data('panel'); return this.data('panel');
}; };

4
htdocs/openwebrx.js
View File

@ -1169,7 +1169,7 @@ function on_ws_recv(evt) {
$("#openwebrx-panel-wsjt-message").wsjtMessagePanel(), $("#openwebrx-panel-wsjt-message").wsjtMessagePanel(),
$('#openwebrx-panel-packet-message').packetMessagePanel(), $('#openwebrx-panel-packet-message').packetMessagePanel(),
$('#openwebrx-panel-pocsag-message').pocsagMessagePanel(), $('#openwebrx-panel-pocsag-message').pocsagMessagePanel(),
$('#openwebrx-panel-flex-message').flexMessagePanel(), $('#openwebrx-panel-page-message').pageMessagePanel(),
$('#openwebrx-panel-sstv-message').sstvMessagePanel(), $('#openwebrx-panel-sstv-message').sstvMessagePanel(),
$('#openwebrx-panel-fax-message').faxMessagePanel(), $('#openwebrx-panel-fax-message').faxMessagePanel(),
$("#openwebrx-panel-js8-message").js8() $("#openwebrx-panel-js8-message").js8()
@ -1844,7 +1844,7 @@ function secondary_demod_init() {
$('#openwebrx-panel-wsjt-message').wsjtMessagePanel(); $('#openwebrx-panel-wsjt-message').wsjtMessagePanel();
$('#openwebrx-panel-packet-message').packetMessagePanel(); $('#openwebrx-panel-packet-message').packetMessagePanel();
$('#openwebrx-panel-pocsag-message').pocsagMessagePanel(); $('#openwebrx-panel-pocsag-message').pocsagMessagePanel();
$('#openwebrx-panel-flex-message').flexMessagePanel(); $('#openwebrx-panel-page-message').pageMessagePanel();
$('#openwebrx-panel-sstv-message').sstvMessagePanel(); $('#openwebrx-panel-sstv-message').sstvMessagePanel();
$('#openwebrx-panel-fax-message').faxMessagePanel(); $('#openwebrx-panel-fax-message').faxMessagePanel();
$('#openwebrx-panel-js8-message').js8(); $('#openwebrx-panel-js8-message').js8();