From db5bde618b6c373797754d3e9648b87121933ec8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 29 Jul 2018 20:59:43 +0200 Subject: [PATCH] luci-mod-admin-full: rework DSL Status display Fixes #2003. Signed-off-by: Jo-Philipp Wich (cherry picked from commit 88713f64568fdc96920fd6eabaa5dde3ecfbfed3) --- .../luasrc/view/admin_status/index.htm | 101 ++++++------------ 1 file changed, 32 insertions(+), 69 deletions(-) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index db8535086..a56d904d9 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -221,63 +221,36 @@ <% end %> <% if has_dsl then %> - var dsl_i = document.getElementById('dsl_i'); - var dsl_s = document.getElementById('dsl_s'); - - var s = String.format( - '<%:Status%>: %s
' + - '<%:Line State%>: %s [0x%x]
' + - '<%:Line Mode%>: %s
' + - '<%:Annex%>: %s
' + - '<%:Profile%>: %s
' + - '<%:Data Rate%>: %s/s / %s/s
' + - '<%:Max. Attainable Data Rate (ATTNDR)%>: %s/s / %s/s
' + - '<%:Latency%>: %s / %s
' + - '<%:Line Attenuation (LATN)%>: %s dB / %s dB
' + - '<%:Signal Attenuation (SATN)%>: %s dB / %s dB
' + - '<%:Noise Margin (SNR)%>: %s dB / %s dB
' + - '<%:Aggregate Transmit Power(ACTATP)%>: %s dB / %s dB
' + - '<%:Forward Error Correction Seconds (FECS)%>: %s / %s
' + - '<%:Errored seconds (ES)%>: %s / %s
' + - '<%:Severely Errored Seconds (SES)%>: %s / %s
' + - '<%:Loss of Signal Seconds (LOSS)%>: %s / %s
' + - '<%:Unavailable Seconds (UAS)%>: %s / %s
' + - '<%:Header Error Code Errors (HEC)%>: %s / %s
' + - '<%:Non Pre-emtive CRC errors (CRC_P)%>: %s / %s
' + - '<%:Pre-emtive CRC errors (CRCP_P)%>: %s / %s
' + - '<%:Line Uptime%>: %s
' + - '<%:ATU-C System Vendor ID%>: %s
' + - '<%:Power Management Mode%>: %s
', - info.dsl.line_state, info.dsl.line_state_detail, - info.dsl.line_state_num, - info.dsl.line_mode_s, - info.dsl.annex_s, - info.dsl.profile_s, - info.dsl.data_rate_down_s, info.dsl.data_rate_up_s, - info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s, - info.dsl.latency_num_down, info.dsl.latency_num_up, - info.dsl.line_attenuation_down, info.dsl.line_attenuation_up, - info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up, - info.dsl.noise_margin_down, info.dsl.noise_margin_up, - info.dsl.actatp_down, info.dsl.actatp_up, - info.dsl.errors_fec_near, info.dsl.errors_fec_far, - info.dsl.errors_es_near, info.dsl.errors_es_far, - info.dsl.errors_ses_near, info.dsl.errors_ses_far, - info.dsl.errors_loss_near, info.dsl.errors_loss_far, - info.dsl.errors_uas_near, info.dsl.errors_uas_far, - info.dsl.errors_hec_near, info.dsl.errors_hec_far, - info.dsl.errors_crc_p_near, info.dsl.errors_crc_p_far, - info.dsl.errors_crcp_p_near, info.dsl.errors_crcp_p_far, - info.dsl.line_uptime_s, - info.dsl.atuc_vendor_id, - info.dsl.power_mode_s - ); - - dsl_s.innerHTML = String.format('%s', s); - dsl_i.innerHTML = String.format( - '' + - '
DSL' - ); + var ds = document.getElementById('dsl_status_table'); + + while (ds.lastElementChild) + ds.removeChild(ds.lastElementChild); + + ds.appendChild(renderBox( + '<%:DSL Status%>', + (info.dsl.line_state === 'UP'), [ ], + '<%:Line State%>', '%s [0x%x]'.format(info.dsl.line_state, info.dsl.line_state_detail), + '<%:Line Mode%>', info.dsl.line_mode_s || '-', + '<%:Line Uptime%>', info.dsl.line_uptime_s || '-', + '<%:Annex%>', info.dsl.annex_s || '-', + '<%:Profile%>', info.dsl.profile_s || '-', + '<%:Data Rate%>', '%s/s / %s/s'.format(info.dsl.data_rate_down_s, info.dsl.data_rate_up_s), + '<%:Max. Attainable Data Rate (ATTNDR)%>', '%s/s / %s/s'.format(info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s), + '<%:Latency%>', '%s / %s'.format(info.dsl.latency_num_down, info.dsl.latency_num_up), + '<%:Line Attenuation (LATN)%>', '%d dB / %d dB'.format(info.dsl.line_attenuation_down, info.dsl.line_attenuation_up), + '<%:Signal Attenuation (SATN)%>', '%d dB / %d dB'.format(info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up), + '<%:Noise Margin (SNR)%>', '%d dB / %d dB'.format(info.dsl.noise_margin_down, info.dsl.noise_margin_up), + '<%:Aggregate Transmit Power(ACTATP)%>', '%d dB / %d dB'.format(info.dsl.actatp_down, info.dsl.actatp_up), + '<%:Forward Error Correction Seconds (FECS)%>', '%d / %d'.format(info.dsl.errors_fec_near, info.dsl.errors_fec_far), + '<%:Errored seconds (ES)%>', '%d / %d'.format(info.dsl.errors_es_near, info.dsl.errors_es_far), + '<%:Severely Errored Seconds (SES)%>', '%d / %d'.format(info.dsl.errors_ses_near, info.dsl.errors_ses_far), + '<%:Loss of Signal Seconds (LOSS)%>', '%d / %d'.format(info.dsl.errors_loss_near, info.dsl.errors_loss_far), + '<%:Unavailable Seconds (UAS)%>', '%d / %d'.format(info.dsl.errors_uas_near, info.dsl.errors_uas_far), + '<%:Header Error Code Errors (HEC)%>', '%d / %d'.format(info.dsl.errors_hec_near, info.dsl.errors_hec_far), + '<%:Non Pre-emtive CRC errors (CRC_P)%>', '%d / %d'.format(info.dsl.errors_crc_p_near, info.dsl.errors_crc_p_far), + '<%:Pre-emtive CRC errors (CRCP_P)%>', '%d / %d'.format(info.dsl.errors_crcp_p_near, info.dsl.errors_crcp_p_far), + '<%:ATU-C System Vendor ID%>', info.dsl.atuc_vendor_id, + '<%:Power Management Mode%>', info.dsl.power_mode_s)); <% end %> <% if has_wifi then %> @@ -452,18 +425,8 @@

<%:DSL%>

-
-
-
<%:DSL Status%>
-
-
-
-

?
-
<%:Collecting data...%>
-
-
-
-
+
+

<%:Collecting data...%>

<% end %> -- 2.25.1