update-12.11

UnblockNeteaseMusic/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_BASE_VERSION:=0.27.0-rc.2
-PKG_RELEASE:=40
+PKG_RELEASE:=41
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
 PKG_SOURCE_DATE:=2021-11-27
-PKG_SOURCE_VERSION:=c31eea3cd11cae205f412bb405399f4e7c4bd889
+PKG_SOURCE_VERSION:=6ddef16f706ba3c22dd52211fcdc7a956871c1c9
 PKG_MIRROR_HASH:=skip
 
 PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))

luci-app-ssr-mudb-server/Makefile

@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI support for SSR Mudb Server
 LUCI_DEPENDS:=+libsodium +luci-lib-jsonc +python3
 LUCI_PKGARCH:=all
-PKG_VERSION:=10
+PKG_VERSION:=11
-PKG_DATE:=20200619
+PKG_DATE:=20211211
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

luci-app-ssr-mudb-server/root/usr/share/ssr_mudb_server/shadowsocks/lru_cache.py

@@ -41,7 +41,7 @@ except:
 
 SWEEP_MAX_ITEMS = 1024
 
-class LRUCache(collections.MutableMapping):
+class LRUCache(collections.abc.MutableMapping):
     """This class is not thread safe"""
 
     def __init__(self, timeout=60, close_callback=None, *args, **kwargs):

luci-app-ssr-mudb-server/root/usr/share/ssr_mudb_server/shadowsocks/ordereddict.py

@@ -109,7 +109,7 @@ class OrderedDict(dict):
         for k in self:
             yield (k, self[k])
 
-    update = collections.MutableMapping.update
+    update = collections.abc.MutableMapping.update
 
     __update = update # let subclasses override update without breaking __init__
 

luci-theme-opentopd_new/Makefile

@@ -1,27 +0,0 @@
-# Copyright (C) 2008-2019 Jerrykuku
-# Copyright (C) 2019-2020 sirpdboy
-# http://www.github.com/sirpdboy/luci-theme-opentopd
-# This is free software, licensed under the Apache License, Version 2.0 .
-
-include $(TOPDIR)/rules.mk
-
-THEME_NAME:=opentopd
-THEME_TITLE:=opentopd_new kenzo
-
-PKG_NAME:=luci-theme-$(THEME_NAME)
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=20201115
-
-include $(INCLUDE_DIR)/package.mk
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-define Package/luci-theme-opentopd/postinst
-#!/bin/sh
-
-rm -Rf /var/luci-modulecache
-rm -Rf /var/luci-indexcache
-exit 0
-
-endef
-# call BuildPackage - OpenWrt buildroot signature

luci-theme-opentopd_new/htdocs/luci-static/opentopd/css/fonts.css

@@ -1,23 +0,0 @@
-/**
- *  Opentopd is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
- * https://github.com/sirpdboy/luci-theme-opentopd  
- *   
- *      Copyright 2020 sirpdboy
- *  luci-theme-bootstrap:
- *      Copyright 2008 Steven Barth <steven@midlink.org>
- *      Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- *      Copyright 2012 David Menting <david@nut-bolt.nl>
- *
- *  MUI:
- *      https://github.com/muicss/mui
- *
- *  luci-theme-material:
- *      https://github.com/LuttyYang/luci-theme-material/
- *
- *  Agron Theme
- *	    https://demos.creative-tim.com/argon-dashboard/index.html
- *
- *
- *  Licensed to the public under the Apache License 2.0 
- */
-@font-face{font-family:'sirpdboy';src:url('../fonts/sirpdboy.eot?uaho9q');src:url('../fonts/sirpdboy.eot?uaho9q#iefix') format('embedded-opentype'),url('../fonts/sirpdboy.ttf?uaho9q') format('truetype'),url('../fonts/sirpdboy.woff?uaho9q') format('woff'),url('../fonts/sirpdboy.svg?uaho9q#sirpdboy') format('svg');font-weight:normal;font-style:normal;font-display:block}[class^="icon-"],[class*=" icon-"]{font-family:'sirpdboy' !important;speak:never;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-vpn:before{content:"\e900"}.icon-info:before{content:"\e901"}.icon-docker:before{content:"\e902"}.icon-pasword:before{content:"\e90c"}.icon-service:before{content:"\e904"}.icon-nas:before{content:"\e905"}.icon-home:before{content:"\e906"}.icon-password2:before{content:"\e90d"}.icon-network:before{content:"\e908"}.icon-user:before{content:"\e909"}.icon-cheveron-right:before{content:"\e90a"}.icon-system:before{content:"\e90b"}.icon-Network:before{content:"\e911"}.icon-cheveron-down:before{content:"\e20b"}.icon-cheveron-up:before{content:"\e20a"}.icon-spinner:before{content:"\e903"}.icon-spinner2:before{content:"\e603"}.icon-menu:before{content:"\e20e"}.icon-exit:before{content:"\e907"}.icon-checkmark:before{content:"\e90e"}.icon-cancel:before{content:"\e90f"}.icon-stats:before{content:"\e910"}.icon-question:before{content:"\f059"}

luci-theme-opentopd_new/htdocs/luci-static/opentopd/js/script.js

@@ -1,288 +0,0 @@
-/**
- *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
- *
- *  luci-theme-argon
- *      Copyright 2019 Jerrykuku <jerrykuku@qq.com>
- *
- *  Have a bug? Please create an issue here on GitHub!
- *      https://github.com/jerrykuku/luci-theme-argon/issues
- *
- *  luci-theme-bootstrap:
- *      Copyright 2008 Steven Barth <steven@midlink.org>
- *      Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- *      Copyright 2012 David Menting <david@nut-bolt.nl>
- *
- *  MUI:
- *      https://github.com/muicss/mui
- *
- *  luci-theme-material:
- *      https://github.com/LuttyYang/luci-theme-material/
- *
- *  Agron Theme
- *	    https://demos.creative-tim.com/argon-dashboard/index.html
- *
- *  Login background
- *      https://unsplash.com/
- *
- *  Licensed to the public under the Apache License 2.0
- */
-
-/*
- *  Font generate by Icomoon<icomoon.io>
- */
-(function ($) {
-	$(".main > .loading").hide();
-    $(".main > .loading").fadeOut();
-
-    /**
-     * trim text, Remove spaces, wrap
-     * @param text
-     * @returns {string}
-     */
-    function trimText(text) {
-        return text.replace(/[ \t\n\r]+/g, " ");
-    }
-
-
-    var lastNode = undefined;
-    var mainNodeName = undefined;
-
-    var nodeUrl = "";
-    (function (node) {
-        if (node[0] == "admin") {
-            luciLocation = [node[1], node[2]];
-        } else {
-            luciLocation = node;
-        }
-
-        for (var i in luciLocation) {
-            nodeUrl += luciLocation[i];
-            if (i != luciLocation.length - 1) {
-                nodeUrl += "/";
-            }
-        }
-    })(luciLocation);
-
-    /**
-     * get the current node by Burl (primary)
-     * @returns {boolean} success?
-     */
-    function getCurrentNodeByUrl() {
-        var ret = false;
-        if (!$('body').hasClass('logged-in')) {
-            luciLocation = ["Main", "Login"];
-            return true;
-        }
-        $(".main > .main-left > .nav > .slide > .active").next(".slide-menu").stop(true).slideUp("fast");
-        $(".main > .main-left > .nav > .slide > .menu").removeClass("active");
-        $(".main > .main-left > .nav > .slide > .menu").each(function () {
-            var ulNode = $(this);
-
-            ulNode.next().find("a").each(function () {
-                var that = $(this);
-                var href = that.attr("href");
-
-                if (href.indexOf(nodeUrl) != -1) {
-                    ulNode.click();
-                    ulNode.next(".slide-menu").stop(true, true);
-                    lastNode = that.parent();
-                    lastNode.addClass("active");
-                    ret = true;
-                    return true;
-                }
-            });
-        });
-        return ret;
-    }
-
-    /**
-     * menu click
-     */
-    $(".main > .main-left > .nav > .slide > .menu").click(function () {
-        var ul = $(this).next(".slide-menu");
-        var menu = $(this);
-        if (!menu.hasClass("exit")) {
-            $(".main > .main-left > .nav > .slide > .active").next(".slide-menu").stop(true).slideUp("fast");
-            $(".main > .main-left > .nav > .slide > .menu").removeClass("active");
-            if (!ul.is(":visible")) {
-                menu.addClass("active");
-                ul.addClass("active");
-                ul.stop(true).slideDown("fast");
-            } else {
-                ul.stop(true).slideUp("fast", function () {
-                    menu.removeClass("active");
-                    ul.removeClass("active");
-                });
-            }
-
-            return false;
-        }
-
-    });
-
-
-
-
-// define what element should be observed by the observer
-// and what types of mutations trigger the callback
-    if ($("#cbi-dhcp-lan-ignore").length > 0) {
-        observer.observe(document.getElementById("cbi-dhcp-lan-ignore"), {
-            subtree: true,
-            attributes: true
-        });
-    }
-
-    /**
-     * hook menu click and add the hash
-     */
-    $(".main > .main-left > .nav > .slide > .slide-menu > li > a").click(function () {
-        if (lastNode != undefined)
-            lastNode.removeClass("active");
-        $(this).parent().addClass("active");
-        $(".main > .loading").fadeIn("fast");
-        return true;
-    });
-
-    /**
-     * fix menu click
-     */
-    $(".main > .main-left > .nav > .slide > .slide-menu > li").click(function () {
-        if (lastNode != undefined)
-            lastNode.removeClass("active");
-        $(this).addClass("active");
-        $(".main > .loading").fadeIn("fast");
-        window.location = $($(this).find("a")[0]).attr("href");
-        return false;
-    });
-    
-    /**
-     * fix submenu click
-     */
-    $("#maincontent > .container > .tabs > li").click(function () {
-        $(".main > .loading").fadeIn("fast");
-        window.location = $($(this).find("a")[0]).attr("href");
-        return false;
-    });
-
-    /**
-     * get current node and open it
-     */
-    if (getCurrentNodeByUrl()) {
-        mainNodeName = "node-" + luciLocation[0] + "-" + luciLocation[1];
-        mainNodeName = mainNodeName.replace(/[ \t\n\r\/]+/g, "_").toLowerCase();
-        $("body").addClass(mainNodeName);
-    }
-    $(".cbi-button-up").val("");
-    $(".cbi-button-down").val("");
-
-
-    /**
-     * hook other "A Label" and add hash to it.
-     */
-    $("#maincontent > .container").find("a").each(function () {
-        var that = $(this);
-        var onclick = that.attr("onclick");
-        if (onclick == undefined || onclick == "") {
-            that.click(function () {
-                var href = that.attr("href");
-                if (href.indexOf("#") == -1) {
-                    $(".main > .loading").fadeIn("fast");
-                    return true;
-                }
-            });
-        }
-    });
-
-    /**
-     * Sidebar expand
-     */
-    var showSide = false;
-    $(".showSide").click(function () {
-        if (showSide) {
-            $(".darkMask").stop(true).fadeOut("fast");
-            $(".main-left").stop(true).animate({
-                width: "0"
-            }, "fast");
-            $(".main-right").css("overflow-y", "auto");
-            showSide = false;
-        } else {
-            $(".darkMask").stop(true).fadeIn("fast");
-            $(".main-left").stop(true).animate({
-                width: "15rem"
-            }, "fast");
-            $(".main-right").css("overflow-y", "hidden");
-            showSide = true;
-        }
-    });
-
-
-    $(".darkMask").click(function () {
-        if (showSide) {
-            showSide = false;
-            $(".darkMask").stop(true).fadeOut("fast");
-            $(".main-left").stop(true).animate({
-                width: "0"
-            }, "fast");
-            $(".main-right").css("overflow-y", "auto");
-        }
-    });
-
-    $(window).resize(function () {
-        if ($(window).width() > 921) {
-            $(".main-left").css("width", "");
-            $(".darkMask").stop(true);
-            $(".darkMask").css("display", "none");
-            showSide = false;
-        }
-    });
-
-    /**
-     * fix legend position
-     */
-    $("legend").each(function () {
-        var that = $(this);
-        that.after("<span class='panel-title'>" + that.text() + "</span>");
-    });
-
-    $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () {
-        var that = $(this);
-        if (that.text().trim() == "") {
-            that.css("display", "none");
-        }
-    });
-
-    $(".node-main-login > .main .cbi-value.cbi-value-last .cbi-input-text").focus(function () {
-        //$(".node-main-login > .main > .main-right > .login-bg").addClass("blur");
-    });
-    $(".node-main-login > .main .cbi-value.cbi-value-last .cbi-input-text").blur(function () {
-        //$(".node-main-login > .main > .main-right > .login-bg").removeClass("blur");
-    });
-
-
-    $(".main-right").focus();
-    $(".main-right").blur();
-    $("input").attr("size", "0");
-
-    if (mainNodeName != undefined) {
-        console.log(mainNodeName);
-        switch (mainNodeName) {
-            case "node-status-system_log":
-            case "node-status-kernel_log":
-                $("#syslog").focus(function () {
-                    $("#syslog").blur();
-                    $(".main-right").focus();
-                    $(".main-right").blur();
-                });
-                break;
-            case "node-status-firewall":
-                var button = $(".node-status-firewall > .main fieldset li > a");
-                button.addClass("cbi-button cbi-button-reset a-to-btn");
-                break;
-            case "node-system-reboot":
-                var button = $(".node-system-reboot > .main > .main-right p > a");
-                button.addClass("cbi-button cbi-input-reset a-to-btn");
-                break;
-        }
-    }
-
-})(jQuery);

luci-theme-opentopd_new/luasrc/view/themes/opentopd/footer.htm

@@ -1,76 +0,0 @@
-<%#
-	opentopd is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI
-
-	luci-theme-opentopd
-    Copyright 2020 sirpdboy <sirpdboy@qq.com>
-	Have a bug? Please create an issue here on GitHub!
-	https://github.com/sirpdboy/luci-theme-opentopd/issues
-     
-	luci-theme-bootstrap:
-	Copyright 2015-2017 Lutty Yang <lutty@wcan.in>
-	Copyright 2008 Steven Barth <steven@midlink.org>
-	Copyright 2008-2016 Jo-Philipp Wich <jow@openwrt.org>
-	Copyright 2012 David Menting <david@nut-bolt.nl>
-
-	MUI:
-	https://github.com/muicss/mui
-
-	luci-theme-material:
-	https://github.com/LuttyYang/luci-theme-material/
-
-	Agron Theme
-	https://demos.creative-tim.com/argon-dashboard/index.html
-
-	Login background
-	https://unsplash.com/
-
-	Font generate by Icomoon
-	https://icomoon.io/
-
-	Licensed to the public under the Apache License 2.0
--%>
-
-<%
-	local ver = require "luci.version"
-	local disp = require "luci.dispatcher"
-	local request  = disp.context.path
-	local category = request[1]
-	local tree = disp.node()
-	local categories = disp.node_childs(tree)
-%>
-                </div>
-                <footer class="mobile-hide">
-
-		<a class="luci-link" href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %>
-			(<%= ver.luciversion %>)</a> /
-		<a href="https://github.com/sirpdboy/luci-theme-opentopd">OpentopdTheme <%# vPKG_VERSION %></a> /
-		<%= ver.distversion %>
-                    <% if #categories > 1 then %>
-                    <ul class="breadcrumb pull-right" id="modemenu">
-                        <% for i, r in ipairs(categories) do %>
-                        <li<% if request[1] == r then %> class="active"<%end%>><a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a> <span class="divider">|</span></li>
-                        <% end %>
-                    </ul>
-                    <% end %>
-
-                </footer>
-            </div>
-        </div>
-
-    <script>
-        // thanks for Jo-Philipp Wich <jow@openwrt.org>
-        var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>;
-	var winHeight = $(window).height();
-	$(window).resize(function () {
-		var winWidth = $(window).width()
-		if(winWidth < 600){
-			var newHeight = $(this).height();
-			var keyboradHeight = newHeight - winHeight;
-			$(".ftc").css("bottom", keyboradHeight + 30);
-		}
-	})
-    </script>
-    
-    <script src="<%=media%>/js/script.js?v=<%=math.random(1,100000)%>"></script>
-</body>
-</html>

luci-theme-opentopd_new/luasrc/view/themes/opentopd/header.htm

@@ -1,300 +0,0 @@
-<%#
-	opentopd is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI
-
-	luci-theme-opentopd
-    Copyright 2020 sirpdboy <sirpdboy@qq.com>
-	Have a bug? Please create an issue here on GitHub!
-	https://github.com/sirpdboy/luci-theme-opentopd/issues
-     
-	luci-theme-bootstrap:
-	Copyright 2015-2017 Lutty Yang <lutty@wcan.in>
-	Copyright 2008 Steven Barth <steven@midlink.org>
-	Copyright 2008-2016 Jo-Philipp Wich <jow@openwrt.org>
-	Copyright 2012 David Menting <david@nut-bolt.nl>
-
-	MUI:
-	https://github.com/muicss/mui
-
-	Licensed to the public under the Apache License 2.0
--%>
-
-<%
-	local sys  = require "luci.sys"
-	local util = require "luci.util"
-	local http = require "luci.http"
-	local disp = require "luci.dispatcher"
-	local fs	= require "nixio.fs"
-	local nutil = require "nixio.util"
-
-	local boardinfo = util.ubus("system", "board")
-
-	local request  = disp.context.path
-	local request2 = disp.context.request
-
-	local category = request[1]
-	local cattree  = category and disp.node(category)
-
-	local leaf = request2[#request2]
-
-	local tree = disp.node()
-	local node = disp.context.dispatched
-
-	local categories = disp.node_childs(tree)
-
-	local c = tree
-	local i, r
-	
-	function glob(...)
-		local iter, code, msg = fs.glob(...)
-		if iter then
-			return nutil.consume(iter)
-		else
-			return nil, code, msg
-		end
-	end
-	
-	-- tag all nodes leading to this page
-	for i, r in ipairs(request) do
-		if c.nodes and c.nodes[r] then
-			c = c.nodes[r]
-			c._menu_selected = true
-		end
-	end
-
-	-- send as HTML5
-	http.prepare_content("text/html")
-
-	local function nodeurl(prefix, name, query)
-		local u = url(prefix, name)
-		if query then
-			u = u .. http.build_querystring(query)
-		end
-		return pcdata(u)
-	end
-
-	local function render_tabmenu(prefix, node, level)
-		if not level then
-			level = 1
-		end
-
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			if level > 2 then
-				write('<ul class="tabs">')
-			end
-
-			local selected_node
-			local selected_name
-			local i, v
-
-			for i, v in ipairs(childs) do
-				local nnode = node.nodes[v]
-				if nnode._menu_selected then
-					selected_node = nnode
-					selected_name = v
-				end
-
-				if level > 2 then
-					write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-						v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'active' or '',
-						nodeurl(prefix, v, nnode.query),
-						striptags(translate(nnode.title))
-					})
-				end
-			end
-
-			if level > 2 then
-				write('</ul>')
-			end
-
-			if selected_node then
-				render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-			end
-		end
-	end
-
-	local function render_submenu(prefix, node)
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			write('<ul class="slide-menu">')
-
-			for i, r in ipairs(childs) do
-				local nnode = node.nodes[r]
-				local title = pcdata(striptags(translate(nnode.title)))
-
-				write('<li><a data-title="%s" href="%s">%s</a></li>' %{
-					title,
-					nodeurl(prefix, r, nnode.query),
-					title
-				})
-			end
-
-			write('</ul>')
-		end
-	end
-
-	local function render_topmenu()
-		local childs = disp.node_childs(cattree)
-		if #childs > 0 then
-			write('<ul class="nav">')
-
-			for i, r in ipairs(childs) do
-				local nnode = cattree.nodes[r]
-				local grandchildren = disp.node_childs(nnode)
-
-				if #grandchildren > 0 then
-					local title = pcdata(striptags(translate(nnode.title)))
-                                        local en_title = pcdata(striptags(string.gsub(nnode.title," ","_")))
-					write('<li class="slide"><a class="menu" data-title="%s" href="#">%s</a>' %{
-						en_title,
-						title
-					})
-
-					render_submenu(category .. "/" .. r, nnode)
-					write('</li>')
-				else
-					local title = pcdata(striptags(translate(nnode.title)))
-                                        local en_title = pcdata(striptags(nnode.title))
-					write('<li  class="slide"><a  class="menu exit" data-title="%s" href="%s">%s</a></li>' %{
-						en_title,
-						nodeurl(category, r, nnode.query),
-						title
-					})
-				end
-			end
-
-			write('</ul>')
-		end
-	end
-
-	local function render_changes()
-		-- calculate the number of unsaved changes
-		if tree.nodes[category] and tree.nodes[category].ucidata then
-			local ucichanges = 0
-			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-				for k, l in pairs(j) do
-					for m, n in pairs(l) do
-						ucichanges = ucichanges + 1;
-					end
-				end
-			end
-
-			if ucichanges > 0 then
-				write('<a class="uci_change_indicator label notice" href="%s?redir=%s">%s: %d</a>' %{
-					url(category, 'uci/changes'),
-					http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/")),
-					translate('Unsaved Changes'),
-					ucichanges
-				})
-			end
-		end
-	end
-	
-	math.randomseed(os.time())
-	
-	local bgcount = 0
-	for f in ipairs(glob("/www/luci-static/opentopd/img/*")) do
-		bgcount = bgcount + 1
-	end
-	
-	
--%>
-<!DOCTYPE html>
-<html lang="<%=luci.i18n.context.lang%>">
-<head>
-	<meta charset="utf-8">
-	<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
-	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
-        <meta name="format-detection" content="telephone=no, email=no"/>
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="x5-fullscreen" content="true">
-        <meta name="full-screen" content="yes">
-        <meta name="x5-page-mode" content="app">
-        <meta name="browsermode" content="application">
-        <meta name="msapplication-tap-highlight" content="no">
-        <meta name="msapplication-TileColor" content="#f36c21">
-
-        <meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-        <meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-        <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
-        <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
-        <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
-	<link rel="stylesheet" href="<%=media%>/css/style.css?v=<%=math.random(1,100000)%>">
-	<link rel="stylesheet" href="<%=media%>/css/pure-min.css?v=<%=math.random(1,100000)%>">
-	<link rel="shortcut icon" href="<%=media%>/favicon.ico"> 
-			<% if node and node.css then %>
-			<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
-		<% end -%>
-		<% if css then %>
-			<style title="text/css"><%= css %></style>
-		<% end -%>
-	<script src="<%=resource%>/cbi.js<%# ?v=PKG_VERSION %>"></script>
-	<script src="<%=resource%>/xhr.js<%# ?v=PKG_VERSION %>"></script>
-	<script src="<%=media%>/js/jquery.min.js<%# ?v=PKG_VERSION %>"></script>
-</head>
-<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
-
-<div class="main">
-    <div style="" class="loading">
-        <div class="sk-folding-cube">
-            <div class="sk-cube1 sk-cube"></div>
-            <div class="sk-cube2 sk-cube"></div>
-            <div class="sk-cube4 sk-cube"></div>
-            <div class="sk-cube3 sk-cube"></div>
-        </div>
-    </div>
-    <div class="main-left">
-        <div class="sidenav-header d-flex align-items-center">
-            <a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a> 
-            <div class="ml-auto">
-                <!-- Sidenav toggler -->
-                <div class="sidenav-toggler d-none d-xl-block active" data-action="sidenav-unpin" data-target="#sidenav-main">
-                    <div class="sidenav-toggler-inner">
-                        <i class="sidenav-toggler-line"></i>
-                        <i class="sidenav-toggler-line"></i>
-                        <i class="sidenav-toggler-line"></i>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <% render_topmenu() %>
-    </div>
-	<div class="main-right">
-            <header class="bg-primary">
-                <div class="fill">
-                    <div class="container">
-                        <a class="showSide"></a>
-                        <a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a>
-                        <div class="pull-right">
-                            <% render_changes() %>
-                            <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
-                                <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
-                                <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
-                            </span>
-                        </div>
-                    </div>
-                </div>
-            </header>
-		<div class="darkMask"></div>
-		<% if bgcount > 0 then %>
-		<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,bgcount)%>.jpg)"></div>
-		<% end %>
-		<div id="maincontent">
-			<div class="container">
-				<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
-					<div class="alert-message warning">
-						<h4><%:No password set!%></h4>
-						<p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
-						<div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
-					</div>
-				<%- end -%>
-
-				<noscript>
-					<div class="alert-message warning">
-						<h4><%:JavaScript required!%></h4>
-						<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
-					</div>
-				</noscript>
-
-				<% if category then render_tabmenu(category, cattree) end %>

luci-theme-opentopd_new/root/etc/uci-defaults/30_luci-theme-opentopd

@@ -1,7 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-	set luci.themes.opentopd=/luci-static/opentopd
-	set luci.main.mediaurlbase=/luci-static/opentopd
-	commit luci
-EOF
-exit 0