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>

diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm
index 2cea0b9118319d5b446bd933b4095319a41f6a70..821fa3efaed9637dc86d47ef131174e110659fd6 100644 (file)
--- 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" />