From 165ba6f180d10f7a99c1abe386328efeccaf78eb Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 9 Dec 2018 20:10:15 +0100
Subject: [PATCH] luci-app-radicale: refactor custom nsection template

Refactor the named section template shipped with luci-app-radicale to work
with the latest LuCI tabbing changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../luasrc/view/radicale/tabmap_nsections.htm | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm b/applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm
index 2b526a31d7..fdb3f27abc 100644
--- a/applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm
+++ b/applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm
@@ -3,8 +3,12 @@
 <%- end end -%>
 
 <div class="cbi-map" id="cbi-<%=self.config%>">
-	<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
-	<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
+	<% if self.title and #self.title > 0 then %>
+		<h2 name="content"><%=self.title%></h2>
+	<% end %>
+	<% if self.description and #self.description > 0 then %>
+		<div class="cbi-map-descr"><%=self.description%></div>
+	<% end %>
 	<%- if firstmap and (applymap or confirmmap) then -%>
 		<%+cbi/apply_widget%>
 		<% cbi_apply_widget() %>
@@ -21,23 +25,18 @@
 	<%- end -%>
 
 	<% if self.tabbed then %>
-		<ul class="cbi-tabmenu map">
-			<%- self.selected_tab = luci.http.formvalue("tab.m-" .. self.config) %>
-			<% for i, section in ipairs(self.children) do %>
-				<%- if not self.selected_tab then self.selected_tab = section.sectiontype end %>
-				<li id="tab.m-<%=self.config%>.<%=section.section or section.sectiontype%>" class="cbi-tab<%=(section.sectiontype == self.selected_tab) and '' or '-disabled'%>">
-					<a onclick="this.blur(); return cbi_t_switch('m-<%=self.config%>', '<%=section.section or section.sectiontype%>')" href="<%=REQUEST_URI%>?tab.m-<%=self.config%>=<%=section.section or section.sectiontype%>"><%=section.title or section.section or section.sectiontype %></a>
-					<% if section.sectiontype == self.selected_tab then %><input type="hidden" id="tab.m-<%=self.config%>" name="tab.m-<%=self.config%>" value="<%=section.section or section.sectiontype%>" /><% end %>
-				</li>
+		<div>
+			<% for i, section in ipairs(self.children) do
+			       tab = section.section or section.sectiontype %>
+				<div class="cbi-tabcontainer"<%=
+					attr("id", "container.m-%s.%s" %{ self.config, tab }) ..
+					attr("data-tab", tab) ..
+					attr("data-tab-title", section.title or tab)
+				%>>
+					<% section:render() %>
+				</div>
 			<% end %>
-		</ul>
-		<br />
-		<% for i, section in ipairs(self.children) do %>
-			<div class="cbi-tabcontainer" id="container.m-<%=self.config%>.<%=section.section or section.sectiontype%>"<% if section.sectiontype ~= self.selected_tab then %> style="display:none"<% end %>>
-				<% section:render() %>
-			</div>
-			<script type="text/javascript">cbi_t_add('m-<%=self.config%>', '<%=section.section or section.sectiontype%>')</script>
-		<% end %>
+		</div>
 
 	<% else %>
 		<%- self:render_children() %>
-- 
2.30.2