From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 28 Jul 2018 09:43:02 +0000 (+0200)
Subject: luci-base: fix footer template
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=520afa4c3915b792aa019e44c351100bd240c90a;p=oweals%2Fluci.git

luci-base: fix footer template

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)
---

diff --git a/modules/luci-base/luasrc/view/footer.htm b/modules/luci-base/luasrc/view/footer.htm
index d268d71cf..1667d3aa9 100644
--- a/modules/luci-base/luasrc/view/footer.htm
+++ b/modules/luci-base/luasrc/view/footer.htm
@@ -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")
 %>