diff options
author | Steven Barth <steven@midlink.org> | 2008-03-28 11:00:58 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2008-03-28 11:00:58 +0000 |
commit | fb2a9a328d619ecf329e64cb500ff1385e3f8290 (patch) | |
tree | 1a87e35efbfe276d7dbf850fa53fe85578bdbbfe /src/ffluci/view/cbi | |
parent | 7e9c97808d27443d6d02a163d9ef0a8bc295f396 (diff) |
* CBI: Generalized templates
* admin > network > ifaces: Set default value for protocol allowing new sections to be created.
Diffstat (limited to 'src/ffluci/view/cbi')
-rw-r--r-- | src/ffluci/view/cbi/fvalue.htm | 12 | ||||
-rw-r--r-- | src/ffluci/view/cbi/lvalue.htm | 12 | ||||
-rw-r--r-- | src/ffluci/view/cbi/mvalue.htm | 12 | ||||
-rw-r--r-- | src/ffluci/view/cbi/nsection.htm | 30 | ||||
-rw-r--r-- | src/ffluci/view/cbi/tsection.htm | 39 | ||||
-rw-r--r-- | src/ffluci/view/cbi/ucisection.htm | 23 | ||||
-rw-r--r-- | src/ffluci/view/cbi/value.htm | 13 | ||||
-rw-r--r-- | src/ffluci/view/cbi/valuefooter.htm | 8 | ||||
-rw-r--r-- | src/ffluci/view/cbi/valueheader.htm | 3 |
9 files changed, 56 insertions, 96 deletions
diff --git a/src/ffluci/view/cbi/fvalue.htm b/src/ffluci/view/cbi/fvalue.htm index cce116af33..b609f1d4f4 100644 --- a/src/ffluci/view/cbi/fvalue.htm +++ b/src/ffluci/view/cbi/fvalue.htm @@ -1,11 +1,3 @@ - <div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> - <div class="cbi-value-title left"><%=self.title%></div> - <div class="cbi-value-field"> +<%+cbi/valueheader%> <input onchange="cbi_d_update(this.id)" type="checkbox" id="cbid.<%=self.config.."."..section.."."..self.option%>" name="cbid.<%=self.config.."."..section.."."..self.option%>"<% if self:cfgvalue(section) == self.enabled then %> checked="checked"<% end %> value="1" /> - <div class="cbi-value-description inline"><%=self.description%></div> - </div> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %>
\ No newline at end of file +<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/src/ffluci/view/cbi/lvalue.htm b/src/ffluci/view/cbi/lvalue.htm index 943a18886a..f1ae5a0939 100644 --- a/src/ffluci/view/cbi/lvalue.htm +++ b/src/ffluci/view/cbi/lvalue.htm @@ -1,6 +1,4 @@ - <div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> - <div class="cbi-value-title left"><%=self.title%></div> - <div class="cbi-value-field"> +<%+cbi/valueheader%> <% if self.widget == "select" then %> <select onchange="cbi_d_update(this.id)" id="cbid.<%=self.config.."."..section.."."..self.option%>" name="cbid.<%=self.config.."."..section.."."..self.option%>"<% if self.size then %> size="<%=self.size%>"<% end %>> <%for i, key in pairs(self.keylist) do%> @@ -15,10 +13,4 @@ <% if c == self.size then c = 0 %><br /> <% end end %> <% end %> - <div class="cbi-value-description inline"><%=self.description%></div> - </div> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %>
\ No newline at end of file +<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/src/ffluci/view/cbi/mvalue.htm b/src/ffluci/view/cbi/mvalue.htm index 7becb4f48b..97a1c4295a 100644 --- a/src/ffluci/view/cbi/mvalue.htm +++ b/src/ffluci/view/cbi/mvalue.htm @@ -1,9 +1,7 @@ <% local v = self:valuelist(section) %> - <div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> - <div class="cbi-value-title left"><%=self.title%></div> - <div class="cbi-value-field"> +<%+cbi/valueheader%> <% if self.widget == "select" then %> <select multiple="multiple" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if self.size then %> size="<%=self.size%>"<% end %>> <%for i, key in pairs(self.keylist) do %> @@ -18,10 +16,4 @@ local v = self:valuelist(section) <% if c == self.size then c = 0 %><br /> <% end end %> <% end %> - <div class="cbi-value-description inline"><%=self.description%></div> - </div> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %>
\ No newline at end of file +<%+cbi/valuefooter%>
\ No newline at end of file diff --git a/src/ffluci/view/cbi/nsection.htm b/src/ffluci/view/cbi/nsection.htm index 90dbb30414..9c54a99429 100644 --- a/src/ffluci/view/cbi/nsection.htm +++ b/src/ffluci/view/cbi/nsection.htm @@ -1,32 +1,12 @@ -<% if self:cfgvalue(self.section) then %> - <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>"> +<% if self:cfgvalue(self.section) then +section = self.section %> + <div class="cbi-section" id="cbi-<%=self.config%>-<%=section%>"> <h2><%=self.title%></h2> <div class="cbi-section-descr"><%=self.description%></div> <% if self.addremove then %><div class="cbi-section-remove"> - <input type="submit" name="cbi.rns.<%=self.config%>.<%=self.section%>" value="<%:cbi_del Eintrag entfernen%>" /> + <input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del Eintrag entfernen%>" /> </div><% end %> - <fieldset class="cbi-section-node"> -<% self:render_children(self.section) %> - <% if #self.optionals[self.section] > 0 or self.dynamic then %> - <div class="cbi-optionals"> - <input type="submit" value="<%:cbi_addopt Feld hinzufügen%>" /> - <% if self.dynamic then %> - <input type="text" name="cbi.opt.<%=self.config%>.<%=self.section%>" /> - <% else %> - <select name="cbi.opt.<%=self.config%>.<%=self.section%>"> - <option><%:cbi_selopt *** Zusätzliche Parameter ***%></option> - <% for key, val in pairs(self.optionals[self.section]) do %> - <option id="cbi-<%=self.config.."-"..self.section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option> - <% end %> - </select> - <script type="text/javascript"><% for key, val in pairs(self.optionals[self.section]) do %> - <% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..self.section.."-"..val.option%>", "cbid.<%=self.config.."."..self.section.."."..d.field%>", "<%=d.value%>"); - <% end %><% end %> - <% end %></script> - <% end %> - </div> - <% end %> - </fieldset> +<%+cbi/ucisection%> </div> <% elseif self.addremove then %> <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>"> diff --git a/src/ffluci/view/cbi/tsection.htm b/src/ffluci/view/cbi/tsection.htm index ffeb91575b..012ae063a8 100644 --- a/src/ffluci/view/cbi/tsection.htm +++ b/src/ffluci/view/cbi/tsection.htm @@ -6,37 +6,16 @@ <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:cbi_del Eintrag entfernen%>" /> </div><% end %> <% if not self.anonymous then %><h3><%=k%></h3><% end %> - <fieldset class="cbi-section-node" id="cbi-<%=self.config%>-<%=k%>"> -<% self:render_children(k) %> - <% if #self.optionals[k] > 0 or self.dynamic then %> - <div class="cbi-optionals"> - <% if self.dynamic then %> - <input type="text" name="cbi.opt.<%=self.config%>.<%=k%>" /> - <% else %> - <select name="cbi.opt.<%=self.config%>.<%=k%>"> - <option><%:cbi_addopt -- Feld --%></option> - <% for key, val in pairs(self.optionals[k]) do %> - <option id="cbi-<%=self.config.."-"..k.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option> - <% end %> - </select> - <script type="text/javascript"><% for key, val in pairs(self.optionals[k]) do %> - <% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..k.."-"..val.option%>", "cbid.<%=self.config.."."..k.."."..d.field%>", "<%=d.value%>"); - <% end %><% end %> - <% end %></script> - <% end %> - <input type="submit" value="<%:add hinzufügen%>" /> - </div> - <% end %> - </fieldset> - <br /> +<% section = k %> +<%+cbi/ucisection%> <% end %> <% if self.addremove then %> - <div class="cbi-section-create"> - <% if self.anonymous then %> - <input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% else %><input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" /> - <input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" /> - <% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> + <div class="cbi-section-create"> + <% if self.anonymous then %> + <input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" /> + <% else %><input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" /> + <input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" /> + <% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> + </div> <% end %> </div> diff --git a/src/ffluci/view/cbi/ucisection.htm b/src/ffluci/view/cbi/ucisection.htm new file mode 100644 index 0000000000..ef1b6cb0e1 --- /dev/null +++ b/src/ffluci/view/cbi/ucisection.htm @@ -0,0 +1,23 @@ + <fieldset class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>"> +<% self:render_children(section) %> + <% if #self.optionals[section] > 0 or self.dynamic then %> + <div class="cbi-optionals"> + <% if self.dynamic then %> + <input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" /> + <% else %> + <select name="cbi.opt.<%=self.config%>.<%=section%>"> + <option><%:cbi_addopt -- Feld --%></option> + <% for key, val in pairs(self.optionals[section]) do %> + <option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option> + <% end %> + </select> + <script type="text/javascript"><% for key, val in pairs(self.optionals[section]) do %> + <% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..val.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); + <% end %><% end %> + <% end %></script> + <% end %> + <input type="submit" value="<%:add hinzufügen%>" /> + </div> + <% end %> + </fieldset> + <br />
\ No newline at end of file diff --git a/src/ffluci/view/cbi/value.htm b/src/ffluci/view/cbi/value.htm index d027bb4489..b994790d27 100644 --- a/src/ffluci/view/cbi/value.htm +++ b/src/ffluci/view/cbi/value.htm @@ -1,12 +1,3 @@ - <div class="cbi-value clear" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> - <div class="cbi-value-title left"><%=self.title%></div> - <div class="cbi-value-field"> +<%+cbi/valueheader%> <input type="text" onchange="cbi_d_update(this.id)" <% if self.size then %>size="<%=self.size%>" <% end %><% if self.maxlength then %>maxlength="<%=self.maxlength%>" <% end %>name="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=(self:cfgvalue(section) or "")%>" /> - <div class="cbi-value-description inline"><%=self.description%></div> - </div> - <% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> - </div> - <% if #self.deps > 0 then %><script type="text/javascript"> - <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); - <% end %> - </script><% end %> +<%+cbi/valuefooter%> diff --git a/src/ffluci/view/cbi/valuefooter.htm b/src/ffluci/view/cbi/valuefooter.htm new file mode 100644 index 0000000000..3f92f09e26 --- /dev/null +++ b/src/ffluci/view/cbi/valuefooter.htm @@ -0,0 +1,8 @@ + <div class="cbi-value-description inline"><%=self.description%></div> + </div> + <% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %> + </div> + <% if #self.deps > 0 then %><script type="text/javascript"> + <% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>"); + <% end %> + </script><% end %>
\ No newline at end of file diff --git a/src/ffluci/view/cbi/valueheader.htm b/src/ffluci/view/cbi/valueheader.htm new file mode 100644 index 0000000000..86c782d711 --- /dev/null +++ b/src/ffluci/view/cbi/valueheader.htm @@ -0,0 +1,3 @@ + <div class="cbi-value clear" id="cbi-<%=self.config.."-"..section.."-"..self.option%>"> + <div class="cbi-value-title left"><%=self.title%></div> + <div class="cbi-value-field">
\ No newline at end of file |