Update luci-base

luci-base/luasrc/cbi.lua

@@ -1226,13 +1226,14 @@ function TypedSection.parse(self, novld)
 		local stval = RESORT_PREFIX .. self.config .. "." .. self.sectiontype
 		local order = self.map:formvalue(stval)
 		if order and #order > 0 then
-			local sid
-			local num = 0
+			local sids, sid = { }, nil
 			for sid in util.imatch(order) do
-				self.map.uci:reorder(self.config, sid, num)
-				num = num + 1
+				sids[#sids+1] = sid
+			end
+			if #sids > 0 then
+				self.map.uci:reorder(self.config, sids)
+				self.changed = true
 			end
-			self.changed = (num > 0)
 		end
 	end
 

luci-base/luasrc/dispatcher.lua

@@ -358,7 +358,7 @@ function dispatch(request)
 			elseif key == "REQUEST_URI" then
 				return build_url(unpack(ctx.requestpath))
 			elseif key == "FULL_REQUEST_URI" then
-				local url = { http.getenv("SCRIPT_NAME") or "" , http.getenv("PATH_INFO") }
+				local url = { http.getenv("SCRIPT_NAME") or "", http.getenv("PATH_INFO") }
 				local query = http.getenv("QUERY_STRING")
 				if query and #query > 0 then
 					url[#url+1] = "?"
@@ -507,10 +507,11 @@ function dispatch(request)
 		else
 			ok, err = util.copcall(target, unpack(args))
 		end
-		assert(ok,
-		       "Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") ..
-		       " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" ..
-		       "The called action terminated with an exception:\n" .. tostring(err or "(unknown)"))
+		if not ok then
+			error500("Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") ..
+			         " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" ..
+			         "The called action terminated with an exception:\n" .. tostring(err or "(unknown)"))
+		end
 	else
 		local root = node()
 		if not root or not root.target then

luci-base/luasrc/util.lua

@@ -100,6 +100,8 @@ end
 -- Scope manipulation routines
 --
 
+coxpt = setmetatable({}, { __mode = "kv" })
+
 local tl_meta = {
 	__mode = "k",
 
@@ -697,73 +699,69 @@ function checklib(fullpathexe, wantedlib)
 	return false
 end
 
+-------------------------------------------------------------------------------
+-- Coroutine safe xpcall and pcall versions
 --
--- Coroutine safe xpcall and pcall versions modified for Luci
--- original version:
--- coxpcall 1.13 - Copyright 2005 - Kepler Project (www.keplerproject.org)
+-- Encapsulates the protected calls with a coroutine based loop, so errors can
+-- be dealed without the usual Lua 5.x pcall/xpcall issues with coroutines
+-- yielding inside the call to pcall or xpcall.
 --
--- Copyright © 2005 Kepler Project.
--- Permission is hereby granted, free of charge, to any person obtaining a
--- copy of this software and associated documentation files (the "Software"),
--- to deal in the Software without restriction, including without limitation
--- the rights to use, copy, modify, merge, publish, distribute, sublicense,
--- and/or sell copies of the Software, and to permit persons to whom the
--- Software is furnished to do so, subject to the following conditions:
+-- Authors: Roberto Ierusalimschy and Andre Carregal
+-- Contributors: Thomas Harning Jr., Ignacio Burgueño, Fabio Mascarenhas
 --
--- The above copyright notice and this permission notice shall be
--- included in all copies or substantial portions of the Software.
+-- Copyright 2005 - Kepler Project
 --
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
--- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
--- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
--- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
--- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-- $Id: coxpcall.lua,v 1.13 2008/05/19 19:20:02 mascarenhas Exp $
+-------------------------------------------------------------------------------
 
-local performResume, handleReturnValue
-local oldpcall, oldxpcall = pcall, xpcall
-coxpt = {}
-setmetatable(coxpt, {__mode = "kv"})
+-------------------------------------------------------------------------------
+-- Implements xpcall with coroutines
+-------------------------------------------------------------------------------
+local coromap = setmetatable({}, { __mode = "k" })
 
--- Identity function for copcall
-local function copcall_id(trace, ...)
-  return ...
-end
-
---				values of either the function or the error handler
-function coxpcall(f, err, ...)
-	local res, co = oldpcall(coroutine.create, f)
-	if not res then
-		local params = {...}
-		local newf = function() return f(unpack(params)) end
-		co = coroutine.create(newf)
-	end
-	local c = coroutine.running()
-	coxpt[co] = coxpt[c] or c or 0
-
-	return performResume(err, co, ...)
-end
-
---				values of the function or the error object
-function copcall(f, ...)
-	return coxpcall(f, copcall_id, ...)
-end
-
--- Handle return value of protected call
-function handleReturnValue(err, co, status, ...)
+local function handleReturnValue(err, co, status, ...)
 	if not status then
 		return false, err(debug.traceback(co, (...)), ...)
 	end
-
-	if coroutine.status(co) ~= 'suspended' then
+	if coroutine.status(co) == 'suspended' then
+		return performResume(err, co, coroutine.yield(...))
+	else
 		return true, ...
 	end
-
-	return performResume(err, co, coroutine.yield(...))
 end
 
--- Resume execution of protected function call
 function performResume(err, co, ...)
 	return handleReturnValue(err, co, coroutine.resume(co, ...))
 end
+
+local function id(trace, ...)
+	return trace
+end
+
+function coxpcall(f, err, ...)
+	local current = coroutine.running()
+	if not current then
+		if err == id then
+			return pcall(f, ...)
+		else
+			if select("#", ...) > 0 then
+				local oldf, params = f, { ... }
+				f = function() return oldf(unpack(params)) end
+			end
+			return xpcall(f, err)
+		end
+	else
+		local res, co = pcall(coroutine.create, f)
+		if not res then
+			local newf = function(...) return f(...) end
+			co = coroutine.create(newf)
+		end
+		coromap[co] = current
+		coxpt[co] = coxpt[current] or current or 0
+		return performResume(err, co, ...)
+	end
+end
+
+function copcall(f, ...)
+	return coxpcall(f, id, ...)
+end

luci-base/luasrc/view/cbi/apply_widget.htm

@@ -1,59 +1,98 @@
 <% export("cbi_apply_widget", function(redirect_ok) -%>
 <style type="text/css">
-	#cbi_apply_status {
+	.alert-message.notice {
+		background: linear-gradient(#fff 0%, #eee 100%);
+	}
+
+	#cbi_apply_overlay {
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background: rgba(0, 0, 0, 0.7);
+		display: none;
+		z-index: 20000;
+	}
+
+	#cbi_apply_overlay .alert-message {
+		position: relative;
+		top: 10%;
+		width: 60%;
+		margin: auto;
 		display: flex;
 		flex-wrap: wrap;
 		min-height: 32px;
 		align-items: center;
-		margin: 1.5em 0 1.5em 0;
 	}
 
-	#cbi_apply_status > h4,
-	#cbi_apply_status > p,
-	#cbi_apply_status > div {
+	#cbi_apply_overlay .alert-message > h4,
+	#cbi_apply_overlay .alert-message > p,
+	#cbi_apply_overlay .alert-message > div {
 		flex-basis: 100%;
 	}
 
-	#cbi_apply_status > img {
+	#cbi_apply_overlay .alert-message > img {
 		margin-right: 1em;
 		flex-basis: 32px;
 	}
 
-	#cbi_apply_status + script + .cbi-section {
-		margin-top: -1em;
+	body.apply-overlay-active {
+		overflow: hidden;
+		height: 100vh;
 	}
 
-	.alert-message.notice {
-		background: linear-gradient(#fff 0%, #eee 100%);
+	body.apply-overlay-active #cbi_apply_overlay {
+		display: block;
 	}
 </style>
 
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.138.59467-72fe5dd"></script>
 <script type="text/javascript">//<![CDATA[
 	var xhr = new XHR(),
-	    stat, indicator,
 	    uci_apply_auth = { sid: '<%=luci.dispatcher.context.authsession%>', token: '<%=token%>' },
 	    uci_apply_rollback = <%=math.max(luci.config and luci.config.apply and luci.config.apply.rollback or 30, 30)%>,
 	    uci_apply_holdoff = <%=math.max(luci.config and luci.config.apply and luci.config.apply.holdoff or 4, 1)%>,
 	    uci_apply_timeout = <%=math.max(luci.config and luci.config.apply and luci.config.apply.timeout or 5, 1)%>,
 	    uci_apply_display = <%=math.max(luci.config and luci.config.apply and luci.config.apply.display or 1.5, 1)%>;
 
+	function uci_status_message(type, content) {
+		var overlay = document.getElementById('cbi_apply_overlay') || document.body.appendChild(E('<div id="cbi_apply_overlay"><div class="alert-message"></div></div>')),
+		    message = overlay.querySelector('.alert-message');
+
+		if (message && type) {
+			if (!message.classList.contains(type)) {
+				message.classList.remove('notice');
+				message.classList.remove('warning');
+				message.classList.add(type);
+			}
+
+			if (content)
+				message.innerHTML = content;
+
+			document.body.classList.add('apply-overlay-active');
+		}
+		else {
+			document.body.classList.remove('apply-overlay-active');
+		}
+	}
+
 	function uci_rollback(checked) {
 		if (checked) {
-			stat.classList.remove('notice');
-			stat.classList.add('warning');
-			stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
-			                 '<%:Failed to confirm apply within %ds, waiting for rollback…%>'.format(uci_apply_rollback);
+			uci_status_message('warning',
+				'<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
+				'<%:Failed to confirm apply within %ds, waiting for rollback…%>'.format(uci_apply_rollback));
 
 			var call = function(r) {
 				if (r.status === 204) {
-					stat.innerHTML = '<h4><%:Configuration has been rolled back!%></h4>' +
+					uci_status_message('warning',
+						'<h4><%:Configuration has been rolled back!%></h4>' +
 						'<p><%:The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, perform an unchecked configuration apply. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.%></p>'.format(uci_apply_rollback) +
 						'<div class="right">' +
-							'<input type="button" class="btn" onclick="this.parentNode.parentNode.style.display=\'none\'" value="<%:Dismiss%>" /> ' +
+							'<input type="button" class="btn" onclick="uci_status_message(false)" value="<%:Dismiss%>" /> ' +
 							'<input type="button" class="btn" onclick="uci_revert()" value="<%:Revert changes%>" /> ' +
 							'<input type="button" class="btn danger" onclick="uci_apply(false)" value="<%:Apply unchecked%>" />' +
-						'</div>';
+						'</div>');
 
 					return;
 				}
@@ -64,10 +103,9 @@
 			call({ status: 0 });
 		}
 		else {
-			stat.classList.remove('notice');
-			stat.classList.add('warning');
-			stat.innerHTML = '<h4><%:Device unreachable!%></h4>' +
-				'<p><%:Could not regain access to the device after applying the configuration changes. You might need to reconnect if you modified network related settings such as the IP address or wireless security credentials.%></p>';
+			uci_status_message('warning',
+				'<h4><%:Device unreachable!%></h4>' +
+				'<p><%:Could not regain access to the device after applying the configuration changes. You might need to reconnect if you modified network related settings such as the IP address or wireless security credentials.%></p>');
 		}
 	}
 
@@ -75,12 +113,7 @@
 		var tt;
 		var ts = Date.now();
 
-		stat = document.getElementById('cbi_apply_status');
-		stat.style.display = '';
-		stat.classList.remove('warning');
-		stat.classList.add('notice');
-
-		indicator = document.querySelector('.uci_change_indicator');
+		uci_status_message('notice');
 
 		var call = function(r) {
 			if (Date.now() >= deadline) {
@@ -88,15 +121,18 @@
 				return;
 			}
 			else if (r && (r.status === 200 || r.status === 204)) {
-				if (indicator)
-					indicator.style.display = 'none';
+				var indicator = document.querySelector('.uci_change_indicator');
+				if (indicator) indicator.style.display = 'none';
 
-				stat.innerHTML = '<%:Configuration has been applied.%>';
+				uci_status_message('notice', '<%:Configuration has been applied.%>');
 
 				window.clearTimeout(tt);
 				window.setTimeout(function() {
-					stat.style.display = 'none';
-					<% if redirect_ok then %>location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');<% end %>
+					<% if redirect_ok then -%>
+						location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');
+					<%- else -%>
+						window.location = window.location.href.split('#')[0];
+					<% end %>
 				}, uci_apply_display * 1000);
 
 				return;
@@ -108,8 +144,9 @@
 		var tick = function() {
 			var now = Date.now();
 
-			stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
-			                 '<%:Waiting for configuration to get applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0));
+			uci_status_message('notice',
+				'<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
+				'<%:Waiting for configuration to get applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0)));
 
 			if (now >= deadline)
 				return;
@@ -125,43 +162,39 @@
 	}
 
 	function uci_apply(checked) {
-		stat = document.getElementById('cbi_apply_status');
-		stat.style.display = '';
-		stat.classList.remove('warning');
-		stat.classList.add('notice');
-		stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
-		                 '<%:Starting configuration apply…%>';
+		uci_status_message('notice',
+			'<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
+			'<%:Starting configuration apply…%>');
 
 		xhr.post('<%=url("admin/uci")%>/' + (checked ? 'apply_rollback' : 'apply_unchecked'), uci_apply_auth, function(r) {
 			if (r.status === (checked ? 200 : 204)) {
 				uci_confirm(checked, Date.now() + uci_apply_rollback * 1000);
 			}
 			else if (checked && r.status === 204) {
-				stat.innerHTML = '<%:There are no changes to apply.%>';
+				uci_status_message('notice', '<%:There are no changes to apply.%>');
 				window.setTimeout(function() {
-					stat.style.display = 'none';
-					<% if redirect_ok then %>location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');<% end %>
+					<% if redirect_ok then -%>
+						location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');
+					<%- else -%>
+						uci_status_message(false);
+					<%- end %>
 				}, uci_apply_display * 1000);
 			}
 			else {
-				stat.classList.add('warning');
-				stat.classList.remove('notice');
-				stat.innerHTML = '<%_Apply request failed with status <code>%h</code>%>'.format(r.responseText || r.statusText || r.status);
+				uci_status_message('warning', '<%_Apply request failed with status <code>%h</code>%>'.format(r.responseText || r.statusText || r.status));
+				window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000);
 			}
 		});
 	}
 
 	function uci_revert() {
-		stat = document.getElementById('cbi_apply_status');
-		stat.style.display = '';
-		stat.classList.remove('warning');
-		stat.classList.add('notice');
-		stat.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
-		                 '<%:Reverting configuration…%>';
+		uci_status_message('notice',
+			'<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
+			'<%:Reverting configuration…%>');
 
 		xhr.post('<%=url("admin/uci/revert")%>', uci_apply_auth, function(r) {
 			if (r.status === 200) {
-				stat.innerHTML = '<%:Changes have been reverted.%>';
+				uci_status_message('notice', '<%:Changes have been reverted.%>');
 				window.setTimeout(function() {
 					<% if redirect_ok then -%>
 						location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>');
@@ -171,9 +204,8 @@
 				}, uci_apply_display * 1000);
 			}
 			else {
-				stat.classList.add('warning');
-				stat.classList.remove('notice');
-				stat.innerHTML = '<%_Revert request failed with status <code>%h</code>%>'.format(r.statusText || r.status);
+				uci_status_message('warning', '<%_Revert request failed with status <code>%h</code>%>'.format(r.statusText || r.status));
+				window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000);
 			}
 		});
 	}

luci-base/luasrc/view/cbi/cell_valuefooter.htm

@@ -1,2 +1,2 @@
 </div>
-</td>
+</div>

luci-base/luasrc/view/cbi/cell_valueheader.htm

@@ -1,2 +1,2 @@
-<td class="cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>">
+<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>">
 <div id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>">

luci-base/luasrc/view/cbi/map.htm

@@ -1,5 +1,5 @@
 <%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%>
-	<div class="errorbox"><%=pcdata(msg)%></div>
+	<div class="alert-message warning"><%=pcdata(msg)%></div>
 <%- end end -%>
 
 <div class="cbi-map" id="cbi-<%=self.config%>">

luci-base/luasrc/view/cbi/tblsection.htm

@@ -27,52 +27,52 @@ end
 	<div class="cbi-section-descr"><%=self.description%></div>
 	<div class="cbi-section-node">
 		<%- local count = 0 -%>
-		<table class="cbi-section-table">
-			<tr class="cbi-section-table-titles">
+		<div class="table cbi-section-table">
+			<div class="tr cbi-section-table-titles">
 			<%- if not self.anonymous then -%>
 				<%- if self.sectionhead then -%>
-					<th class="cbi-section-table-cell"><%=self.sectionhead%></th>
+					<div class="th cbi-section-table-cell"><%=self.sectionhead%></div>
 				<%- else -%>
-					<th>&#160;</th>
+					<div class="th">&#160;</div>
 				<%- end -%>
 			<%- count = count +1; end -%>
 			<%- for i, k in pairs(self.children) do if not k.optional then -%>
-				<th class="cbi-section-table-cell"<%=width(k)%>>
+				<div class="th cbi-section-table-cell"<%=width(k)%>>
 				<%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
 					<%-=k.title-%>
 				<%- if k.titleref then -%></a><%- end -%>
-				</th>
+				</div>
 			<%- count = count + 1; end; end; if self.sortable then -%>
-				<th class="cbi-section-table-cell"><%:Sort%></th>
+				<div class="th cbi-section-table-cell"><%:Sort%></div>
 			<%- count = count + 1; end; if self.extedit or self.addremove then -%>
-				<th class="cbi-section-table-cell">&#160;</th>
+				<div class="th cbi-section-table-cell">&#160;</div>
 			<%- count = count + 1; end -%>
-			</tr>
-			<tr class="cbi-section-table-descr">
+			</div>
+			<div class="tr cbi-section-table-descr">
 			<%- if not self.anonymous then -%>
 				<%- if self.sectiondesc then -%>
-					<th class="cbi-section-table-cell"><%=self.sectiondesc%></th>
+					<div class="th cbi-section-table-cell"><%=self.sectiondesc%></div>
 				<%- else -%>
-					<th></th>
+					<div class="th"></div>
 				<%- end -%>
 			<%- end -%>
 			<%- for i, k in pairs(self.children) do if not k.optional then -%>
-				<th class="cbi-section-table-cell"<%=width(k)%>><%=k.description%></th>
+				<div class="th cbi-section-table-cell"<%=width(k)%>><%=k.description%></div>
 			<%- end; end; if self.sortable then -%>
-				<th class="cbi-section-table-cell"></th>
+				<div class="th cbi-section-table-cell"></div>
 			<%- end; if self.extedit or self.addremove then -%>
-				<th class="cbi-section-table-cell"></th>
+				<div class="th cbi-section-table-cell"></div>
 			<%- end -%>
-			</tr>
+			</div>
 			<%- local isempty = true
 			    for i, k in ipairs(self:cfgsections()) do
 					section = k
 					isempty = false
 					scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
 			-%>
-			<tr class="cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
+			<div class="tr cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
 				<% if not self.anonymous then -%>
-					<th><h3><%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%></h3></th>
+					<div class="th"><h3><%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%></h3></div>
 				<%- end %>
 
 
@@ -85,14 +85,14 @@ end
 				-%>
 
 				<%- if self.sortable then -%>
-					<td class="cbi-section-table-cell">
+					<div class="td cbi-section-table-cell">
 						<input class="cbi-button cbi-button-up" type="button" value=""  onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move up%>" title="<%:Move up%>" />
 						<input class="cbi-button cbi-button-down" type="button" value=""  onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move down%>" title="<%:Move down%>" />
-					</td>
+					</div>
 				<%- end -%>
 
 				<%- if self.extedit or self.addremove then -%>
-					<td class="cbi-section-table-cell">
+					<div class="td cbi-section-table-cell">
 						<%- if self.extedit then -%>
 							<input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
 							<%- if type(self.extedit) == "string" then
@@ -104,17 +104,17 @@ end
 						<%- end; if self.addremove then %>
 							<input class="cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
 						<%- end -%>
-					</td>
+					</div>
 				<%- end -%>
-			</tr>
+			</div>
 			<%- end -%>
 
 			<%- if isempty then -%>
-			<tr class="cbi-section-table-row">
-				<td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td>
-			</tr>
+			<div class="tr cbi-section-table-row">
+				<div class="td" colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></div>
+			</div>
 			<%- end -%>
-		</table>
+		</div>
 
 		<% if self.error then %>
 			<div class="cbi-section-error">

luci-base/luasrc/view/sysauth.htm

@@ -8,7 +8,9 @@
 
 <form method="post" action="<%=pcdata(FULL_REQUEST_URI)%>">
 	<%- if fuser then %>
-	<div class="errorbox"><%:Invalid username and/or password! Please try again.%></div>
+		<div class="alert-message warning">
+			<p><%:Invalid username and/or password! Please try again.%></p>
+		</div>
 	<% end -%>
 
 	<div class="cbi-map">