Sync 2026-08-09 23:55:57

This commit is contained in:
github-actions[bot]
2026-08-09 23:55:58 +08:00
parent 9a04c03187
commit 29d33c355a
4 changed files with 23 additions and 17 deletions
@@ -1,5 +1,6 @@
<%
local api = require "luci.passwall.api"
local section_tag = api.is_js_luci() and "div" or "fieldset"
-%>
<%+header%>
<script type="text/javascript">
@@ -40,8 +41,8 @@ local api = require "luci.passwall.api"
);
//]]>
</script>
<fieldset class="cbi-section" id="_log_fieldset">
<<%=section_tag%> class="cbi-section" id="_log_fieldset">
<input class="btn cbi-button cbi-button-remove" type="button" onclick="clearlog()" value="<%:Clear logs%>" />
<textarea id="log_textarea" class="cbi-input-textarea" style="width: 100%;margin-top: 10px;" data-update="change" rows="40" wrap="off" readonly="readonly"></textarea>
</fieldset>
</<%=section_tag%>>
<%+footer%>
@@ -1,6 +1,8 @@
<%
local api = require "luci.passwall.api"
local appname = api.appname
local is_js_luci = api.is_js_luci()
local section_tag = is_js_luci and "div" or "fieldset"
-%>
<script src="<%=resource%>/view/<%=appname%>/Sortable.min.js?v=1.15.7"></script>
@@ -364,7 +366,7 @@ table td, .table .td {
</style>
<script type="text/javascript">
<% if api.is_js_luci() then -%>
<% if is_js_luci then -%>
var cbi_t = [];
function cbi_t_add(section, tab) {
var t = document.getElementById('tab.' + section + '.' + tab);
@@ -1286,7 +1288,7 @@ table td, .table .td {
</div>
<script type="text/template" id="nodes-table-template">
<fieldset class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-nodes-{{group}}-fieldset">
<<%=section_tag%> class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-nodes-{{group}}-fieldset">
<table class="table cbi-section-table" id="cbi-<%=appname%>-nodes-{{group}}-table" style="">
<tr class="tr cbi-section-table-titles anonymous">
<th class="th cbi-section-table-cell" style="width:20px">
@@ -1304,7 +1306,7 @@ table td, .table .td {
<input class="cbi-button cbi-button-add" type="button" value="<%:Add%>" onclick="node_action('add')">
<input class="cbi-button cbi-button-apply" style="display: none" type="button" id="save_order_btn_{{group}}" value="<%:Save Order%>" onclick="save_current_page_order('{{group}}')">
</div>
</fieldset>
</<%=section_tag%>>
</script>
<script type="text/template" id="node-tr-template">
@@ -1332,8 +1334,8 @@ table td, .table .td {
</tr>
</script>
<fieldset class="cbi-section" id="node_list">
</fieldset>
<<%=section_tag%> class="cbi-section" id="node_list">
</<%=section_tag%>>
<script type="text/javascript">
//init logic
@@ -1492,7 +1494,7 @@ table td, .table .td {
function addTabDOM(li, content) {
let tab_ul_html = '<ul class="cbi-tabmenu">';
let tab_content_html = '<fieldset class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-nodes">';
let tab_content_html = '<<%=section_tag%> class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-nodes">';
if (li) {
tab_ul_html += li;
}
@@ -1500,7 +1502,7 @@ table td, .table .td {
tab_content_html += content;
}
tab_ul_html += '</ul>';
tab_content_html += '</fieldset>';
tab_content_html += '</<%=section_tag%>>';
return tab_ul_html + tab_content_html;
}
@@ -2,6 +2,9 @@
local api = require "luci.passwall.api"
local appname = api.appname
local uci = api.uci
local is_js_luci = api.is_js_luci()
local section_tag = is_js_luci and "div" or "fieldset"
local title_tag = is_js_luci and "h3" or "legend"
-%>
<script src="<%=resource%>/view/<%=appname%>/Sortable.min.js"></script>
@@ -326,7 +329,7 @@ table td, .table .td {
<script type="text/template" id="shunt_rules-table-template">
<fieldset class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-shunt_rules-{{group}}-fieldset">
<<%=section_tag%> class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-shunt_rules-{{group}}-fieldset">
<table class="table cbi-section-table" id="cbi-<%=appname%>-shunt_rules-{{group}}-table" style="">
<tr class="tr cbi-section-table-titles anonymous">
<th class="th cbi-section-table-cell" style="width:30%">ID</th>
@@ -340,7 +343,7 @@ table td, .table .td {
<input class="cbi-button cbi-button-add" type="button" value="<%:Add%>" onclick="toPage('add')">
<input class="cbi-button cbi-button-apply" style="display: none" type="button" id="save_order_btn_{{group}}" value="<%:Save Order%>" onclick="save_current_page_order('{{group}}')">
</div>
</fieldset>
</<%=section_tag%>>
</script>
<script type="text/template" id="shunt_rule-tr-template">
@@ -358,11 +361,11 @@ table td, .table .td {
</tr>
</script>
<div class="cbi-section">
<h3>Sing-Box/Xray <%:Shunt Rule%></h3>
<<%=section_tag%> class="cbi-section">
<<%=title_tag%>>Sing-Box/Xray <%:Shunt Rule%></<%=title_tag%>>
<div class="cbi-section-descr"><a style="color: red"><%:Please note attention to the priority, the higher the order, the higher the priority.%></a></div>
<div id="shunt_rule_list"></div>
</div>
</<%=section_tag%>>
<script type="text/javascript">
function loadNodeList() {
@@ -428,7 +431,7 @@ table td, .table .td {
function addTabDOM(li, content) {
let tab_ul_html = '<ul class="cbi-tabmenu">';
let tab_content_html = '<fieldset class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-shunt_rules">';
let tab_content_html = '<<%=section_tag%> class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-shunt_rules">';
if (li) {
tab_ul_html += li;
}
@@ -436,7 +439,7 @@ table td, .table .td {
tab_content_html += content;
}
tab_ul_html += '</ul>';
tab_content_html += '</fieldset>';
tab_content_html += '</<%=section_tag%>>';
return tab_ul_html + tab_content_html;
}