Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: add "Name" label to autogenerated title column

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-06-25 11:12:25 +02:00
parent 211d8bc55e
commit 002c4d1d5f
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/luci-base/luasrc/view/cbi/tblsection.htm
View file

@ -15,6 +15,9 @@ function width(o)
return '' return ''
end end
local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name"))
-%> -%>
<!-- tblsection --> <!-- tblsection -->
@ -28,7 +31,7 @@ end
<div class="cbi-section-descr"><%=self.description%></div> <div class="cbi-section-descr"><%=self.description%></div>
<%- local count = 0 -%> <%- local count = 0 -%>
<div class="table cbi-section-table"> <div class="table cbi-section-table">
<div class="tr cbi-section-table-titles <%=(not self.anonymous or self.sectiontitle) and "named" or "anonymous"%>"> <div class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>>
<%- for i, k in pairs(self.children) do if not k.optional then -%> <%- for i, k in pairs(self.children) do if not k.optional then -%>
<div class="th cbi-section-table-cell"<%= <div class="th cbi-section-table-cell"<%=
width(k) .. width(k) ..
@ -42,7 +45,7 @@ end
<div class="th cbi-section-table-cell cbi-section-actions"></div> <div class="th cbi-section-table-cell cbi-section-actions"></div>
<%- count = count + 1; end -%> <%- count = count + 1; end -%>
</div> </div>
<div class="tr cbi-section-table-descr <%=(not self.anonymous or self.sectiontitle) and "named" or "anonymous"%>"> <div class="tr cbi-section-table-descr <%=anonclass%>">
<%- for i, k in pairs(self.children) do if not k.optional then -%> <%- for i, k in pairs(self.children) do if not k.optional then -%>
<div class="th cbi-section-table-cell"<%= <div class="th cbi-section-table-cell"<%=
width(k) .. width(k) ..
@ -52,18 +55,22 @@ end
<div class="th cbi-section-table-cell cbi-section-actions"></div> <div class="th cbi-section-table-cell cbi-section-actions"></div>
<%- end -%> <%- end -%>
</div> </div>
<%- local isempty = true <%- local isempty, i, k = true, nil, nil
for i, k in ipairs(self:cfgsections()) do for i, k in ipairs(self:cfgsections()) do
section = k
isempty = false isempty = false
title = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
scope = { local section = k
local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname)
local colorclass = (self.extedit or self.rowcolors) and " cbi-rowstyle-%d" % rowstyle() or ""
local scope = {
valueheader = "cbi/cell_valueheader", valueheader = "cbi/cell_valueheader",
valuefooter = "cbi/cell_valuefooter" valuefooter = "cbi/cell_valuefooter"
} }
-%> -%>
<div class="tr cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>"<%=ifattr(title and (not self.anonymous or self.sectiontitle), "data-title", striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k))%>> <div class="tr cbi-section-table-row<%=colorclass%>" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>>
<%- <%-
local node
for k, node in ipairs(self.children) do for k, node in ipairs(self.children) do
if not node.optional then if not node.optional then
node:render(section, scope or {}) node:render(section, scope or {})