luci-app-k3usb: code alignment

diff --git a/applications/luci-app-k3usb/Makefile b/applications/luci-app-k3usb/Makefile
index 120c1aa..8920c7a 100644 (file)
--- a/applications/luci-app-k3usb/Makefile
+++ b/applications/luci-app-k3usb/Makefile
@@ -3,7 +3,6 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for k3usb3.0 on or off
-LUCI_DESCRIPTION:=LuCI Support for k3usb3.0 on or off.
 LUCI_DEPENDS:=@TARGET_bcm53xx_generic_DEVICE_phicomm_k3
 LUCI_PKGARCH:=all
 

diff --git a/applications/luci-app-k3usb/luasrc/controller/k3usb.lua b/applications/luci-app-k3usb/luasrc/controller/k3usb.lua
index 5af1488..68a5261 100644 (file)
--- a/applications/luci-app-k3usb/luasrc/controller/k3usb.lua
+++ b/applications/luci-app-k3usb/luasrc/controller/k3usb.lua
@@ -3,8 +3,11 @@
 module("luci.controller.k3usb", package.seeall)
 
 function index()
-    if not nixio.fs.access("/etc/config/k3usb") then
-        return
-    end
-    entry({"admin","system","k3usb"}, cbi("k3usb"), _("k3usb"),60).acl_depends = { "luci-app-k3usb" }
+       if not nixio.fs.access("/etc/config/k3usb") then
+               return
+       end
+
+       local page = entry({"admin", "system", "k3usb"}, cbi("k3usb"), _("k3usb"), 60)
+       page.dependent = true
+       page.acl_depends = { "luci-app-k3usb" }
 end

diff --git a/applications/luci-app-k3usb/luasrc/model/cbi/k3usb.lua b/applications/luci-app-k3usb/luasrc/model/cbi/k3usb.lua
index 5a1aa4b..1654135 100644 (file)
--- a/applications/luci-app-k3usb/luasrc/model/cbi/k3usb.lua
+++ b/applications/luci-app-k3usb/luasrc/model/cbi/k3usb.lua
@@ -1,13 +1,15 @@
 -- Copyright (C) 2018 XiaoShan mivm.cn
 
-local m, s ,o
+local m, s, o
 
-m = Map("k3usb", translate("k3usb"), translate("k3 usb mode"))
+m = Map("k3usb", translate("k3usb"))
+m.description = translate("k3 usb mode")
 
-s = m:section(TypedSection, "config", translate("usb mode") )
+s = m:section(TypedSection, "config", translate("usb mode"))
 s.anonymous = true
 
-o = s:option(Flag, "usb3_enable", translate("usb3 enable :"), translate("usb3 mode enable"))
+o = s:option(Flag, "usb3_enable", translate("usb3 enable :"))
+o.description = translate("usb3 mode enable")
 o.default = 1
 
 return m

diff --git a/applications/luci-app-k3usb/po/zh_Hans/k3usb.po b/applications/luci-app-k3usb/po/zh_Hans/k3usb.po
index 3cf42eb..1616529 100644 (file)
--- a/applications/luci-app-k3usb/po/zh_Hans/k3usb.po
+++ b/applications/luci-app-k3usb/po/zh_Hans/k3usb.po
@@ -15,5 +15,3 @@ msgstr "开启或禁用USB3"
 
 msgid "usb mode"
 msgstr "USB3管理模式"
-
-

diff --git a/applications/luci-app-k3usb/root/etc/uci-defaults/k3usb b/applications/luci-app-k3usb/root/etc/uci-defaults/luci-k3usb
similarity index 89%
rename from applications/luci-app-k3usb/root/etc/uci-defaults/k3usb
rename to applications/luci-app-k3usb/root/etc/uci-defaults/luci-k3usb
index 087c903..527a328 100755 (executable)
--- a/applications/luci-app-k3usb/root/etc/uci-defaults/k3usb
+++ b/applications/luci-app-k3usb/root/etc/uci-defaults/luci-k3usb
@@ -7,4 +7,5 @@ uci -q batch <<-EOF >/dev/null
        commit ucitrack
 EOF
 
+rm -rf /tmp/luci-*
 exit 0