* CBI cleanup

diff --git a/src/ffluci/view/cbi/lvalue.htm b/src/ffluci/view/cbi/lvalue.htm
index b7db0def964fc02a5b943a565b6017bfa681c353..eb2eac2fd969baffe1490c372d5e7f5ee91b4a71 100644 (file)
--- a/src/ffluci/view/cbi/lvalue.htm
+++ b/src/ffluci/view/cbi/lvalue.htm
@@ -1,7 +1,7 @@
 <div class="cbi-lvalue">
 <div class="cbi-lvalue-title"><%=self.title%></div>
 <div class="cbi-lvalue-field">
-<select name="<%=self.map.config.."."..self.section.."."..self.option%>">
+<select name="<%=self.config.."."..self.section.."."..self.option%>">
 <%for k, v in self.list do%>
 <option value="<%=k%>"><%=v%></option>
 <% end %>

diff --git a/src/ffluci/view/cbi/nsection.htm b/src/ffluci/view/cbi/nsection.htm
index 4607a872ccd9d9356f668fdcc0876288e385b3c1..5badeca562c1e55c76e2bf95855d5175ef04db30 100644 (file)
--- a/src/ffluci/view/cbi/nsection.htm
+++ b/src/ffluci/view/cbi/nsection.htm
@@ -1,4 +1,4 @@
-<div class="cbi-nsection" id="cbi-<%=self.map.config%>-<%=self.sectiontype%>-<%=self.section%>">
+<div class="cbi-nsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>-<%=self.section%>">
 <h2><%=self.title%></h2>
 <div class="cbi-nsection-descr"><%=self.description%></div>
 <% for k, node in ipairs(self.children) do node:render() end %>

diff --git a/src/ffluci/view/cbi/tsection.htm b/src/ffluci/view/cbi/tsection.htm
index 420bfd14a8f816ba2591143087726ce6f0e28127..8c7f0c1151853f86113b537aeb0d322206ed5b58 100644 (file)
--- a/src/ffluci/view/cbi/tsection.htm
+++ b/src/ffluci/view/cbi/tsection.htm
@@ -7,11 +7,11 @@ for k, v in pairs(allsections) do
        end
 end 
 %>
-<div class="cbi-tsection" id="cbi-<%=self.map.config%>-<%=self.sectiontype%>">
+<div class="cbi-tsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
 <h2><%=self.title%></h2>
 <div class="cbi-tsection-descr"><%=self.description%></div>
 <% for k, v in pairs(sections) do %>
-<div class="cbi-tsection-node" id="cbi-<%=self.map.config%>-<%=k%>">
+<div class="cbi-tsection-node" id="cbi-<%=self.config%>-<%=k%>">
 <% for k, node in ipairs(self.children) do
        node.section = k
        node:render(k)

diff --git a/src/ffluci/view/cbi/value.htm b/src/ffluci/view/cbi/value.htm
index a39010ac8dcdf91068c8bbeaa20320e903136045..cc22c4e56414fac7610972199eaf5972d1e35c7c 100644 (file)
--- a/src/ffluci/view/cbi/value.htm
+++ b/src/ffluci/view/cbi/value.htm
@@ -1,7 +1,7 @@
 <div class="cbi-value">
 <div class="cbi-value-title"><%=self.title%></div>
 <div class="cbi-value-field">
-<input type="text" name="<%=self.map.config.."."..self.section.."."..self.option%>" value="<%=self:ucivalue()%>" />
+<input type="text" name="<%=self.config.."."..self.section.."."..self.option%>" value="<%=self:ucivalue()%>" />
 </div>
 <div class="cbi-value-description"><%=self.description%></div>
 </div>
\ No newline at end of file