suyuan168 · suyuan168 · Feb 20, 2024 · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -260,9 +260,12 @@
 				} else if (mArray.openmptcprouter.wan_addr6 != "" && mArray.openmptcprouter.service_addr == "127.0.0.1")
 				{
 					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr6);
-				} else if (mArray.openmptcprouter.direct_output == false)
+				} else if (mArray.openmptcprouter.wan_addr6 != "" && mArray.openmptcprouter.direct_output == false)
 				{
 					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr6);
+				} else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.direct_output == false)
+				{
+					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr);
 				} else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.direct_output == true)
 				{
 					var title = String.format("%s (%s)", _('Direct output'), mArray.openmptcprouter.wan_addr);

diff --git a/luci-theme-argon/Makefile b/luci-theme-argon/Makefile
@@ -8,8 +8,10 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=2.2.9.4
-PKG_RELEASE:=20220425
+PKG_VERSION:=2.3.1
+PKG_RELEASE:=20230420
+
+CONFIG_LUCI_CSSTIDY:=
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

diff --git a/luci-theme-argon/README.md b/luci-theme-argon/README.md
@@ -1,114 +1,157 @@
+<!-- markdownlint-configure-file {
+  "MD013": {
+    "code_blocks": false,
+    "tables": false,
+    "line_length":200
+  },
+  "MD033": false,
+  "MD041": false
+} -->
+
+[license]: /LICENSE
+[license-badge]: https://img.shields.io/github/license/jerrykuku/luci-theme-argon?style=flat-square&a=1
+[prs]: https://github.com/jerrykuku/luci-theme-argon/pulls
+[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
+[issues]: https://github.com/jerrykuku/luci-theme-argon/issues/new
+[issues-badge]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=flat-square
+[release]: https://github.com/jerrykuku/luci-theme-argon/releases
+[release-badge]: https://img.shields.io/github/v/release/jerrykuku/luci-theme-argon?include_prereleases&style=flat-square
+[download]: https://github.com/jerrykuku/luci-theme-argon/releases
+[download-badge]: https://img.shields.io/github/downloads/jerrykuku/luci-theme-argon/total?style=flat-square
+[contact]: https://t.me/jerryk6
+[contact-badge]: https://img.shields.io/badge/Contact-telegram-blue?style=flat-square
+[en-us-link]: /README.md
+[zh-cn-link]: /README_ZH.md
+[en-us-release-log]: /RELEASE.md
+[zh-cn-release-log]: /RELEASE_ZH.md
+[config-link]: https://github.com/jerrykuku/luci-app-argon-config/releases
+[lede]: https://github.com/coolsnowwolf/lede
+[official]: https://github.com/openwrt/openwrt
+[immortalwrt]: https://github.com/immortalwrt/immortalwrt
+
 <div align="center">
-  <img src="https://raw.githubusercontent.com/jerrykuku/staff/master/argon_title2.png"  >
-  <h1 align="center">
-    A new LuCI theme for OpenWrt
-  </h1>
-    <h3 align="center">
-    Argon is a clean HTML5 theme for LuCI. Users may<br>setup their own favorite logins, including beautiful<br>pics and customized mp4 videos.<br><br>
-  </h3>
-<a href="/LICENSE">
-    <img src="https://img.shields.io/github/license/jerrykuku/luci-theme-argon?style=flat-square&a=1" alt="">
-  </a>
-  <a href="https://github.com/jerrykuku/luci-theme-argon/pulls">
-    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square" alt="">
-  </a><a href="https://github.com/jerrykuku/luci-theme-argon/issues/new">
-    <img src="https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=flat-square">
-  </a><a href="https://github.com/jerrykuku/luci-theme-argon/releases">
-    <img src="https://img.shields.io/github/release/jerrykuku/luci-theme-argon.svg?style=flat-square">
-  </a><a href="hhttps://github.com/jerrykuku/luci-theme-argon/releases">
-    <img src="https://img.shields.io/github/downloads/jerrykuku/luci-theme-argon/total?style=flat-square">
-  </a><a href="https://t.me/jerryk6">
-    <img src="https://img.shields.io/badge/Contact-telegram-blue?style=flat-square">
-  </a> 
-</div>
-<br>
-<div align="center">
-  <img src="https://raw.githubusercontent.com/jerrykuku/staff/master/argon2.gif">
+<img src="https://raw.githubusercontent.com/jerrykuku/staff/master/argon_title4.svg">
+
+# A brand new OpenWrt LuCI theme
+
+Argon is **a clean and tidy OpenWrt LuCI theme** that allows<br/>
+users to customize their login interface with images or videos.  
+It also supports automatic and manual switching between light and dark modes.
+
+[![license][license-badge]][license]
+[![prs][prs-badge]][prs]
+[![issues][issues-badge]][issues]
+[![release][release-badge]][release]
+[![download][download-badge]][download]
+[![contact][contact-badge]][contact]
+
+**English** |
+[简体中文][zh-cn-link]
+
+[Key Features](#key-features) •
+[Branch](#branch-introduction) •
+[Version History](#version-history) •
+[Getting started](#getting-started) •
+[Screenshots](#screenshots) •
+[Contributors](#contributors) •
+[Credits](#credits)
+
+<img src="https://raw.githubusercontent.com/jerrykuku/staff/master/argon2.gif">
 </div>
 
-<br>English | [简体中文](README_ZH.md)
-
-## Notice 
-It is strongly recommended to use the Chrome browser. Some new css3 features are used in the theme, and currently only Chrome has the best compatibility.
-The mainline version of IE series currently has bugs to be resolved.
-FireFox does not enable the backdrop-filter by default, see here for the opening method: https://developer.mozilla.org/zh-CN/docs/Web/CSS/backdrop-filter
-
-v2.x.x Adapt to official mainline snapshot.  
-You can checkout branch 18.06 for OpenWRT 18.06 or lean 19.07.
-
-## Update Log 2021.10.16 v2.2.9
-
-- 【v2.2.9】Fix the problem that the menu could not pop up in mobile mode  
-- 【v2.2.9】Unify the settings of css spacing  
-- 【v2.2.9】Refactored the code of the login page  
-- 【v2.2.8】Fix the problem that the Minify Css option is turned on when compiling, which causes the frosted glass effect to be invalid and the logo font is lost.  
-- 【v2.2.5】New config app for argon theme. You can set the blur and transparency of the login page of argon theme, and manage the background pictures and videos.[Chrome is recommended] [Download](https://github.com/jerrykuku/luci-app-argon-config/releases/download/v0.8-beta/luci-app-argon-config_0.8-beta_all.ipk)
-- 【v2.2.5】Automatically set as the default theme when compiling.
-- 【v2.2.5】Modify the file structure to adapt to luci-app-argon-config. The old method of turning on dark mode is no longer applicable, please use it with luci-app-argon-config.
-- 【v2.2.5】Adapt to Koolshare lede 2.3.6。
-- 【v2.2.5】Fix some Bug。
-- 【v2.2.4】Fix the problem that the login background cannot be displayed on some phones.
-- 【v2.2.4】Remove the dependency of luasocket.
-- 【v2.2.3】Fix Firmware flash page display error in dark mode.
-- 【v2.2.3】Update font icon, add a default icon of undefined menu.
-- 【v2.2.2】Add custom login background,put your image (allow png jpg gif) or MP4 video into /www/luci-static/argon/background, random change.
-- 【v2.2.2】Add force dark mode, login ssh and type "touch /etc/dark" to open dark mode.
-- 【v2.2.2】Add a volume mute button for video background, default is muted.
-- 【v2.2.2】fix login page when keyboard show the bottom text overlay the button on mobile.
-- 【v2.2.2】fix select color in dark mode,and add a style for scrollbar.
-- 【v2.2.2】jquery update to v3.5.1.
-- 【v2.2.2】change request bing api method form wget to luasocket (DEPENDS).
-- 【v2.2.1】Add blur effect for login form.
-- 【v2.2.1】New login theme, Request background imge from bing.com, Auto change everyday.
-- 【v2.2.1】New theme icon.
-- 【v2.2.1】Add more menu category  icon.
-- 【v2.2.1】Fix font-size and padding margin.
-- 【v2.2.1】Restructure css file.
-- 【v2.2.1】Auto adapt to dark mode.
-
-## How to build
-
-Enter in your openwrt/package/lean or other
-
-### Lean lede
+## Key Features
 
-```
-cd lede/package/lean  
-rm -rf luci-theme-argon  
-git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git  
-make menuconfig #choose LUCI->Theme->Luci-theme-argon  
-make -j1 V=s  
-```
+- Clean Layout.
+- Adapted to mobile display.
+- Customizable theme colors.
+- Support for using Bing images as login background.
+- Support for custom uploading of images or videos as login background.
+- Automatically switch between light and dark modes with the system, and can also be set to a fixed mode.
+- Settings plugin with extensions [luci-app-argon-config][config-link]
+
+## Branch Introduction
+
+There are currently two main branches that are adapted to different versions of the **OpenWrt** source code.  
+The table below will provide a detailed introduction:
+
+| Branch | Version | Description                        | Matching source                                           |
+| ------ | ------- | ---------------------------------- | --------------------------------------------------------- |
+| master | v2.x.x  | Support the latest version of LuCI | [Official OpenWrt][official] • [ImmortalWrt][immortalwrt] |
+| 18.06  | v1.x.x  | Support the 18.06 version of LuCI  | [Lean's LEDE][lede]                                         |
+
+## Version History
+
+The latest version is v2.3.1 [Click here][en-us-release-log] to view the full version history record.
+
+## Getting started
 
-### Openwrt official SnapShots
+### Build for Lean's LEDE project
 
+```bash
+cd lede/package/lean
+rm -rf luci-theme-argon
+git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git luci-theme-argon
+make menuconfig #choose LUCI->Theme->Luci-theme-argon
+make -j1 V=s
 ```
+
+### Build for OpenWrt official SnapShots and ImmortalWrt
+
+```bash
 cd openwrt/package
-git clone https://github.com/jerrykuku/luci-theme-argon.git  
-make menuconfig #choose LUCI->Theme->Luci-theme-argon  
-make -j1 V=s  
+git clone https://github.com/jerrykuku/luci-theme-argon.git
+make menuconfig #choose LUCI->Theme->Luci-theme-argon
+make -j1 V=s
 ```
 
-## How to Install 
-
-### For Lean openwrt 18.06 LuCI
+### Install for LuCI 18.06 ( Lean's LEDE )
 
-```
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.7.3/luci-theme-argon-18.06_1.7.3-20220421_all.ipk
+```bash
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.8.2/luci-theme-argon_1.8.2-20230609_all.ipk
 opkg install luci-theme-argon*.ipk
 ```
 
-### For openwrt official 19.07 Snapshots LuCI master
+### Install for OpenWrt official SnapShots and ImmortalWrt
 
-```
+```bash
 opkg install luci-compat
 opkg install luci-lib-ipkg
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.9/luci-theme-argon_2.2.9-20211016-1_all.ipk
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.3.1/luci-theme-argon_2.3.1_all.ipk
 opkg install luci-theme-argon*.ipk
 ```
-![](/Screenshots/screenshot_pc.jpg)
-![](/Screenshots/screenshot_phone.jpg)
 
-## Thanks to
+### Install luci-app-argon-config
+
+```bash
+wget --no-check-certificate https://github.com/jerrykuku/luci-app-argon-config/releases/download/v0.9/luci-app-argon-config_0.9_all.ipk
+opkg install luci-app-argon-config*.ipk
+```
+
+## Notice
+
+- Chrome browser is highly recommended. There are some new css3 features used in this theme, currently only Chrome has the best compatibility.
+- Microsoft has officially retired Internet Explorer, RIP IE🙏<del>Currently, the mainline version of the IE series has bugs that need to be addressed.</del>
+- FireFox does not enable the backdrop-filter by default, [see here](https://developer.mozilla.org/zh-CN/docs/Web/CSS/backdrop-filter) for the opening method.
+
+## Screenshots
+
+![desktop](/Screenshots/screenshot_pc.jpg)
+![mobile](/Screenshots/screenshot_phone.jpg)
+
+## Contributors
+
+<a href="https://github.com/jerrykuku/luci-theme-argon/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=jerrykuku/luci-theme-argon&v=2" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).
+
+## Related Projects
+
+- [luci-app-argon-config](https://github.com/jerrykuku/luci-app-argon-config): Argon theme config plugin
+- [openwrt-package](https://github.com/jerrykuku/openwrt-package): My OpenWrt package
+- [CasaOS](https://github.com/IceWhaleTech/CasaOS): A simple, easy-to-use, elegant open-source Personal Cloud system (My current main project)
+
+## Credits
 
-luci-theme-material: https://github.com/LuttyYang/luci-theme-material/
+[luci-theme-material](https://github.com/LuttyYang/luci-theme-material/)