summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base/luasrc/view/cbi/header.htm
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-09 17:04:10 +0200
committerJo-Philipp Wich <jo@mein.io>2018-07-09 17:04:10 +0200
commit4a083f6d2334bf2f35e8299fc215d61165c6a39a (patch)
treea932260069117e66e83ee1b53c8a8a6c6368bbdf /modules/luci-base/luasrc/view/cbi/header.htm
parent9651be295355acf1c22157b00c86a7d5680eb2a5 (diff)
luci-base: fix placement of CBI strings
Commit c0de036b3 ("treewide: always include cbi.js") improperly removed the cbi.js script include from header.htm, leaving behind the string dictionary. Move the JSON dictionary to the parent <form> element and delete the leftover </script> element. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base/luasrc/view/cbi/header.htm')
-rw-r--r--modules/luci-base/luasrc/view/cbi/header.htm24
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm
index 2cea0b911..821fa3efa 100644
--- a/modules/luci-base/luasrc/view/cbi/header.htm
+++ b/modules/luci-base/luasrc/view/cbi/header.htm
@@ -1,17 +1,17 @@
<%+header%>
-<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')">
+<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')"<%=
+ attr("data-strings", luci.util.serialize_json({
+ label = {
+ choose = translate('-- Please choose --'),
+ custom = translate('-- custom --'),
+ },
+ path = {
+ resource = resource,
+ browser = url("admin/filebrowser")
+ }
+ }))
+%>>
<div>
- attr("data-strings", luci.util.serialize_json({
- label = {
- choose = translate('-- Please choose --'),
- custom = translate('-- custom --'),
- },
- path = {
- resource = resource,
- browser = url("admin/filebrowser")
- }
- }))
- %>></script>
<input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="cbi.submit" value="1" />
<input type="submit" value="<%:Save%>" class="hidden" />