132 Commits

Author SHA1 Message Date
Jo-Philipp Wich
41f18098bb luci-theme-bootstrap: fix translation for username and password captions
Fixes: c81b09ec3d ("luci-theme-bootstrap: simplify login dialog")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6a60d2434e92b422d9eb47ca2282a8bafdbbba35)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
40051f0302 luci-theme-bootstrap: simplify login dialog
Use an traditional HTML form with post submit action to the same URL in
order to simplify the login process and not rely on the discarded login
XHR reply properly setting the login cookie.

This will also avoid one useless request on login and hopefully fix login
issues reported with various browser environments.

As a bonus, the resulting code is somewhat smaller as well.

Ref: https://forum.openwrt.org/t/login-does-not-work/113360
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c81b09ec3d83542b9d4be6297c45d0e66896265e)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
1390f78fad luci-theme-bootstrap: add bottom margin to log views
Prevent the log output textareas to touch the footer border.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1a9afa2a90e823b0fbd0fc0ca3f64d7ed5f8aedb)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
2cc139ce6a luci-theme-bootstrap: prevent hiding header bar on long vertical scrolls
Ref: b11a7d8e49 (commitcomment-60968071)
Fixes: 8055acc9be ("luci-theme-bootstrap: overhaul styles")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e0888d70a92a832a9e720d3ba903341e4b03c252)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
18cc1c79d7 luci-theme-bootstrap: various style corrections
- Add proper top and bottom margin for tab descriptions
 - Allow flex wrapping for cbi-value rows
 - Ensure that nested table/grid sections always take the full width
 - Make table/grid section row action buttons are as narrow as possible

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b11a7d8e4940a3f68b93c5d93f16c900c9371bc2)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
119cfee890 luci-theme-bootstrap: fix cbi-value caption alignment
Since the removal of the clearfix styles, overlong captions will displace
subsequent input field rows.

Fix the issue by replace floating label + field margin with flexbox styles.

Fixes: #5535
Fixes: 8055acc9be ("luci-theme-bootstrap: overhaul styles")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4720a025e8ab5a28541f7d066fb9b2f35ddb2cb1)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
071a3b0d12 luci-theme-bootstrap: fix inner border radius in ifaceboxes, progressbars
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6f4708ca68bb02c9d4d76d3cd1f130d62558f5f1)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
f1e5639df1 luci-theme-bootstrap: hide scrollbars in modal overlay
Only enable scrollbars if content overflows.

Fixes: #5505
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7f26e86a9f840eb1b9ef11831fa8f6c9eeade079)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
c1745bdb85 luci-theme-bootstrap: further uci changelog style fixes
- Use the proper dialog class name to apply changelog styles
 - Darken grey background and borders

Fixes: 5bd111f58f ("luci-theme-bootstrap: fix uci changelog and readonly input styles")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 00dc07bb84f0bc1cc8d27c8f95e533aca07501d4)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
7884d8ac01 luci-theme-bootstrap: fix uci changelog and readonly input styles
- Rework uci changelog styling rules to work with unmodified markup
 - Drop redundant readonly input styles, don't fade readonly input texts

Fixes: 8055acc9be ("luci-theme-bootstrap: overhaul styles")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5bd111f58faee1a2eeaa28845f7df4b727c13d99)
2022-02-16 00:43:35 +01:00
Jo-Philipp Wich
883834c3dd luci-theme-bootstrap: overhaul styles
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 8055acc9be89f0bed31b6692ad08e6196611d478)
2022-02-16 00:42:42 +01:00
Jo-Philipp Wich
0cee46bc63 luci-theme-bootstrap: don't overwrite theme selection upon install
Revert to the previous uci-defaults behaviour of only setting the
selected theme to Bootstrap if the Bootstrap entry didn't exist yet
in the configuration.

Ref: https://forum.openwrt.org/t/luci-theme-behaviour-change/112047
Fixes: ed86f03a9f ("luci-theme-bootstrap: add explicit dark/light mode selection")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0bc09cc749439e233afdf9cd71c14f67090a3a07)
2021-11-16 13:20:46 +01:00
Jo-Philipp Wich
6df9ae0234 luci-theme-bootstrap: light/dark mode releated CSS fixes
- Fix progress bar shadow in light mode
 - Fix color schema preference in light and dark modes

Fixes: #5498
Fixes: #5499
Fixes: ed86f03a9f ("luci-theme-bootstrap: add explicit dark/light mode selection")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f16a2f3fbae0c527af812388390cc1bebe8d7eb3)
2021-11-08 09:58:57 +01:00
Jo-Philipp Wich
c14cac4eb9 luci-theme-bootstrap: add explicit dark/light mode selection
Register two further "virtual" themes called BootstrapDark and
BootstrapLight which force dark and light mode respectively.

The actual Bootstrap theme itself will continue to auto-select
dark mode preference based on OS/Browser preference settings.

Fixes: #5492
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ed86f03a9f7c2f58a9111f925bb81303596b394b)
2021-11-07 11:07:10 +01:00
Jo-Philipp Wich
a706a9c867 luci-theme-bootstrap: work around csstidy bug
Ref: 26047fb967 (commitcomment-58638390)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 37e40e04ef04307660c35eb089deb6cbde17d660)
2021-10-25 23:59:42 +02:00
Paul Dee
d24760e60a luci-theme-bootstrap: fix overlay display failures
Fixed overlay display failures for users on mobile, or users who booted
up in safe mode XD. Noticeable when vertical or horizontal real-estate
is too small for the displayed overlay.

This failure is most evident when you "edit" an interface, or display
your unsaved changes.

When content is wider than the screen view, the table hugs the (widest)
content maximally, and the overlay window becomes scrollable.

Disabled -webkit-overflow-scrolling, left, and right, because both FF
and Safari disable them as invalid anyway.

Signed-off-by: Paul Dee <systemcrash@users.noreply.github.com>
[Merge duplicate modal declarations, remove not applicable modal
 flexbox properties]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d1035c1f6907ecf3fba510551f1878f4c6cb3d72)
2021-10-25 20:59:22 +02:00
Jo-Philipp Wich
26047fb967 luci-theme-bootstrap: fix header width
Fixes: 588e24f9ca ("luci-theme-bootstrap: various tweaks and cleanups")
Ref: 588e24f9ca (r58625289)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8fc78a26da9ee95b2479213083efa750173291d2)
2021-10-25 19:40:06 +02:00
Jo-Philipp Wich
4a6927fa67 luci-theme-bootstrap: various tweaks and cleanups
- introduce new variable --text-color-highest which results in #000/#fff
   for bright and dark modes respectively
 - drop unused navigation style rules and selectors
 - use sticky positioning for header bar and drop top margin hacks
 - use flex box layout for header bar contents
 - use uniform line-height for button elements instead of pixel paddings
 - fix too bright .cbi-value bottom border in mobile dark mode
 - avoid rendering duplicate .cbi-value bottom borders for nested sections
 - simplify header markup, get rid of unused container elements
 - use non-wrapping flex box layout for page actions, prioritize primary
   action button in automatic width calculation
 - fix border radius of ifacebox headers
 - use brightest color for log output textareas
 - fix dark mode colors for mode menu
 - use flex layout for footer

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 588e24f9ca68de074c4d085ec99fd8c96ad0a3ed)
2021-10-22 20:37:12 +02:00
Jo-Philipp Wich
92ae018d61 luci-theme-bootstrap: rework uci changelog styling
Fixes: #5405
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 72d13da94cbbaab8ed3fd32f5347e7e718d46465)
2021-10-22 20:36:18 +02:00
Teoh Han Hui
83e19dcda6 luci-theme-bootstrap: add dark theme variant
Add a dark theme variant which is enabled by default when
prefers-color-scheme is set to dark.

Signed-off-by: Teoh Han Hui <teohhanhui@gmail.com>
(cherry picked from commit 6dd71eaebeb44df321c8c39da916082a0cde3285)
2021-10-22 20:36:12 +02:00
Jo-Philipp Wich
bd36169e8c luci-theme-bootstrap: mobile style fixes for vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e6a2cdbdab83f8eaefeec36ad668468ea374d471)
2021-06-13 21:50:18 +02:00
Jo-Philipp Wich
1818ddcac3 luci-theme-bootstrap: add svg help icon to form field descriptions
The still referenced help.gif icon is absent by default since it has been
moved to luci-compat.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 69608199973651baf585d24a095edf8c0c42e21f)
2021-06-12 19:23:01 +02:00
Hauke Mehrtens
139edfce8b themes: Call striptags() on hostname to prevent XSS
This calls striptags() on the hostname to prevent any XSS over the
hostname. This should fix CVE-2021-33425 as far as I understood it.

If someone adds some Javascript into system.@system[0].hostname it would
have been directly added to the page, this prevents the problem.

This can only be exploited by someone being able to modify the uci
configuration, normally a user with such privileges could also just
modify the webpage.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 5cbd79d7e31c0f0feaea2770bf102bbae7831e3c)
2021-06-09 20:53:15 +02:00
Dirk Brenken
6ffd1592ce luci-theme-bootstrap: fix text wrapping in buttons
* should fix #4647

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-12-27 23:02:50 -10:00
Hannu Nyman
258e74c1c3 themes: remove deprecated reference to enabling SSH
Remove the reference to setting a password being linked to SSH capability.
(SSH has been initially enabled since year 2015.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-08-16 22:19:37 +03:00
Russell Morris
27fc7a8b4e luci-theme-bootstrap: update href for Bootstrap "brand"
In the Material theme, clicking on the logo takes you to the status page.
This seems logical, and is very helpful. But in Bootstrap, it doesn't
do anything, so just pulling the same href from Material to Bootstrap,
so the link works in Bootstrap as well.

Signed-off-by: Russell Morris <rmorris@rkmorris.us>
[adjust commit subject, squash commits]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-06-16 17:09:19 +02:00
Jo-Philipp Wich
1ac8df2614 luci-theme-bootstrap: rework menu rendering
Utilize the LuCI.ui.menu class to load, traverse and cache the menu tree
in the local session store.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-16 13:30:35 +02:00
Jo-Philipp Wich
c591490528
Merge pull request #3819 from ptpt52/theme
set mediaurlbase only when it is the first time to be installed
2020-04-08 09:07:55 +02:00
Chen Minqiang
fc150636b9 luci-theme-*: set mediaurlbase if it is the first time to be installed
If we build multi-themes into firmware, each of them set itself
to be the default theme, what theme should it be?

To make it clear, we only set mediaurlbase if the theme is the
first time to be installed/built-in.

This resolve the issue that theme always change to somewhat default
after upgrading the firmware even with a config-keep-upgrade

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2020-04-03 21:44:28 +08:00
Jo-Philipp Wich
015712bba0 luci-theme-bootstrap, luci-theme-openwrt-2020: fix dynlist overflows
Fixes: #3795
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-03 13:47:00 +02:00
Jo-Philipp Wich
ccb7e4a4a7 themes: generalize indicator markup and styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-03-30 17:12:07 +02:00
Jo-Philipp Wich
c99684dff7 luci-theme-bootstrap: dynamically adjust body margin
Fixes: #3722
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-03-27 17:58:12 +01:00
Jo-Philipp Wich
ca17ec9b4f luci-theme-bootstrap: fixup assoclist styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3b40c582baefcb302fb23ed633ed85ab1ac72a9e)
2020-03-24 22:14:18 +01:00
Jo-Philipp Wich
5d7dc391d4 themes: ensure that data-page attribute is escaped
Fixes: #3757
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-03-15 17:48:40 +01:00
Jo-Philipp Wich
aa2445cdd8 luci-theme-bootstrap: fix overview wireless display quirks
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-03-04 09:29:07 +01:00
Jo-Philipp Wich
0130e2b08c themes: render menu even when not logged in
Ref: #3563
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-25 23:28:24 +01:00
Jo-Philipp Wich
0d97ea26f8 luci-theme-bootstrap: add CSS fixes for tooltip elements
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-19 17:50:37 +01:00
Jo-Philipp Wich
3c5feae57c luci-theme-bootstrap: fix invalid dropdown state styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-15 18:54:32 +01:00
Jo-Philipp Wich
185b84bc9d
Merge pull request #3401 from MartB/modal-heightfixv2
luci-theme-*: remove modal max-height #3383 v2
2019-12-25 17:58:06 +01:00
Jo-Philipp Wich
5db4463ace luci-theme-bootstrap: render menu on client side
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-12-16 18:07:17 +01:00
MartB
c6122af7ea luci-theme-*: remove modal max-height #3383 v2
Signed-off-by: MartB <mart.b@outlook.de>
2019-12-10 17:26:10 +01:00
MartB
7f9eb4638b luci-theme-bootstrap: fix background of large modal overlays.
Signed-off-by: MartB <mart.b@outlook.de>
2019-12-02 22:17:59 +01:00
Jo-Philipp Wich
8672ddcf0b luci-theme-bootstrap: allow textarea resizing
Fixes: #3317
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-22 09:16:45 +01:00
Jo-Philipp Wich
13e9e3e9e8 treewide: fix "Unhandled token" errors with Lua CBI maps
The `data-type` attribute is used to bind datatype validators to a widget
while some templates used the same attribute to denote the name of the
underlying widget.

Change the `data-type` attributes referring to the widget name to
`data-widget` in order to stop the JS token error spam.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-16 18:25:52 +01:00
Jo-Philipp Wich
df38e4505c luci-theme-bootstrap: minor page action alignment fix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-13 08:51:37 +01:00
Jo-Philipp Wich
e8abe15483 luci-theme-bootstrap: fix mobile input cutoff in dropdowns
Fixes: #3285
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-10 19:52:48 +01:00
Jo-Philipp Wich
3a82faf21a themes: add necessary styles for ComboButton
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-10 18:20:56 +01:00
Jo-Philipp Wich
3d0861de20 luci-theme-bootstrap: minor CSS fixes
- Don't remove background for disabled buttons
 - Move inactive tooltip element further out of the view area

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-10 18:18:53 +01:00
Jo-Philipp Wich
1116575513 luci-theme-bootstrap: fix ifacebox cutoff on OS X Safari
Fixes: #3278
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-08 15:59:40 +01:00
Ashus
39ae339051 Replaced an old icon with a new one, format changed from ICO to PNG to make it even smaller.
- references #2251

Signed-off-by: Ashus <github.com@ashus.net>
2019-10-09 23:26:45 +02:00