luci-app-mwan3: fix i18n plural warning

Updating applications/luci-app-mwan3/po/templates/mwan3.pot ...
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:175: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:191: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.
xgettext: warning: msgid '%d second' is used without plural and with
plural.
  standard input:213: Here is the occurrence without plural.
  standard input:170: Here is the occurrence with plural.
Workaround: If the msgid is a sentence, change the wording of the
sentence; otherwise, use contexts for disambiguation.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 675a0eae5661bd207c3e818b3c1d8fa4d2577c5b)

luci-app-bmx7: optimized images filesizes

Wifi icons optimized without any quality degradation. Bmx7logo filesize rediced from 5121 to 3318 bytes, visually looks the same, technically the image is 99.9% identical.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 09f7278d8872a5052437cc4c4bdc53dd9f84ace2)

luci-theme-openwrt: optimized image filesize

Optimized PNG filesize from 152 to 80 bytes without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 5a3cc88a67948b3ee278b2ca858134bf0ade791d)

luci-theme-bootstrap: optimized favicon filesize

Optimized PNG filesize from 733 to 592 bytes without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit d4c4afeabc3281bbe1ded40d02c5341ae85b6847)

luci-mod-network: interfaces.js: remove references to original MAC/MTU

Do not show the original values for MAC and MTU in device list tooltips
anymore as the values we read from the netdev might already stem from
overridden config settings.

Since there's no generic way to acquire that information, remove the
potentially confusing information.

Fixes: #5820
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 34813ff2b6b898cf4adb4a20df606261413d9afa)

luci-theme-bootstrap: various style tweaks

 - Make control-group containers flex and ensure proper spacing between
   elements, fixes e.g. unwanted break for reveal/hide password button
   on narrow mobile views

 - Decrease top margin of modal popups

 - Fix displaying cell titles on mobile wrapped table rows

 - Tune mobile flex table styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c19020b2a4236945c1ad4a699ebb761a5dd7dc1f)

luci-app-mosquitto: add option 'allow anonymous'

Add missed option 'allow anonymous' in mosquitto section.

Signed-off-by: Ptilopsis Leucotis <PtilopsisLeucotis@yandex.com>
(cherry picked from commit 4e3d6c15640aad5df6280a619a3fa808595b903d)

luci-app-tinyproxy: fix description of ConnectPort option

Fixes: #803
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit eadf07b5299a450c43bc4162f891d5c95b629e8a)

luci-app-https-dns-proxy: remove redundant cbi-value-field div

The redundant "cbi-value-field" div introduces uneeded margin, remove this
element to fix the view layout.

Suggested-by: Santiago Kozak <arbolitoloco1@protonmail.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6b3bba36d1381d0cd72e77f096b7f6892fd3314f)

luci-lib-httpprotoutils: add airplay mime types

Airplay of a statically hosted video file from one Apple device to another
fails due to unrecognized content-type. Adding Airplay supported
mime types fixes the issue.

Signed-off-by: Sasha Andonov <s.andonnov@gmail.com>
(cherry picked from commit e776759549fba3e69727a0402e39d7c8d13118fd)

luci-mod-status: nftables add counter and comment for empty match

Signed-off-by: Ingo Heinrich <ingo-github@goheinrich.de>
(cherry picked from commit 8c7c56f4e415a3b80bf91c98aa02a638111bef51)

luci-proto-wireguard: use ddns lookup_host for peer hints

The `domain` option of a DDNS service entry may contain non-hostname values,
use the `lookup_hostname` option instead.

Fixes: #6289
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 59a6f062d29ee7a400e9cb0477e0e55eb674208a)

lucihttp: update to latest Git HEAD

9b5b683 multipart-parser: properly handle parts with trailing CR

Fixes: #6282
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0f6e1663ca0370ab3f8ca3927a9d0a37b015d0f4)

luci-app-statistics: add watt-ups for nut and skip unsupported values

Only render NUT charts for actually available data and add a chart
definition for `watt-ups` values while we're at it.

Ref: https://forum.openwrt.org/t/x/156246
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd1111407d8f0b1f7f761c5ebbe6ae43a268a4a4)

treewide: Backport translations and sync

Backport from master and sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-banip: sync with banIP 0.8.2-5

* made some missing text pieces translatable
* change banip.feeds permission

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0c67d74fd39ca52e58432eeb1f58480fca381915)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-theme-material: add again No password set hint

This was accidentally deleted with commit:
bec2c7e2b50e062575f3649ccd76b81af41b9820

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-banip: sync with banIP 0.8.2-4

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit df9549e6bdf0c0d33e468765167c5e15338abcb1)
Signed-off-by: Dirk Brenken <dev@brenken.org>

treewide: Backport translations, sync

Sync and backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6299 from dibdot/banIP

luci-app-banip: backport to 22.03

luci-app-banip: backport to 22.03

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #6294 from nemesisdesign/openwrt-22.03

[22.03] luci-app-openwisp: improved schema for usability

luci-app-openwisp: improved schema for usability

Without these changes, saving the form of luci-app-openwisp without
doing any change generates a configuration which will not work in most cases.

In this patch I took care of providing the right settings to show the default values,
avoid saving default values and show the interface names properly.
With these changes it will be possible for a user to edit just 1 field without
introducing breaking changes.

Signed-off-by: Federico Capoano <f.capoano@openwisp.io>
(cherry picked from commit 8727b1cbc8542e06b0b9db7e41366bbbe19d42f5)

luci-base: dispatcher.lua: prevent XSS through 404 error template

Make sure to escape the user controlled URL passed as part of the error
message into the error404 template in order to avoid XSS.

Reported-by: 40826d <40826d@posteo.de>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #6227 from liudf0716/xfrpc

[22.03] xfrpc : add xfrpc to 22.03 branch

treewide: Backport translations

Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-sqm: Move verbose descriptions into help text

The field labels contain verbose descriptions which looks terrible in the
UI. Replace them with short labels and move the verbose text into the help
text where it belongs.

Reported by Github user @saldry at https://github.com/openwrt/luci/issues/6161

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
(cherry picked from commit 127c9002e6e6898631928f66774575c25b05f536)

treewide: Backport translations

Backport from master.
(fix bad translation in applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: Backport and sync translations - i18n

Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6261 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: bugfixes

luci-app-pbr: bugfixes

* do not remove non-empty custom user files fields
* add provides for vpnbypass and vpn-policy-routing luci apps
  addresses https://github.com/openwrt/luci/pull/6127#pullrequestreview-1311512052

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 0d4b675e7062ddc0d1d2b9be2d0962186239c51b)

Merge pull request #6259 from BKPepe/remove-translations-vpn-policy-routing

[22.03] luci-app-vpn-routing: drop leftover translations

luci-app-vpn-routing: drop leftover translations

The package luci-app-vpn-policy-routing was replaced by luci-app-pbr,
but while doing it, it seems that Makefile of
luci-app-vpn-policy-routing is gone, but the translations are not. Let's
fix it.

Fixes 60ee510924a3818ddee7a19d651de9647fd41723 ("luci-app-pbr: initial
commit")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

luci-app-adblock: sync with latest adblock

* removed energized soruce selection
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b762e772ce317153000a93b6ea4cba51256c8ca7)
Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #6246 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: update to 2022-10-15-11

luci-app-https-dns-proxy: update to 2022-10-15-11

* Makefile: change dependency from luci-mod-admin-full to luci-base
* Providers: add AdGuard and AdGuard Family
* Bugfix: update field value in CBI, fixes https://github.com/openwrt/luci/issues/6244

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6ee377fd4b388e7878ab9bcb7e9c47e994578be2)

luci-proto-openconnect: fix server url validation

The OpenConnect configuration form incorrectly assumed that the server
setting must be hostname while it actually may be a full URL.

Fixes: #6184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b200e0e90fdfb294cd31870eb32b6b362ded3733)

Revert "luci-proto-openconnect: fix server url validation"

This reverts commit f1312cadc6675fb29d02425775dd8a2a533d7e7c.

The commit contained unrelated changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 41e9b8d1219a949a0a3105eabec3774dc97f65c2)

luci-proto-openconnect: fix server url validation

The OpenConnect configuration form incorrectly assumed that the server
setting must be hostname while it actually may be a full URL.

Fixes: #6184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1312cadc6675fb29d02425775dd8a2a533d7e7c)

luci-proto-openconnect: Add options proxy server and reconnect timeout support

Signed-off-by: David Bentham <db260179@gmail.com>
(cherry picked from commit 1f25483953dc20e2d8521a1b8f9528420b5b817a)

luci-theme-openwrt-2020: don't inherit background in alert message buttons

Fixes: #6177
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1597d8e555cfe7444bcbcb44d45caf6954b61b3e)

luci-mod-status: nftables.js: remove unused fwtool require

Fixes: #6203
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8f91d53b4b2d5e89928ceca73203e48292ca2b0)

rpcd-mod-luci: fix reporting network device flags

Fix reporting of ceertain flag values larger than 255, such as IFF_PROMISC
by explicitly casting the bit test expression to a boolean result since
the implicit integer truncation to uint8_t will turn the `0x100` result of
a set IFF_PROMISC bit into just `0x0`.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a570e300061fae7250999c35e4e7215940bca82d)

luci-app-xfrpc: add po template

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 91faed3d62d21af9992fc98a5fe3d5addd47edff)

luci-app-xfrpc: add subdomain to http&https config

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit ca9def41a47075209d460e5c599e1cd987242dd6)

luci-app-xfrpc: add luci-app-xfrpc

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 283ac0513f5c84005c5b3b87f243a5b597b0497e)

luci-base: form.js: reuse JSONMap data provider in GridSection modals

Reuse the same data provider as the parent JSONMap instance in order
to avoid inadvertently mangling the form data when saving the modal
edit dialog.

Fixes: bb9ede238a ("luci-base: form.js: reuse JSONMap data provider in GridSection modals")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd47f3f6742a6d80221b75aa7b6ea27eca2bb535)

luci-base: form.js: fix GridSection modals in JSONMap instances

Since grid section edit modals construct a new Map instance internally,
we must take care of using the correct map constructor type for the
internal copy in order to end up with the correct data provider.

Ensure that the extended option modal of GridSection instances uses a
JSONMap when the grid section's owner map is a JSONMap to avoid stray
uci related errors.

Ref: https://forum.openwrt.org/t/luci-save-apply/149658/5
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6fe34990265a02dac20f7b352e4039a90fed45ca)

treewide: Backport translations - sync

Backport translations and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-wireguard: trivial fix to separate a peer's multiple IPs

Attempts to address issue #6003

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit a53fc7711cc067e7fca5f9f5df926ba929569863)

luci-app-dockerman: add minor version

The package has static versioning, based on the original upstream
versioning. Add date as a minor version to signal later changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit eda3c14e9fa062bd829d02aebb8b27344a68ac8e)

luci-app-dockerman:  Update to play nice with recent changes

https://github.com/openwrt/luci/commit/180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab broke dockerman's appearance in the menus

Make a small change to dockerman's index entry to make it play nice with the new architecture, firstchild() was obtained using DAWN's controller/dawn.lua as an example

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
(cherry picked from commit 0c1fc7f64566bd5da643eadc6b817bb0f5f591e7)
Fixes #6168

luci-app-nlbwmon: validate date input

Fixes: #6188
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7c7ac8bf0d9d554d19f5d21226110743899b8802)

luci-app-openvpn: fix potential XSS in pageswitch template

Ensure to escape URL instance parameter displayed in the heading.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 25983b9fa572a640a7ecd077378df2790266cd61)

luci-mod-system: fix potential stored XSS

Make sure to escape the key contents in the delete confirmation dialog.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0186d7eae0e123a409e9919a83fdfecc7945c984)

Merge pull request #6182 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: additional error messages

luci-app-pbr: additional error messages

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a748f86fec61d7c390ff0f9ee4a007fadfa936f7)

luci-app-statistics: provide defaul minimal scale for some graphs

Avoid cryptic "200m" axis items for really small values by setting
a default minimal y-axis max value for some of the conntrack, cpu,
cpufreq, load and ping graphs (mainly percentages). The axis
automatically scales upward if necessary, so this just provides
a minimal "at least" scale for the y-axis.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d9e548fe0c619c0935926a1dfe4a8f8b9ff810a2)

luci-app-statistics: Adjust also default_timespan to 2hour

Adjust also default_timespan option to be 2hour, as that change was
forgotten in 4b49b456. (That seems to have no practical relevance, as
LuCI seems to offer the first item from the period list in any case.)

Fixes: 4b49b456 luci-app-statistics: set shortest period data/graph to 2 hours
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3aedb609cea9df548fe8a21a0b98e3f01a801200)

treewide: Backport translations from master - i18n

Backport translations.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-base: ui.js: support div based table markup in UITable.update()

Constructing UITable instances from existing, div based markup is
supported but the UITable.update() implementation did not account
for that, leading to defunct data updates on tables built from div
based markup.

Fix this issue by extending UITable.update() to consider a div based
table structure as well, like we do in UITable.initFromMarkup() already.

Fixes: #5713
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit deed6827b2eb0b58ee8c1d810a584a9589108eac)

luci-app-natmap: add forward_port option and update stun_server description

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 1a4ac922829aa8088608374a3bd7445fbf2a6f96)

Merge pull request #6160 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: update to 1.0.1-1

luci-app-natmap: add new package

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit cc01c0bffa9030318c39cf493c42c48d22500ec3)

luci-proto-autoip: fix protocol name

Fixes: 2965e527f5 ("luci-proto-autoip: add protocol support for avahi-autoipd")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ae47caf383c6da53f2345bd225c49b875cb0d514)

luci-proto-autoip: add protocol support for avahi-autoipd

Fixes: #6162
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2965e527f578abda1dc58dd540343422455be3ac)

luci-app-pbr: update to 1.0.1-1

* add more error/warning messages
* better error/ubus error handling

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 54c3ba32f9a2327ca4fdb9c419fb842108b17894)

luci-base: fix button handling for named sections

If more than one named section is added to the page, it is currently the
case, that the first button is always switched on or off during input
validation of the uci section name. This is because the usage of the
'document.querySelector' function is to imprecise. Changing the search
start to the element to be created, fixes this.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 440a2e79a762b4152ccb7e41c90a2826d9fb3538)

Merge pull request #6143 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: Detect missing iptables & error-proofing WebUI

luci-app-pbr: Detect missing iptables & error-proofing WebUI

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f8cbfa11c6583f298f505b103c73781f6349eba8)

luci-mod-network: (wireless) Expose 802.11v settings.

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 82595509093ae1e538c23f131d468766c00092f2)

luci-mod-network: (wireless) Expose 802.11k settings.

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit b88156961f14a2b5a14fce8db3d54817a0cc686f)

luci-mod-network: (wireless) Expose multicast_to_unicast setting.

From https://w1.fi/cgit/hostap/commit/?id=34f7c699a6bcb5c45f82ceb6743354ad79296078
add support for multicast_to_unicast conversion in the wireless settings

Tested on: 21.02.1

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit b2101a23a9116c65c903df6c1d02db16d6da579f)

luci-app-statistics: set shortest period data/graph to 2 hours

Change the shortest defined statistics period from 1 hour to 2 hours.

In practice, this only changes the graph for the shortest period
to show 2 hours of data instead of 1 hour.

The underlying database is not changed:
there are currently 288 data items for each period,
so with the 30 seconds default step, the shortest data series
contains 288 x 0.5 min = 144 min > 2 hours of data.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4b49b45641b34094bd3be8b34de026303dc70f4a)

treewide: resync and merge master translations

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

luci-base: ui.js: table enhancements

 - Gracefully handle cells without innerText
 - Properly handle `DocumentFragment` call values on table update
 - Introduce ability to fetch actual cell value for sorting purposes from
   `data-value` attribute

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 90a2b1eaeb58b7169b31fdc097c5bfe6f557c778)

luci-base: cbi.js: await L.ui load before updating tables

On legacy views, the `L.ui` JavaScript class is not automatically loaded,
so request it before updating tables.

Fixes: e0e6989a4a ("luci-base: introduce new LuCI.ui.Table class")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bdfdd95a273f6fc73017795805dcfe6ee1ae8a8e)

luci-base: revise array sorting

Refactor various sort operations throughout luci-base to use the new
L.naturalCompare() comparator function.

This primarily ensures that embedded numbers are sorted numerically and
not in a lexicographical way.

It also simplifies some code as a side effect.

Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 37422e891a47f15659356ce75b6f6cce831e0041)

luci-base: luci.js: add array sort utilities

Add two new utility functions L.naturalCompare() and L.sortedArray() to
simplify sorting arrays naturally.

Ref: #5899
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8199b2ce9a7d36359aedea1ad9dab157134a46c2)

luci-base: optimized icons filesizes

Optimized PNG filesize without any quality loss.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit 37477ca6142c6e9e96f210c3a1973a44f814de09)

luci-base: ui.js: add required CSS class to dynlist widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d6dbedd9e2c77f44be0f64ee8128401a293f77f4)

luci-base: luci.js: remove wrong CSS class from page footer

The `control-group` class is meant for gapless grouping of inputs with
buttons, while the page actions are just distinct buttons in a row.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4e090e38d2cb606936768847ab0f5526f95be793)

luci-theme-material: fix typo in recovery mode message

Fix the message from "Sytem" to "System" and merge with the existing
message on the other themes.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 2a558393636e1775f0c9b64ab9fe62a6a43b833e)

luci-theme-material: optimized image filesize

Optimized PNG filesize from 6280 to 3939 bytes. Visually looks the same, technically the image is 99.9% identical.

Signed-off-by: Alexander Semukhin <semukhin@mail.com>
(cherry picked from commit ec8bdab76c1c25f36d13f0053357417aec82dd14)

luci-theme-material: CSS Fix for previous update

Commit b0f13ef Changed the color of a CSS element from a bright blue to
a dark blue. This resulted in a modal with difficult-to-read text (black
text on dark blue).

This commit sets the modal text-color to #000, in line with style
guidelines.

Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit 4ee2bc644acc4bd112f870cf1e689f86f99c5736)

luci-theme-material: Update brand logo/colors

I have updated the brand.png logo to the 2020 version, and I have
made a small adjustment to the CSS to reflect its slightly larger
vertical height.

I also have made small tweaks to the system theme colors to use
the brand colors as recommended on page 5 of the logo usage
guidelines document avalible at
openwrt/branding/blob/master/openwrt-styleguide.pdf

Signed-off-by: Quentin Baker <opensource@quentb.com>
(cherry picked from commit b0f13efa9ce45e7b0ad096e0c1bd5e55bec23b8e)

luci-material-theme: replace margin by gap in ifacebadge

Material is a "flex" theme. Better to use "gap" in place of "margin" to
add some space between elements inside "flex" elements.

This fixes the problem specially when there are text elements inside the
"flex" and don't hurt when there are images.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 1cd615787a648e3a8fda5d8c20b38b42a62a6d16)

luci-material-theme: fix localizated left menu

The latest fix to fix the logout worked, but it was not applied to all
the resolutions, and I have observed the same problem exists for the
dasboard optional component.
Looking at the code, it seems only the components without submenu, have the
data-title element, so this fix modifies the style for all of them, not
relying on the position or text content.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 56aeaa8ac8b2a8a9864f3c8290fb10c39ed3173a)

luci-material-theme: align text buttons center

The text inside the buttons is aligned to the top. This change mades
it aligned to the center.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 9e73a04adbff4dcebd643400da689291b8320d74)

luci-material-theme: make control-group flex

The control-group div does not flex. The buttons overflow the screen.

This change mades them flex.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 17ddeb7b579160b5367047bbfaa079090090b888)

luci-material-theme: align td text width 33%

The CSS applies a different padding for td elements with 33% width. This
misaligns the text from this td to the others td.

This change modifies the CSS to apply the same padding to all of the
sibling td.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 3333fd6695cbd2e7a6055f01542242a3b7c111ec)

luci-material-theme: adjust data-title for logout

The data-title attribute style depends on the content in the css rule.
When translated to other language, the css rule fails.
This change uses the position and not the content to apply the style.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit f8e52aa85d305a73a276b45805d758ba20d759fe)

luci-theme-material: fix size of progressbar text

The text of the progressbar is bigger than the progressbar height. This removes the font-size element that produced that.

Signed-off-by: Miguel Angel Mulero <mcgivergim@gmail.com>
(cherry picked from commit 35fb253adb482d1f485245b0f8858b6713a99151)

luci-base: ui: resolve aliases and rewrites on obtaining menu node children

Extend LuCI.ui.menu.getChildren() to resolve aliases and rewrites prior to
returning the menu nodes. This allows aliasing entire menu trees instead of
just single pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 180d39dcd2427e3c32c0ec7ecc3c7bfb48c0d0ab)

luci-app-advanced-reboot: Add support for Linksys EA7500 v2

Signed-off-by: Russell Morris <rmorris@rkmorris.us>
(cherry picked from commit d56f6bb3af6ed02b587cc3c69eb94b9e0ed8d109)

luci-app-rp-pppoe-server: use netlist template

pppoe-server init script is expecting an interface name,
not a physical device name in the pppoe config.

Signed-off-by: Daniell Crossman <dc@dx.id.au>
(cherry picked from commit f2eb7275249d3e0c5cf5cc21ec77bab885ad19ff)

luci-mod-system: mount sections are always mounted unless they are explicitly not mounted

fixes #4862

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 5abb2847ba7267a2c9cdbcb8ef506f0be7015047)

luci-base: ucitrack: fix broken affects logic

Changes on a given configuration should trigger change events on affected
configurations, not the other way around.

Fixes: #5745
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 71106351344ea390e0f510e3f9ad34685bacc1ee)

luci-app-openvpn: fix openvpn config corruption on upload

Signed-off-by: Anna Tikhomirova <vamp@vampik.ru>
(cherry picked from commit 64b80b8f118753930357a236ce96ed5e4d720cda)

luci-app-ddns: gracefully handle missing control file

In case `pcall()` fails, `ctrl` will contain an error message.

Fixes: 3395656b9f ("luci-app-ddns: get rid of luci-lib-ipkg depdency")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 74283264a34083725a71a0f62de423a514efa402)