oweals/luci.git
6 years agoluci-mod-admin-full: properly remap ports in switch status display
Jo-Philipp Wich [Tue, 26 Jun 2018 17:49:42 +0000 (19:49 +0200)]
luci-mod-admin-full: properly remap ports in switch status display

Fixes: 60c5d15e9 ("luci-mod-admin-full: fix possible switch status layout bug")
Fixes: bbf096c79 ("luci-mod-admin-full: cleanup markup")
Reported-at: https://forum.lede-project.org/t/x/15897/19
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix possible switch status layout bug
Jo-Philipp Wich [Tue, 26 Jun 2018 13:24:16 +0000 (15:24 +0200)]
luci-mod-admin-full: fix possible switch status layout bug

In some cases we might get status information for more ports than which are
actually usable, prevent overflowing the port status row in this case.

Reported-at: https://forum.lede-project.org/t/x/15897/14
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: add some compatibility styles
Jo-Philipp Wich [Tue, 26 Jun 2018 12:59:24 +0000 (14:59 +0200)]
luci-theme-openwrt: add some compatibility styles

Add a few CSS rules and general tweaks improving the look of legacy markup.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1912 from Ansuel/fixassoci
Jo-Philipp Wich [Tue, 26 Jun 2018 12:34:58 +0000 (14:34 +0200)]
Merge pull request #1912 from Ansuel/fixassoci

luci-mod-admin-full: fix missing wifi_assoclist

6 years agoluci-theme-freifunk-generic: fix & modernize
Jo-Philipp Wich [Tue, 26 Jun 2018 12:31:39 +0000 (14:31 +0200)]
luci-theme-freifunk-generic: fix & modernize

Align theme with current markup, port missing CSS directives from OpenWrt
theme and drop a few outdated resources.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix missing wifi_assoclist 1912/head
Ansuel Smith [Tue, 26 Jun 2018 12:30:36 +0000 (14:30 +0200)]
luci-mod-admin-full: fix missing wifi_assoclist

With #e5ba594d77eed77d31d4b9b8c0e86026eb5a5fac the list of the connected device broke up. This fix this problem by creating a proper request link.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1881 from TDT-AG/pr/20180614-luci-mod-admin-full-fix-ssh-key...
Jo-Philipp Wich [Mon, 25 Jun 2018 09:41:41 +0000 (11:41 +0200)]
Merge pull request #1881 from TDT-AG/pr/20180614-luci-mod-admin-full-fix-ssh-key-textarea

luci-mod-admin-full: fix empty SSH-Keys textarea issue

6 years agoluci-mod-admin-full: report SNR unit as dB, not dBm
zjw [Wed, 13 Jun 2018 14:30:25 +0000 (10:30 -0400)]
luci-mod-admin-full: report SNR unit as dB, not dBm

Fixes: #1880
Reported-by: "zjw"
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1906 from ldir-EDB0/typofix
Jo-Philipp Wich [Mon, 25 Jun 2018 09:19:36 +0000 (11:19 +0200)]
Merge pull request #1906 from ldir-EDB0/typofix

luci-app-rp-pppoe: Fix typo

6 years agoluci-base: add "Name" label to autogenerated title column
Jo-Philipp Wich [Mon, 25 Jun 2018 09:12:25 +0000 (11:12 +0200)]
luci-base: add "Name" label to autogenerated title column

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: render tblsection row titles
Jo-Philipp Wich [Mon, 25 Jun 2018 07:52:29 +0000 (09:52 +0200)]
luci-theme-bootstrap: render tblsection row titles

The Bootstrap theme lacked appropriate CSS yet to render section title
attributes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: annotate tblsection description row as well
Jo-Philipp Wich [Mon, 25 Jun 2018 07:51:18 +0000 (09:51 +0200)]
luci-base: annotate tblsection description row as well

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: remove unused styles
Jo-Philipp Wich [Mon, 25 Jun 2018 07:42:10 +0000 (09:42 +0200)]
luci-theme-bootstrap: remove unused styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix average traffic calculation in realtime bandwidth
Jo-Philipp Wich [Mon, 25 Jun 2018 07:33:07 +0000 (09:33 +0200)]
luci-mod-admin-full: fix average traffic calculation in realtime bandwidth

Fixes #1908.
Suggested-by: "mgalyean"
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix initializing realtime graphs
Jo-Philipp Wich [Mon, 25 Jun 2018 07:19:59 +0000 (09:19 +0200)]
luci-mod-admin-full: fix initializing realtime graphs

Commit 69782ccbc ("luci-base: xhr.js: defer starting poll queue") changed
the way XHR poll queues are started which broke the timing on the realtime
graph pages.

Fix the problem by manually starting the poller after registering the request
handlers.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base, luci-mod-admin-full: unify wifi assoclist code
Jo-Philipp Wich [Mon, 25 Jun 2018 07:01:33 +0000 (09:01 +0200)]
luci-base, luci-mod-admin-full: unify wifi assoclist code

Merge the assoclist code of the status overview and wireless overview pages
into a single shared partial template.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: replace status page legend tags with h3 (#1907)
Jo-Philipp Wich [Mon, 25 Jun 2018 06:58:34 +0000 (08:58 +0200)]
luci-mod-admin-full: replace status page legend tags with h3 (#1907)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1895 from jow-/master
Jo-Philipp Wich [Mon, 25 Jun 2018 06:49:44 +0000 (08:49 +0200)]
Merge pull request #1895 from jow-/master

Responsive OpenWrt theme

6 years agoluci-app-rp-pppoe: Fix typo 1906/head
Kevin Darbyshire-Bryant [Sat, 23 Jun 2018 16:13:38 +0000 (17:13 +0100)]
luci-app-rp-pppoe: Fix typo

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoluci-app-shadowsocks-libev: cleanup section add markup 1895/head
Jo-Philipp Wich [Wed, 20 Jun 2018 12:00:00 +0000 (14:00 +0200)]
luci-app-shadowsocks-libev: cleanup section add markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: packages: display available packages by default
Jo-Philipp Wich [Tue, 19 Jun 2018 15:57:08 +0000 (17:57 +0200)]
luci-mod-admin-full: packages: display available packages by default

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-travelmate: consolidate markup
Jo-Philipp Wich [Tue, 19 Jun 2018 15:18:36 +0000 (17:18 +0200)]
luci-app-travelmate: consolidate markup

Rework the various application view templates to properly render with the
latest responsive design changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-upnp: rework lease status indicator
Jo-Philipp Wich [Tue, 19 Jun 2018 15:18:02 +0000 (17:18 +0200)]
luci-app-upnp: rework lease status indicator

Turn the dynamic lease status table into responsive table by using the
cbi_update_table() helper in conjunction with title annotation attributes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-firewall: cleanup template markup
Jo-Philipp Wich [Tue, 19 Jun 2018 14:58:39 +0000 (16:58 +0200)]
luci-app-firewall: cleanup template markup

Rework the cbi section add template markup to properly render with the
latest responsive design changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: cleanup markup
Jo-Philipp Wich [Tue, 19 Jun 2018 15:17:04 +0000 (17:17 +0200)]
luci-mod-admin-full: cleanup markup

Globally cleanup template markup to support responsive design changes in
OpenWrt theme.

Rework handling of dynamic status tables, consolidate hand-written markup,
fix small render bugs in various places and annotate tables where needed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-material: align CSS with markup changes
Jo-Philipp Wich [Tue, 19 Jun 2018 15:20:45 +0000 (17:20 +0200)]
luci-theme-material: align CSS with markup changes

Add the bare minimum of changes to make the theme render correctly with the
latest markup, requires further refinement and tuning in the future.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: align CSS with markup changes
Jo-Philipp Wich [Tue, 19 Jun 2018 15:21:00 +0000 (17:21 +0200)]
luci-theme-bootstrap: align CSS with markup changes

Add changes to make the theme render correctly with the latest markup,
requires further refinement and tuning in the future.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: rework and polish OpenWrt theme
Jo-Philipp Wich [Tue, 19 Jun 2018 15:01:22 +0000 (17:01 +0200)]
luci-theme-openwrt: rework and polish OpenWrt theme

 - polish styling
 - move main menu to the left for large resolutions and collapse into
   dropdown header bar for small mobile resolutions
 - make tables responsive by utilizing extra attributes to turn rows
   into wrappable flexboxes for low resolutions
 - mostly get rid of button icon references and use a uniform color
   scheme for action-, positive, negative and neutral buttons

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: globally cleanup markup
Jo-Philipp Wich [Tue, 19 Jun 2018 15:10:38 +0000 (17:10 +0200)]
luci-base: globally cleanup markup

 - add responsive attributes to partial cbi templates
 - unify and fix button style classes
 - fix styling of sysauth dialog
 - rework firewall_zoneforwards widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1905 from ldir-EDB0/bcp38
Jo-Philipp Wich [Sat, 23 Jun 2018 08:01:42 +0000 (10:01 +0200)]
Merge pull request #1905 from ldir-EDB0/bcp38

luci-app=bcp38: improve interface selection dropdown

6 years agoluci-app-bcp38: improve interface selection dropdown 1905/head
Kevin Darbyshire-Bryant [Sat, 23 Jun 2018 07:43:00 +0000 (08:43 +0100)]
luci-app-bcp38: improve interface selection dropdown

Certain types of interface were excluded from bcp38's concept of
upstream wan interface e.g. pppoa-wan

Shamelessly copies the interface list generation from luci-app-sqm which
solved exactly the same problem and gives additional clues by displaying
the firewall zone (typically wan/lan etc)

Run-tested-on: DGN3500

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoluci-base: cbi.js: add tooltip handling and responsive table helper code
Jo-Philipp Wich [Tue, 19 Jun 2018 15:09:36 +0000 (17:09 +0200)]
luci-base: cbi.js: add tooltip handling and responsive table helper code

 - make findParent() globally available
 - add code for initializing rich cbi tooltips
 - introduce cbi_update_table() helper to auto-assign responsive attributes
   to table markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-firewall: update cbi models
Jo-Philipp Wich [Tue, 19 Jun 2018 15:53:20 +0000 (17:53 +0200)]
luci-app-firewall: update cbi models

 - allow multiple src/dest ips for rules (#1637)
 - restrict ICMP type list to ICMP protocol
 - add section title callbacks
 - remove size annotations
 - fix validation error with aliased zone fields (#1882)

Fixes #1637, #1882.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: xhr.js: defer starting poll queue
Jo-Philipp Wich [Fri, 22 Jun 2018 07:39:30 +0000 (09:39 +0200)]
luci-base: xhr.js: defer starting poll queue

Defer the start of the queue poll loop until the document has been loaded.

This allows all XHR.poll() invocations on the page to register their
handlers before the first batch of requests is made.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1894 from YuriPet/patch-2
Hannu Nyman [Mon, 18 Jun 2018 17:29:39 +0000 (20:29 +0300)]
Merge pull request #1894 from YuriPet/patch-2

luci-app-firewall: update Ukrainian translation

6 years agoluci-app-firewall: update Ukrainian translation 1894/head
Yurii [Mon, 18 Jun 2018 17:25:43 +0000 (20:25 +0300)]
luci-app-firewall: update Ukrainian translation

Updated with the latest synchronization of the translation.

6 years agoMerge pull request #1891 from YuriPet/master
Hannu Nyman [Mon, 18 Jun 2018 16:52:01 +0000 (19:52 +0300)]
Merge pull request #1891 from YuriPet/master

Correcting native name Ukrainian language & update Ukrainian translation

6 years agoMerge pull request #1892 from musashino205/l10n/fw-upd-ja
Hannu Nyman [Mon, 18 Jun 2018 15:39:33 +0000 (18:39 +0300)]
Merge pull request #1892 from musashino205/l10n/fw-upd-ja

luci-app-firewall: update Japanese translation

6 years agoluci-app-firewall: update Japanese translation 1892/head
INAGAKI Hiroshi [Mon, 18 Jun 2018 07:57:08 +0000 (16:57 +0900)]
luci-app-firewall: update Japanese translation

Updated japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-firewall: sync translations
INAGAKI Hiroshi [Mon, 18 Jun 2018 06:57:22 +0000 (15:57 +0900)]
luci-app-firewall: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-base: update Ukrainian translation 1891/head
Yurii [Sun, 17 Jun 2018 20:38:38 +0000 (23:38 +0300)]
luci-base: update Ukrainian translation

6 years agoluci-app-firewall: update Ukrainian translation
Yurii [Sun, 17 Jun 2018 20:37:21 +0000 (23:37 +0300)]
luci-app-firewall: update Ukrainian translation

6 years agoluci-app-upnp: update Ukrainian translation
Yurii [Sun, 17 Jun 2018 20:35:49 +0000 (23:35 +0300)]
luci-app-upnp: update Ukrainian translation

6 years agoluci.mk: Correcting native name Ukrainian language.
Yurii [Sun, 17 Jun 2018 20:33:35 +0000 (23:33 +0300)]
luci.mk: Correcting native name Ukrainian language.

6 years agoMerge pull request #1889 from Ansuel/lucnginx
Hannu Nyman [Sun, 17 Jun 2018 13:19:48 +0000 (16:19 +0300)]
Merge pull request #1889 from Ansuel/lucnginx

luci-nginx: add nginx support file

6 years agoluci-nginx: add nginx support file 1889/head
Ansuel Smith [Sun, 17 Jun 2018 12:52:11 +0000 (14:52 +0200)]
luci-nginx: add nginx support file

This adds nginx-mod-luci as a dependency of this package.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1886 from musashino205/l10n/fix-syntax-uk
Hannu Nyman [Sun, 17 Jun 2018 09:47:13 +0000 (12:47 +0300)]
Merge pull request #1886 from musashino205/l10n/fix-syntax-uk

i18n: fix syntax errors in Ukrainian po

6 years agoi18n: fix syntax errors in Ukrainian po 1886/head
INAGAKI Hiroshi [Sat, 16 Jun 2018 14:25:54 +0000 (23:25 +0900)]
i18n: fix syntax errors in Ukrainian po

"Content-Type: text/plain; charset=UTF-8" was wrote twice in each
of base.po and firewall.po, and one was an incorrect place which
was the cause of the errors.

And, The escape in abbr HTML tag was incorrect, so I fixed it.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-mod-admin-full: fix empty SSH-Keys issue 1881/head
Florian Eckert [Thu, 14 Jun 2018 09:13:08 +0000 (11:13 +0200)]
luci-mod-admin-full: fix empty SSH-Keys issue

If you delete all ssh keys in the textarea then LuCI will rais an error.
So if you added one ssh-key to the textarea and then you want to delete them
again that is not possbile in LuCI.
To fix this remove "rmempty" attribute and add a remove function which will
called if the textarea is empty.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #1862 from Ansuel/lucidep
Hannu Nyman [Tue, 12 Jun 2018 16:57:22 +0000 (19:57 +0300)]
Merge pull request #1862 from Ansuel/lucidep

luci-nginx: add nginx metapackages

6 years agoMerge pull request #1879 from sotux/master_zh_CN
Hannu Nyman [Tue, 12 Jun 2018 16:56:26 +0000 (19:56 +0300)]
Merge pull request #1879 from sotux/master_zh_CN

luci-app-firewall: zh_CN: change better translation for offloading

6 years agoluci-app-firewall: zh_CN: change better translation for offloading 1879/head
Zheng Qian [Tue, 12 Jun 2018 04:06:34 +0000 (12:06 +0800)]
luci-app-firewall: zh_CN: change better translation for offloading

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoluci-nginx: add nginx metapackages 1862/head
Ansuel Smith [Thu, 7 Jun 2018 16:42:02 +0000 (18:42 +0200)]
luci-nginx: add nginx metapackages

Create a metapackage with nginx as default webserver instead of uhttpd

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1877 from Ansuel/ddnsipkg
Hannu Nyman [Mon, 11 Jun 2018 19:08:04 +0000 (22:08 +0300)]
Merge pull request #1877 from Ansuel/ddnsipkg

luci-app-ddns: use standard pkg info function

6 years agoMerge pull request #1876 from ldir-EDB0/wgurl
Hannu Nyman [Mon, 11 Jun 2018 19:06:51 +0000 (22:06 +0300)]
Merge pull request #1876 from ldir-EDB0/wgurl

wireguard: update wireguard url

6 years agoluci-app-ddns: use standard pkg info function 1877/head
Ansuel Smith [Mon, 11 Jun 2018 15:13:31 +0000 (17:13 +0200)]
luci-app-ddns: use standard pkg info function

DDns script call another sh script to check ddns-scripts version. We can use the quicker IPKG.info function instead of execute another slow command.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agowireguard: update wireguard url 1876/head
Kevin Darbyshire-Bryant [Mon, 11 Jun 2018 10:43:00 +0000 (11:43 +0100)]
wireguard: update wireguard url

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoluci-app-firewall: Fix typo in forwards redirect
Kristian Evensen [Tue, 29 May 2018 20:27:06 +0000 (22:27 +0200)]
luci-app-firewall: Fix typo in forwards redirect

When creating a forwarding rule with protocol set to other, a user is
forwarded to the configuration page. The URL for the configuration page
contained a typo - the user was forwarded to
admin/network/firewall/redirect/cfg... and not
admin/network/firewall/forwards/cfg..., leading to a 404.

Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
6 years agoMerge pull request #1875 from YuriPet/master
Hannu Nyman [Sun, 10 Jun 2018 15:04:32 +0000 (18:04 +0300)]
Merge pull request #1875 from YuriPet/master

luci-base & luci-app-firewall: update Ukrainian translation

6 years agoluci-app-firewall: disable port fields when protocol is not TCP or UDP
Tom Hodder [Mon, 4 Jun 2018 16:11:12 +0000 (17:11 +0100)]
luci-app-firewall: disable port fields when protocol is not TCP or UDP

It's currently possible to generate nonsensical firewall rules by inputting
combinations which include:

i) protocols other than UDP/TCP
ii) source and destination ports.

There is some discussion of the issue on the forum here and the issue is
here; #1850.

This patch makes fields like src_port and dest_port depend on protocol being
tcp, udp or "tcp udp" in the input, forwarding and source NAT forms.

Signed-off-by: Tom Hodder <tom@limepepper.co.uk>
[reword commit message, squash commits]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-firewall: update Ukrainian translation 1875/head
Yurii [Sun, 10 Jun 2018 14:16:01 +0000 (17:16 +0300)]
luci-app-firewall: update Ukrainian translation

Updated Ukrainian translations.

Signed-off-by: Yurii yuripet@gmail.com
6 years agoluci-base: update Ukrainian translation
Yurii [Sun, 10 Jun 2018 13:56:13 +0000 (16:56 +0300)]
luci-base: update Ukrainian translation

Updated Polish translations.

Signed-off-by: Yurii <yuripet@gmail.com>
6 years agoMerge pull request #1874 from Rixerx/master
Hannu Nyman [Sun, 10 Jun 2018 09:33:08 +0000 (12:33 +0300)]
Merge pull request #1874 from Rixerx/master

luci-base: update Polish translation

6 years agoluci-base: update Polish translation 1874/head
Krystian Kozak [Sat, 9 Jun 2018 20:29:06 +0000 (22:29 +0200)]
luci-base: update Polish translation

Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
6 years agoMerge pull request #1868 from sotux/master-zh_CN
Hannu Nyman [Sat, 9 Jun 2018 14:53:27 +0000 (17:53 +0300)]
Merge pull request #1868 from sotux/master-zh_CN

Update Simplified Chinese translation

6 years agoluci-app-adblock: update Simplified Chinese translation 1868/head
Zheng Qian [Fri, 8 Jun 2018 09:19:43 +0000 (17:19 +0800)]
luci-app-adblock: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoluci-app-mwan3: update Simplified Chinese translation
Zheng Qian [Fri, 8 Jun 2018 09:44:18 +0000 (17:44 +0800)]
luci-app-mwan3: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoluci-app-firewall: recognize egress rules in rule overview
Jo-Philipp Wich [Fri, 8 Jun 2018 15:09:18 +0000 (17:09 +0200)]
luci-app-firewall: recognize egress rules in rule overview

Along with 74be6f397
("treewide: switch firewall zone, network and iface lists to dropdown code"),
this change allows luci-app-firewall to recognize OUTPUT rules.

Fixes #1457.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: add suggested italian translations
Jo-Philipp Wich [Fri, 8 Jun 2018 13:26:38 +0000 (15:26 +0200)]
luci-mod-admin-full: add suggested italian translations

Merge two italian translations suggested in #1870 and add back two missing
dots accidentially removed from the translations in a previous commit.

Fixes: 588c8618b ("luci-mod-admin-full: fix translation interpolation in JS confirm() calls")
Suggested-by: Ansuel Smith <ansuelsmth@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix translation interpolation in JS confirm() calls
Jo-Philipp Wich [Fri, 8 Jun 2018 13:48:03 +0000 (15:48 +0200)]
luci-mod-admin-full: fix translation interpolation in JS confirm() calls

Use luci.http.write_json() in conjunction with translate() to write out
unescaped translation strings in a manner suitable for interpolation inside
JavaScript.

Fixes #1870
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: git rid of embedded newlines in translation strings
Jo-Philipp Wich [Fri, 8 Jun 2018 11:50:12 +0000 (13:50 +0200)]
luci-mod-admin-full: git rid of embedded newlines in translation strings

Also switch one usage of raw '<%_ ... %>' interpolation to '<%: ... %>' in
order to avoid issues with translations using apostrophes.

Globally resnyc translations after the fix.

Fixes #1866.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: update Simplified Chinese translation
Zheng Qian [Fri, 8 Jun 2018 08:43:06 +0000 (16:43 +0800)]
luci-base: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoMerge pull request #1867 from dibdot/adblock
Dirk Brenken [Fri, 8 Jun 2018 07:45:57 +0000 (09:45 +0200)]
Merge pull request #1867 from dibdot/adblock

luci-app-adblock: partly revert last commit

6 years agoluci-app-adblock: partly revert last commit 1867/head
Dirk Brenken [Fri, 8 Jun 2018 07:34:47 +0000 (09:34 +0200)]
luci-app-adblock: partly revert last commit

* use now CSS for non breaking spaces in div table header

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agotreewide: switch firewall zone, network and iface lists to dropdown code
Jo-Philipp Wich [Fri, 8 Jun 2018 06:19:20 +0000 (08:19 +0200)]
treewide: switch firewall zone, network and iface lists to dropdown code

Also switch the weekday and monthday lists in the firewall rule details to
cbi dropdowns, vastly uncluttering the form.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add markup, JS and CSS for new dropdown
Jo-Philipp Wich [Fri, 8 Jun 2018 05:29:44 +0000 (07:29 +0200)]
luci-base: add markup, JS and CSS for new dropdown

This commit introduces the required code for a new, markup based dropdown
widget which can be used as a styleable alternative to select boxes or
radio/checkbox button groups.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: support option aliases in luci.cbi
Jo-Philipp Wich [Thu, 7 Jun 2018 06:49:51 +0000 (08:49 +0200)]
luci-base: support option aliases in luci.cbi

AbstractValue descendants may now specify a new optional property `alias`
which refers to a uci option to read/write/remove that differs from the
option name itself.

This is mainly useful for widgets that are toggled based on dependencies,
e.g. for alternating between SingleValue and MultiValue, but which are
intented to write into the same uci option.

Such a setup was previously possible already by overriding the .cfgvalue(),
.write() and .remove() callbacks with custom implementations, but that
required a lot of boiler plate code and was rather fragile.

With the `alias` property, CBI now takes care of the details and tracks
aliased fields within a section accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1863 from dibdot/adblock
Dirk Brenken [Fri, 8 Jun 2018 05:05:05 +0000 (07:05 +0200)]
Merge pull request #1863 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.3

6 years agoMerge pull request #1864 from Ansuel/master
Dirk Brenken [Thu, 7 Jun 2018 20:01:58 +0000 (22:01 +0200)]
Merge pull request #1864 from Ansuel/master

luci-app-ddns: fix div conversion

6 years agoluci-app-ddns: fix div conversion 1864/head
Ansuel Smith [Thu, 7 Jun 2018 19:54:21 +0000 (21:54 +0200)]
luci-app-ddns: fix div conversion

This fix some error from conversion of #1854

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1854 from jollaman999/master
Hannu Nyman [Thu, 7 Jun 2018 19:25:11 +0000 (22:25 +0300)]
Merge pull request #1854 from jollaman999/master

luci-app-ddns: Convert HTML tables to div

6 years agoluci-app-adblock: sync with adblock 3.5.3 1863/head
Dirk Brenken [Thu, 7 Jun 2018 19:14:06 +0000 (21:14 +0200)]
luci-app-adblock: sync with adblock 3.5.3

* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: fix some minor luci.model.uci issues
Jo-Philipp Wich [Wed, 6 Jun 2018 19:44:12 +0000 (21:44 +0200)]
luci-base: fix some minor luci.model.uci issues

 - Properly serialize option delete changelogs
 - Do not perform a section create if a nil value is passed to set()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-ddns: Convert HTML tables to div 1854/head
jollaman999 [Thu, 31 May 2018 11:48:51 +0000 (20:48 +0900)]
luci-app-ddns: Convert HTML tables to div

6 years agoMerge pull request #1835 from Ansuel/ddns-optional
Hannu Nyman [Mon, 4 Jun 2018 09:07:43 +0000 (12:07 +0300)]
Merge pull request #1835 from Ansuel/ddns-optional

luci-app-ddns: make param opt, optional

6 years agoluci-app-ddns: make param opt, optional, add myself as maintainer 1835/head
Ansuel Smith [Sun, 27 May 2018 17:51:38 +0000 (19:51 +0200)]
luci-app-ddns: make param opt, optional, add myself as maintainer

Currently these params should be optional but in the current script then are required for any configuration to save. We add an "optional" boolean value to the validate function so that we can make this pram optional as it should be. Also adds me as maintainer

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1851 from dibdot/lxc_fix
Dirk Brenken [Mon, 4 Jun 2018 07:07:45 +0000 (09:07 +0200)]
Merge pull request #1851 from dibdot/lxc_fix

luci-app-lxc: made container creation more reliable

6 years agoluci-app-lxc: made container creation more reliable 1851/head
Dirk Brenken [Sun, 3 Jun 2018 20:30:59 +0000 (22:30 +0200)]
luci-app-lxc: made container creation more reliable

* wait/lock "create" button until the real end of container creation,
  this includes download time plus tar/gz processing time
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: cbi: atomically reorder uci sections
Jo-Philipp Wich [Thu, 31 May 2018 13:39:43 +0000 (15:39 +0200)]
luci-base: cbi: atomically reorder uci sections

Since the switch to ubus uci operations we do not have a local application-
side cursor cache anymore, instead uci operations happen synchronously in
the rpcd backend server.

This may cause cbi section reorder operations involving multiple elements
to fail, because anonymous section hashes may change due to rehashing
between consecutive ubus uci reorder calls.

In order to avoid that problem, use the ubus uci batch reorder extension,
which allows to pass a complete (or partial) list of section ids in the
desired order in one call, bypassing the volatile section id problem.

Fixes #1844.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1819 from Ansuel/ddns-performance
Hannu Nyman [Sat, 2 Jun 2018 18:11:51 +0000 (21:11 +0300)]
Merge pull request #1819 from Ansuel/ddns-performance

luci-app-ddns: improve performance

6 years agoluci-app-ddns: improve performance 1819/head
Ansuel Smith [Thu, 24 May 2018 00:03:03 +0000 (02:03 +0200)]
luci-app-ddns: improve performance

Every request directed to the ddns app call ddns tools module.
Ddns tools module have lots of global variable that call slow os.execute function. This adds 10 second to every ddns request even if the function that is requested doesn't need that global variable. This commit introduce env_info function that execute os.execute command by executing what is actually requested and not process all the variables. Also remove 2 unecessary module that are not used. More researh find that major slowdown was caused by the calling of ddns script for the version check. Now we check if opkg is present and use it to check ddns-scripts version.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1846 from musashino205/l10n/base-upd-ja
Hannu Nyman [Fri, 1 Jun 2018 16:52:11 +0000 (19:52 +0300)]
Merge pull request #1846 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoMerge pull request #1847 from dibdot/lxc_fix
Dirk Brenken [Fri, 1 Jun 2018 16:41:50 +0000 (18:41 +0200)]
Merge pull request #1847 from dibdot/lxc_fix

luci-app-lxc: bugfix

6 years agoluci-app-lxc: bugfix 1847/head
Dirk Brenken [Fri, 1 Jun 2018 16:33:05 +0000 (18:33 +0200)]
luci-app-lxc: bugfix

* fix remaining javascript errors in Chrome

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: update Japanese translation 1846/head
INAGAKI Hiroshi [Thu, 31 May 2018 17:17:17 +0000 (02:17 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-base: sync translations
INAGAKI Hiroshi [Thu, 31 May 2018 16:59:53 +0000 (01:59 +0900)]
luci-base: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agothemes: drop errorbox styles
Jo-Philipp Wich [Thu, 31 May 2018 17:09:51 +0000 (19:09 +0200)]
themes: drop errorbox styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-freifunk: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:08:14 +0000 (19:08 +0200)]
luci-mod-freifunk: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:05:40 +0000 (19:05 +0200)]
luci-base: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: use common alert message markup
Jo-Philipp Wich [Thu, 31 May 2018 17:00:56 +0000 (19:00 +0200)]
luci-mod-admin-full: use common alert message markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>