summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-21 10:12:59 +0200
committerGitHub <noreply@github.com>2018-07-21 10:12:59 +0200
commitc67aec622ba2d689bc5bd1a1a1406f4c9cef7831 (patch)
tree46067c3d16c2cd3a8e814ccafdc9783fcac29658
parent3d762eb7b26fba55fa8b528bf7b365c2b9f31ef1 (diff)
parentaaddcac5b098f5f82e59385295f2c6712aae574b (diff)
Merge pull request #1976 from stangri/luci-app-simple-adblock
luci-app-simple-adblock: remove extra controller file
-rw-r--r--applications/luci-app-simple-adblock/Makefile2
-rw-r--r--applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua7
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot3
3 files changed, 1 insertions, 11 deletions
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index 8d2055829..2471078fc 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
LUCI_PKGARCH:=all
-PKG_RELEASE:=15
+PKG_RELEASE:=16
include ../../luci.mk
diff --git a/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua b/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua
deleted file mode 100644
index 46125b309..000000000
--- a/applications/luci-app-simple-adblock/luasrc/controller/simpleadblock.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-module("luci.controller.simpleadblock", package.seeall)
-function index()
- if not nixio.fs.access("/etc/config/simple-adblock") then
- return
- end
- entry({"admin", "services", "simpleadblock"}, cbi("simpleadblock"), _("Simple AdBlock"))
-end
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index f5c11ac7b..38baf58a4 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -94,9 +94,6 @@ msgstr ""
msgid "Some output"
msgstr ""
-msgid "Start Simple Adblock service"
-msgstr ""
-
msgid "Stop the download if it is stalled for set number of seconds"
msgstr ""