luci-app-adblock: sync with adblock 4.4.3-1

Signed-off-by: Dirk Brenken <[email protected]>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 34873c0714512d954533b18304bd715d3832e3d4..d67ad27c55847bef65e1da65cbffbc9941e7a45d 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -6,9 +6,10 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI support for Adblock
 LUCI_DEPENDS:=+luci-base +adblock
 
+PKG_VERSION:=4.4.3
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Hannu Nyman <[email protected]>, \
-       Dirk Brenken <[email protected]>
+PKG_MAINTAINER:=Dirk Brenken <[email protected]>
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
index 4080f6cf008b8ad269f8399f5e98524ce5798514..59d4e442d85b94cbc7c436372e01a96bf0c67d45 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
@@ -325,6 +325,7 @@ return view.extend({
                                                'class': 'btn cbi-button cbi-button-positive',
                                                'style': 'word-break: inherit',
                                                'name': 'allowlist',
+                                               'title': 'Add to Allowlist',
                                                'value': content[0].requests[i].domain,
                                                'click': handleAction
                                        }, [_('Allowlist...')]);
@@ -333,6 +334,7 @@ return view.extend({
                                                'class': 'btn cbi-button cbi-button-negative',
                                                'style': 'word-break: inherit',
                                                'name': 'blocklist',
+                                               'title': 'Add to Blocklist',
                                                'value': content[0].requests[i].domain,
                                                'click': handleAction
                                        }, [_('Blocklist...')]);
@@ -384,10 +386,20 @@ return view.extend({
                                ])
                        ]),
                        E('div', { 'class': 'cbi-page-actions' }, [
+                               E('button', {
+                                       'class': 'btn cbi-button cbi-button-apply',
+                                       'style': 'float:none;margin-right:.4em;',
+                                       'id': 'btnTest',
+                                       'title': 'Adblock Test',
+                                       'click': function() {
+                                               window.open('https://adblock.turtlecute.org/', '_blank', 'noopener,noreferrer');
+                                       }
+                               }, [_('Adblock Test')]),
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-apply',
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btnMap',
+                                       'title': 'Map',
                                        'disabled': 'disabled',
                                        'click': ui.createHandlerFn(this, function () {
                                                if (content[1] && content[1].length > 1) {
@@ -401,10 +413,11 @@ return view.extend({
                                                        }
                                                }
                                        })
-                               }, [_('Map...')]),
+                               }, [_('Map')]),
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-apply',
                                        'style': 'float:none;margin-right:.4em;',
+                                       'title': 'Blocklist Query',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleAction('query');
                                        })
@@ -412,6 +425,7 @@ return view.extend({
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-positive important',
                                        'style': 'float:none;margin-right:.4em;',
+                                       'title': 'Refresh',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleAction('refresh');
                                        })

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
index 6a133c343931fab62cb189a7950f990119455995..1740e8a945b2e29ab0ec04cf926d4f0b03fd85d7 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
@@ -249,6 +249,7 @@ return view.extend({
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btnDownload',
                                        'disabled': 'disabled',
+                                       'title': 'Download',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleEdit('download');
                                        })
@@ -258,6 +259,7 @@ return view.extend({
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btnUpload',
                                        'disabled': 'disabled',
+                                       'title': 'Upload',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleEdit('upload');
                                        })
@@ -267,6 +269,7 @@ return view.extend({
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btnCreate',
                                        'disabled': 'disabled',
+                                       'title': 'Fill',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleEdit('create');
                                        })
@@ -276,6 +279,7 @@ return view.extend({
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btnClear',
                                        'disabled': 'disabled',
+                                       'title': 'Clear',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleEdit('clear');
                                        })
@@ -285,6 +289,7 @@ return view.extend({
                                        'style': 'float:none',
                                        'id': 'btnSave',
                                        'disabled': 'disabled',
+                                       'title': 'Save',
                                        'click': ui.createHandlerFn(this, function () {
                                                return handleEdit('save');
                                        })

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 044ad9bd76cbd6313ad7f594f510f8e3fdf4aca2..7b55e907bfdde9ba7e447cebeab1c47595e6592a 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -231,10 +231,10 @@ return view.extend({
                o.datatype = 'range(1,300)';
                o.rmempty = true;
 
-               o = s.taboption('general', form.Flag, 'adb_dnsforce', _('Force Local DNS'), _('Redirect all DNS queries from specified zones to the local DNS resolver, applies to UDP and TCP protocol.'));
+               o = s.taboption('general', form.Flag, 'adb_dnsforce', _('Force Local DNS'), _('Redirect all local DNS queries from specified LAN zones to the local DNS resolver, applies to UDP and TCP protocol.'));
                o.rmempty = false;
 
-               o = s.taboption('general', widgets.ZoneSelect, 'adb_zonelist', _('Forced Zones'), _('Firewall source zones that should be forced locally.'));
+               o = s.taboption('general', widgets.ZoneSelect, 'adb_zonelist', _('Forced Zones'), _('Firewall LAN source zones that should be forced locally.'));
                o.depends('adb_dnsforce', '1');
                o.multiple = true;
                o.nocreate = true;
@@ -398,10 +398,6 @@ return view.extend({
                o.default = '<em style="color:#37c;font-weight:bold;">' + _('Changes on this tab needs an adblock service restart to take effect.') + '</em>'
                        + '<hr style="width: 200px; height: 1px;" />';
 
-               o = s.taboption('adv_report', form.DummyValue, '_sub');
-               o.rawhtml = true;
-               o.default = '<em><b>Changes on this tab needs a full adblock service restart to take effect.</b></em>';
-
                o = s.taboption('adv_report', widgets.DeviceSelect, 'adb_repiface', _('Report Interface'), _('List of available network devices used by tcpdump.'));
                o.nocreate = false;
                o.rmempty = true;
@@ -566,6 +562,7 @@ return view.extend({
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-negative important',
                                        'style': 'float:none;margin-right:.4em;',
+                                       'title': 'Stop',
                                        'click': function () {
                                                return handleAction('stop');
                                        }
@@ -574,6 +571,7 @@ return view.extend({
                                        'class': 'btn cbi-button cbi-button-apply important',
                                        'style': 'float:none;margin-right:.4em;',
                                        'id': 'btn_suspend',
+                                       'title': 'Suspend/Resume',
                                        'click': function () {
                                                return handleAction('suspend');
                                        }
@@ -581,6 +579,7 @@ return view.extend({
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-positive important',
                                        'style': 'float:none;margin-right:.4em;',
+                                       'title': 'Save & Reload',
                                        'click': function () {
                                                return handleAction('reload');
                                        }
@@ -588,6 +587,7 @@ return view.extend({
                                E('button', {
                                        'class': 'btn cbi-button cbi-button-positive important',
                                        'style': 'float:none',
+                                       'title': 'Save & Restart',
                                        'click': function () {
                                                handleAction('restart');
                                        }