luci-base: fix footer template
authorJo-Philipp Wich <jo@mein.io>
Sat, 28 Jul 2018 09:43:02 +0000 (11:43 +0200)
committerJo-Philipp Wich <jo@mein.io>
Sat, 28 Jul 2018 15:14:22 +0000 (17:14 +0200)
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 350be23eb912bd1f3d1d2c09131d1ed03a27dcd0)

modules/luci-base/luasrc/view/footer.htm

index d268d71cfffd436875ca1bc898dfe495486e0bc0..1667d3aa9a31f0721a677a655b7697aaff3682ae 100644 (file)
@@ -5,8 +5,6 @@
 -%>
 
 <%
-       include("themes/" .. theme .. "/footer")
-
        local is_rollback_pending, rollback_time_remaining, rollback_session, rollback_token = luci.model.uci:rollback_pending()
 
        if is_rollback_pending or trigger_apply or trigger_revert then
@@ -27,4 +25,6 @@
        </script>
 <%
        end
+
+       include("themes/" .. theme .. "/footer")
 %>