diff --git a/luci-theme-argon/htdocs/luci-static/resources/menu-argon.js b/luci-theme-argon/htdocs/luci-static/resources/menu-argon.js index 3f4dd67f0..df491e611 100644 --- a/luci-theme-argon/htdocs/luci-static/resources/menu-argon.js +++ b/luci-theme-argon/htdocs/luci-static/resources/menu-argon.js @@ -204,18 +204,10 @@ return baseclass.extend({ * @param {Object} tree - Menu tree structure from LuCI */ render: function (tree) { - var node = tree, - url = '', - children = ui.menu.getChildren(tree); + var node = tree; + var url = ''; - // Find and render the active main menu item - for (var i = 0; i < children.length; i++) { - var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0); - - if (isActive) { - this.renderMainMenu(children[i], children[i].name); - } - } + this.renderModeMenu(node); // Render tab menu if we're deep enough in the navigation hierarchy if (L.env.dispatchpath.length >= 3) { @@ -357,6 +349,27 @@ return baseclass.extend({ return menuContainer; }, + renderModeMenu: function (tree) { + var menu = document.querySelector('#modemenu'); + var children = ui.menu.getChildren(tree); + + for (var i = 0; i < children.length; i++) { + var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0); + if (i > 0) + menu.appendChild(E([], ['\u00a0|\u00a0'])); + menu.appendChild(E('li', {}, [ + E('a', { + 'href': L.url(children[i].name), + 'class': isActive ? 'active' : null + }, [_(children[i].title)]) + ])); + if (isActive) + this.renderMainMenu(children[i], children[i].name); + } + if (menu.children.length > 1) + menu.style.display = ''; + }, + /** * Render tab navigation menu * Creates horizontal tab menu for deeper navigation levels diff --git a/luci-theme-argon/less/page-fix.less b/luci-theme-argon/less/page-fix.less index 42071a6da..d1685139a 100644 --- a/luci-theme-argon/less/page-fix.less +++ b/luci-theme-argon/less/page-fix.less @@ -651,6 +651,17 @@ } +// Services - SmartDNS +#cbi-smartdns { + #service_status { + padding: 16px; + } + + .cbi-section-node { + padding: 16px; + } +} + #cbi-docker { .cbi-section { diff --git a/xray-core/Makefile b/xray-core/Makefile index a4375eedb..fdadfcad9 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=26.1.31 +PKG_VERSION:=26.2.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2aaa75d67bf590f46e1d0c9ea8d15ed6761585f3c94111e70c111c269e2b4433 +PKG_HASH:=ac96aeef609cccca15a4e3db4426fcc62c65d1e6438b59ebb4234b4d94e5800f PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0