Commit graph

554 commits

Author SHA1 Message Date
Jo-Philipp Wich
ff4c722a21 luci-base, luci-mod-network: fix bridge state change quirks
Fixes: #2997
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fe0e4f8b4d)
2019-09-10 17:20:27 +02:00
Jo-Philipp Wich
89e029c59f luci-base: index.html: add extend cache-control directive
Fixes: #2942
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fe45a9344)
2019-08-01 15:44:52 +02:00
xiongjie
44efaf5777 luci-base: redirect root path to /cgi-bin/luci/
Fix openwrt/luci#1062
Signed-off-by: MonwF <boluo2@gmail.com>
(cherry picked from commit fd3d2b468f)
2019-08-01 15:44:51 +02:00
Jo-Philipp Wich
28ab21dd8d luci-base: handle application/json replies with charset specification
On my router, the response header Content-Type is
`application/json; charset=UTF-8` instead of `application/json`, so
almost every feature is broken.

Fixes: #2851
Suggested-by: zhanhb <6323014+zhanhb@users.noreply.github.com>
[reword commit subject]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-26 12:46:39 +02:00
Yousong Zhou
dbaae4a815 luci-base: hide autocomplete-preventing password input with bigger offset
Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 3a24c2dbaa)
2019-07-06 15:10:25 +00:00
Yousong Zhou
4235fb0125 luci-base: nowrap for password input and reveal button
Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit 609f5290c8)
2019-07-06 15:10:25 +00:00
Jo-Philipp Wich
9e3f710cac luci-base: remove fake password field from tab order
Set a negative tabindex on the dummy password field to not break the form
tab order flow.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 8c77975d1b)
2019-07-06 15:10:03 +00:00
Hannu Nyman
cbc000bc5c timezone data: update to 2019b
Update timezone data to 2019b

http://mm.icann.org/pipermail/tz-announce/2018-December/000055.html
http://mm.icann.org/pipermail/tz/2019-July/028249.html

2019a:
* Palestine "springs forward" on 2019-03-30 instead of 2019-03-23.
* Brazil no longer observes DST.

2019b:
* Palestine's 2019 spring-forward transition was on 03-29, not 03-30.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2f769ee087)
2019-07-05 18:03:07 +03:00
Hannu Nyman
9bab4ba393 luci-base: show niced processes on Status/Processes page
Modify the process status filter to allow also the processes
with a nice value to be visible on the Status/Processes page.

Filter out the top process itself.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1c80eb1962)
2019-06-30 19:57:31 +03:00
Jo-Philipp Wich
23029f5163 treewide: avoid double-escaping CBI section labels
Since the section labels are already HTML-escaped implicitely by the
striptags() function, we must not escape them again in attr() or
ifattr().

Fixes: #2524
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit eda8f02dac)
2019-02-12 08:35:02 +01:00
Jo-Philipp Wich
28e852f4e0 luci-base: dispatcher: support raw values in attr() and ifattr()
Extend the attr() and ifattr() template functions to take an optional
further parameter indicating that the passed value should not be escaped.

This is needed for cases where the input already is escaped through
other means, e.g. when the value was previously filtered through the
striptags() template helper.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4141243762)
2019-02-12 08:34:01 +01:00
Jo-Philipp Wich
a11f4ac2eb treewide: rework uci change display
- Use native rpcd uci changes format instead of incompletely converting
   back and forth between the old and the new format
 - Rework uci changelog template to print the equivalent uci commands
   for the various changes
 - Rework theme headers to properly count the uncomitted changes
 - Rework theme CSS to properly style new changelog

Fixes: #2170

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 849d153851)
2019-01-20 12:28:39 +01:00
Jo-Philipp Wich
f1a5b179dd luci-base: fix cbi dropdown quirks with MS Edge
On MS Edge, the behaviour of "value" attributes on "li" elements is
unreliable, so use the "data-" prefix to circumvent the problem.

Ref: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/19320991/
Fixes: #2224
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9e6949849d)
2019-01-20 12:00:37 +01:00
Hannu Nyman
04d60f2144 timezone data: update to 2018i
Update timezone data to 2018i

http://mm.icann.org/pipermail/tz-announce/2018-December/000053.html
http://mm.icann.org/pipermail/tz-announce/2018-December/000054.html

2018h:
* Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21.
* New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move.
* Metlakatla, Alaska observes PST this winter only.
* Guess Morocco will continue to adjust clocks around Ramadan.
* Add predictions for Iran from 2038 through 2090.

2018i:
* São Tomé and Príncipe switches from +01 to +00 on 2019-01-01.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c7776c8959)
2019-01-02 21:35:08 +02:00
pmelange
12b0b31bb3 luci-base: network.lua add ipv6-prefix-assignment support to get_status_by_address
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
2018-12-06 19:06:04 +01:00
Zheng Qian
d6925de333 i18n: luci-base: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-11-14 10:26:55 +08:00
Hannu Nyman
0cfd99cb0f i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-11-09 23:35:09 +02:00
Martin Schiller
01fe783494 i18n: fix german base.po
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2018-11-09 23:26:29 +02:00
Hannu Nyman
b3d4b84aaf timezone data: update to 2018g
Update timezone data to 2018g

http://mm.icann.org/pipermail/tz-announce/2018-October/000052.html

 * Morocco switches to permanent +01 on 2018-10-27.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 111ebe2f62)
2018-10-30 19:48:38 +02:00
Hannu Nyman
463fb04116 timezone data: update to 2018f
Update timezone data to 2018f

http://mm.icann.org/pipermail/tz-announce/2018-October/000051.html

   Volgograd moves from +03 to +04 on 2018-10-28.
   Fiji ends DST 2019-01-13, not 2019-01-20.
   Most of Chile changes DST dates, effective 2019-04-06.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 651937c166)
2018-10-25 18:48:33 +03:00
Hannu Nyman
69325c11b5 timezone data: update to 2018e
Update timezone data to 2018e

http://mm.icann.org/pipermail/tz-announce/2018-May/000050.html

  North Korea switches back to +09 on 2018-05-05.
  The main format uses negative DST again, for Ireland

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 701f6b0819)
2018-10-09 18:25:33 +03:00
Jo-Philipp Wich
199eac4166 luci-base: mark password template dummy field as hidden
Mark the dummy input field as aria-hidden, should fix #2063.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 98d4eb1695)
2018-08-16 10:51:33 +02:00
Gregory L. Dietsche
a49e4e4d56 Correct grammar in apply_widget.htm
This patch corrects "to get" to "to be" in apply_widget.htm
This shell command was used to find and make the change in
all impacted files:

find . -type f -exec sed -i 's/Waiting for configuration to get applied/Waiting for configuration to be applied/g' {} +

Signed-off-by: Gregory L. Dietsche <gregory.dietsche@cuw.edu>
(cherry picked from commit abfe45ff61)
2018-08-07 16:38:26 +02:00
yangfl
8bb4873326 luci-base: update Chinese translation
Signed-off-by: David Yang <mmyangfl@gmail.com>
(cherry picked from commit c51f0d9714)
2018-08-07 16:38:20 +02:00
Krystian Kozak
8407d90aa1 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit 10f12d7f6a)
2018-08-07 16:38:14 +02:00
Krystian Kozak
5d1d6915ca luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit 6dbdc2cae8)
2018-08-07 16:37:46 +02:00
Jaymin Patel
e290fe917d fix compilation failure when luasrcdiet is being copied to non existing directory
Signed-off-by: Jaymin Patel <jem.patel@gmail.com>
(cherry picked from commit bb336671ff)
2018-07-31 06:58:01 +02:00
Jo-Philipp Wich
ea09513095 luci-base: fix luasrcdiet
- Stage required libraries as well
 - Remove not existing make target
 - Override library search path

Fixes: b5d5e5bf1 ("luci-base: update luasrcdiet")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 63fbf5a805)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
520afa4c39 luci-base: fix footer template
Move the apply widget markup before the final </html> tag to avoid XHTML
errors with the OpenWrt theme.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 350be23eb9)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
7e5331f154 treewide: rework rollback/apply workflow
Rework the apply confirmation mechanism to be session agnostic in order to
circumvent cross domain restrictions which prevent the JS code from issuing
apply confirm requests in some cases, e.g. when changing the LAN IP.

Confirmation calls may now be done from unauthenticated pages, as long as a
matching confirmation token is sent along with the request.

The reasoning behind this is that there is little security impact in
confirming pending apply sessions, especially since those sessions can only
be initiated while being authenticated.

After this change, LuCI will now launch a confirmation process on every
rendered page when a rollback is pending. The confirmation will happen
regardless of whether the user is logged in or not, or if the current page
is a CBI form or static template.

A confirmation request now also requires a random one-time token which is
rendered along with the confirmation JavaScript code in order to succeed.

This token is not meant to provide security but to ensure that the confirm
was triggered from an interactive browser session and not some background
HTTP requests that happened to end up in the admin ui.

As a consequence, the different apply/confirm/rollback code paths in CBI
maps and the UCI change/revert pages have been consolidated into one common
implementation residing in the common global theme agnostic footer template.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e5a1ac0228)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
64e3fe9f6b luci-base: xhr.js: decode JSON for POST requests as well
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 98217f8f8d)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
186228e365 luci-base: utils: support multiple return values in util.ubus()
This is needed to deal with ubus methods that return multiple results,
e.g. session/list

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9ead1e29a6)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
df614ffd43 luci-base: strip superfluous space in additional field markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c27a77756c)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
97b3e5773d luci-base: cbi.js: fade to-be-deleted section when hovering delete button
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 590d1cc74f)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
6cf7d11e15 luci-base: cbi.js: use adjacent button dynlist add/remove buttons
Change the cbi.js code to create  a div based button element instead of an
image button.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 875b561875)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
d7d15f6c5c luci-base: rework reveal/hide CBI password template button
Also add a hidden type password field to prevent browser autocompleters
from entering the login passwords into fields liek the wireless WPA key
field.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b6dd0ecd6c)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
516ce4af78 luci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 4105c78ff9)
2018-07-26 20:29:51 +02:00
Jo-Philipp Wich
81682971dc luci-base: add description annotations to tblsection cells
Add a "data-description" attribute to CBI fields which have a description
set, this allows responsive design themes to render a field description
when decomposing the table grid.

Also reuse the precalculated "typename" property if it exists, instead of
deriving it from the template name yet again.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8e0ee137a6)
2018-07-26 20:28:30 +02:00
Krystian Kozak
03b6d77ee3 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit a900d61d91)
2018-07-26 20:26:58 +02:00
Zheng Qian
d6f8ac1a76 luci-base: zh_CN: Update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-07-25 11:25:45 +08:00
Anton Kikin
9724d76619 luci-base: fix Russian translation
More correct translation of the 'instance'.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit bf6275c85e)
2018-07-21 14:02:12 +02:00
Yurii
968f9dc0aa luci-base: update Ukrainian translation
Updated with the latest resync translation, corrections and additions.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 4fa9115de6)
2018-07-21 13:58:29 +02:00
Jo-Philipp Wich
c81359898e luci-base: fix bad CSS class names in table section template
The previous refactoring of the template caused the row stripying CSS
classes to be interpolated in such a way, that a separating space to
previous CSS classes was missing, leading to not rendered row names
and other side effects.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-20 11:38:35 +02:00
INAGAKI Hiroshi
5bbf669c85 luci-base: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 72517887cb)
2018-07-20 08:56:08 +02:00
INAGAKI Hiroshi
da600939fc i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(backported from commit 86660f92d1)
2018-07-20 08:55:45 +02:00
Anton Kikin
d3bfc5d03e luci-base: fix a typo in Russian translation
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 4aad4a75ba)
2018-07-20 08:01:12 +02:00
Jo-Philipp Wich
d7c868a05e luci-base: rework CBI footer template
- Make sure that hitting enter in the form hits the CBI save action and not
  apply or cancel
- Hide action panel if no actions are available
- CLeanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c09e154560)
2018-07-20 07:56:38 +02:00
Jo-Philipp Wich
bea5187f3d luci-base: rework tblsection template
- Hide empty title and description rows
- Correct row striping offset
- Cleanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1fb7122e3)
2018-07-20 07:56:35 +02:00
Jo-Philipp Wich
24b924bfe4 luci-base: rework simpleform template
- Ensure that pressing enter in the form triggers the submit action and
  not a cbi skip or cancel
- Hide page actions when empty
- Cleanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bc562294b9)
2018-07-20 07:56:31 +02:00
Jo-Philipp Wich
392fd02383 luci-base: cbi.js: add cbi_submit() helper
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7b43e81c9b)
2018-07-20 07:56:12 +02:00