cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-07 12:44:06 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

🎄 Sync 2026-11-06 14:13:01

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-11-06 14:13:01 +08:00
1 parent 05540a262f
commit 550d4c0092
4 files changed
+36 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-passwall2/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.11.3
PKG_RELEASE:=168
PKG_RELEASE:=169
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm
+32 -19
View File
@@ -277,15 +277,16 @@ table td, .table .td {
<style>
.pw-toolbar {
width: 100%;
text-align: center;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 5px;
padding-block: calc(5px + var(--pw-extra-top, 0px)) calc(5px + var(--pw-extra-bottom, 0px)) !important;
}
.pw-toolbar-field {
width: 100%;
text-align: center;
display: inline-block;
padding: 5px 0 5px;
.pw-toolbar > .cbi-button {
margin: 0 !important;
}
#modal-mask {
@@ -1380,17 +1381,15 @@ table td, .table .td {
</script>
<div class="pw-toolbar">
<div class="pw-toolbar-field">
<input class="btn cbi-button cbi-button-add" type="button" onclick="node_action('add')" value="<%:Add%>" />
<input class="btn cbi-button cbi-button-add" type="button" onclick="add_link_div.open()" value="<%:Add the node via the link%>" />
<input class="btn cbi-button cbi-button-remove" type="button" onclick="node_action('del_all')" value="<%:Clear all nodes%>" />
<input class="btn cbi-button cbi-button-remove" type="button" onclick="delete_select_nodes()" value="<%:Delete select nodes%>" />
<input class="btn cbi-button cbi-button-edit" type="button" id="select_all_btn" onclick="checked_all_node(this)" value="<%:Select all%>" />
<input class="btn cbi-button cbi-button-edit" type="button" onclick="reassign_group_div.open()" value="<%:Reassign Group%>" />
<input class="btn cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:Save & Apply%>" />
<!--<input class="btn cbi-button cbi-button-save" type="submit" name="cbi.save" value="<%:Save%>" />-->
<!--<input class="btn cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'" />-->
</div>
<input class="btn cbi-button cbi-button-add" type="button" onclick="node_action('add')" value="<%:Add%>" />
<input class="btn cbi-button cbi-button-add" type="button" onclick="add_link_div.open()" value="<%:Add the node via the link%>" />
<input class="btn cbi-button cbi-button-remove" type="button" onclick="node_action('del_all')" value="<%:Clear all nodes%>" />
<input class="btn cbi-button cbi-button-remove" type="button" onclick="delete_select_nodes()" value="<%:Delete select nodes%>" />
<input class="btn cbi-button cbi-button-edit" type="button" id="select_all_btn" onclick="checked_all_node(this)" value="<%:Select all%>" />
<input class="btn cbi-button cbi-button-edit" type="button" onclick="reassign_group_div.open()" value="<%:Reassign Group%>" />
<input class="btn cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:Save & Apply%>" />
<!--<input class="btn cbi-button cbi-button-save" type="submit" name="cbi.save" value="<%:Save%>" />-->
<!--<input class="btn cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'" />-->
</div>
<script type="text/template" id="nodes-table-template">
@@ -1678,8 +1677,22 @@ table td, .table .td {
loadNodeList();
//Node list option saving logic
document.addEventListener("DOMContentLoaded", function () {
// Themes space sections differently, so add padding on the side with the smaller gap.
const toolbar = document.querySelector(".pw-toolbar");
const nodes = document.getElementById("node_list");
const section = toolbar.parentElement.querySelector(".cbi-section");
function updateToolbarSpacing() {
const bounds = toolbar.getBoundingClientRect();
const above = bounds.top - section.getBoundingClientRect().bottom;
const below = nodes.getBoundingClientRect().top - bounds.bottom;
toolbar.style.setProperty("--pw-extra-top", Math.max(0, below - above) + "px");
toolbar.style.setProperty("--pw-extra-bottom", Math.max(0, above - below) + "px");
}
updateToolbarSpacing();
window.addEventListener("resize", updateToolbarSpacing);
// Save node list options when they change.
function onChange(option, value, refresh) {
ajax.abortAll();
XHR.get('<%=api.url("save_node_list_opt")%>', {
luci-app-vantage/Makefile
+1 -1
View File
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-vantage
PKG_VERSION:=1.0.15
PKG_RELEASE:=26
PKG_RELEASE:=27
PKG_LICENSE:=GPL-3.0-or-later
LUCI_TITLE:=Vantage dashboard
luci-app-vantage/htdocs/luci-static/resources/view/vantage/overview.js
+2 -2
View File
@@ -583,8 +583,8 @@ return view.extend({
asidePage: function(media, themeHere, hasLuciDashboard, hasOverview) {
var theme = (typeof media === 'string') ? media.replace(/\/+$/, '').replace(/^.*\//, '') : '';
if (!theme || theme === 'vantage' || themeHere !== true) return null;
if (hasLuciDashboard === true) return LUCI_DASHBOARD.slice();
return hasOverview === false ? null : LUCI_OVERVIEW.slice();
// if (hasLuciDashboard === true) return LUCI_DASHBOARD.slice();
// return hasOverview === false ? null : LUCI_OVERVIEW.slice();
},
/* before load() asks for anything. Under Vantage (or an unnamed theme)