summaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-11-16 18:23:43 +0100
committerJo-Philipp Wich <jo@mein.io>2019-11-16 18:25:52 +0100
commit13e9e3e9e8633c7a54fe5fec1481e9df62594982 (patch)
tree3e57a63b3645c289c1b495d7587cf7f020a2090d /themes
parenteaa193336fc7b1f4bf2b8a51c120308d90e86e95 (diff)
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>
Diffstat (limited to 'themes')
-rw-r--r--themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css18
-rw-r--r--themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css18
2 files changed, 18 insertions, 18 deletions
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
index 2d4f85660..466573b26 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
@@ -71,8 +71,8 @@ header h3 a, header .brand {
word-wrap: normal;
}
- .td[data-type="button"],
- .td[data-type="fvalue"] {
+ .td[data-widget="button"],
+ .td[data-widget="fvalue"] {
flex: 1 1 17%;
text-align: left;
}
@@ -145,12 +145,12 @@ header h3 a, header .brand {
flex-basis: 100%;
}
- .td.cbi-value-field[data-type="dvalue"] {
+ .td.cbi-value-field[data-widget="dvalue"] {
flex-basis: 50%;
}
- .td.cbi-value-field[data-type="button"],
- .td.cbi-value-field[data-type="fvalue"] {
+ .td.cbi-value-field[data-widget="button"],
+ .td.cbi-value-field[data-widget="fvalue"] {
flex-basis: 25%;
text-align: left;
}
@@ -311,7 +311,7 @@ header h3 a, header .brand {
flex-basis: 50% !important;
}
- [data-page="admin-status-processes"] .td[data-type="button"] {
+ [data-page="admin-status-processes"] .td[data-widget="button"] {
flex-basis: 33% !important;
}
@@ -320,9 +320,9 @@ header h3 a, header .brand {
flex-basis: 25% !important;
}
- [data-page="admin-system-fstab"] .td[data-type="button"]::before,
- [data-page="admin-system-startup"] .td[data-type="button"]::before,
- [data-page="admin-status-processes"] .td[data-type="button"]::before {
+ [data-page="admin-system-fstab"] .td[data-widget="button"]::before,
+ [data-page="admin-system-startup"] .td[data-widget="button"]::before,
+ [data-page="admin-status-processes"] .td[data-widget="button"]::before {
display: none;
}
}
diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index fe4640071..faaaf220a 100644
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -933,8 +933,8 @@ div.cbi-optionals {
margin-left: 3px;
}
-.th[data-type="button"], .td[data-type="button"],
-.th[data-type="fvalue"], .td[data-type="fvalue"] {
+.th[data-widget="button"], .td[data-widget="button"],
+.th[data-widget="fvalue"], .td[data-widget="fvalue"] {
flex: 1 1 2em;
text-align: center;
}
@@ -1828,8 +1828,8 @@ select + .cbi-button {
word-wrap: normal;
}
- .td[data-type="button"],
- .td[data-type="fvalue"] {
+ .td[data-widget="button"],
+ .td[data-widget="fvalue"] {
flex: 1 1 12.5%;
text-align: left;
}
@@ -1972,12 +1972,12 @@ select + .cbi-button {
flex-basis: 100%;
}
- .td.cbi-value-field[data-type="dvalue"] {
+ .td.cbi-value-field[data-widget="dvalue"] {
flex-basis: 50%;
}
- .td.cbi-value-field[data-type="button"],
- .td.cbi-value-field[data-type="fvalue"] {
+ .td.cbi-value-field[data-widget="button"],
+ .td.cbi-value-field[data-widget="fvalue"] {
flex-basis: 25%;
text-align: left;
}
@@ -2038,8 +2038,8 @@ select + .cbi-button {
margin-top: .5em;
}
- #cbi-firewall-rule .td[data-type="fvalue"],
- #cbi-firewall-redirect .td[data-type="fvalue"] {
+ #cbi-firewall-rule .td[data-widget="fvalue"],
+ #cbi-firewall-redirect .td[data-widget="fvalue"] {
display: none;
}
}