summaryrefslogtreecommitdiffhomepage
path: root/src/ffluci/view
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-03-24 21:50:48 +0000
committerSteven Barth <steven@midlink.org>2008-03-24 21:50:48 +0000
commit9fa7e0e92ddae9ff68f50ad20bbdfc8a3c09135a (patch)
treef1d316abaaced25c6d8476e65ad6d50f57013768 /src/ffluci/view
parent8e7ed0e8a752bc3f551aabcf2a20807b64e707ed (diff)
* CBI: updates
* UCI: fixed argument escaping
Diffstat (limited to 'src/ffluci/view')
-rw-r--r--src/ffluci/view/cbi/footer.htm4
-rw-r--r--src/ffluci/view/cbi/header.htm1
-rw-r--r--src/ffluci/view/cbi/lvalue.htm6
-rw-r--r--src/ffluci/view/cbi/tsection.htm12
-rw-r--r--src/ffluci/view/cbi/value.htm3
5 files changed, 21 insertions, 5 deletions
diff --git a/src/ffluci/view/cbi/footer.htm b/src/ffluci/view/cbi/footer.htm
index 8fc212b88b..230a17da86 100644
--- a/src/ffluci/view/cbi/footer.htm
+++ b/src/ffluci/view/cbi/footer.htm
@@ -1,3 +1,5 @@
- <input type="submit" /> <input type="reset" />
+ <hr class="cbi-form-separator" />
+ <input type="submit" value="<%:cbi_save Speichern%>" />
+ <input type="reset" value="<%:cbi_reset Zurücksetzen%>" />
</form>
<%+footer%> \ No newline at end of file
diff --git a/src/ffluci/view/cbi/header.htm b/src/ffluci/view/cbi/header.htm
index bd3607f11e..b11ed3b708 100644
--- a/src/ffluci/view/cbi/header.htm
+++ b/src/ffluci/view/cbi/header.htm
@@ -1,2 +1,3 @@
<%+header%>
<form method="post" action="<%=os.getenv("REQUEST_URI")%>">
+ <input type="submit" value="<%:cbi_save Speichern%>" class="hidden" />
diff --git a/src/ffluci/view/cbi/lvalue.htm b/src/ffluci/view/cbi/lvalue.htm
index 6a99419599..739d675c43 100644
--- a/src/ffluci/view/cbi/lvalue.htm
+++ b/src/ffluci/view/cbi/lvalue.htm
@@ -1,11 +1,11 @@
<div class="cbi-lvalue">
<div class="cbi-lvalue-title"><%=self.title%></div>
<div class="cbi-lvalue-field">
- <select name="cbid.<%=self.config.."."..self.section.."."..self.option%>">
+ <select name="cbid.<%=self.config.."."..self.section.."."..self.option%>"<% if self.size then %> size="<%=self.size%>"<% end %>>
<%for k, v in pairs(self.list) do%>
- <option value="<%=k%>"><%=v%></option>
+ <option<% if self:ucivalue() == k then %> selected="selected"<% end %> value="<%=k%>"><%=v%></option>
<% end %>
</select>
</div>
- <div class="cbi-value-description"><%=self.description%></div>
+ <div class="cbi-lvalue-description"><%=self.description%></div>
</div> \ No newline at end of file
diff --git a/src/ffluci/view/cbi/tsection.htm b/src/ffluci/view/cbi/tsection.htm
index bd19ecf59a..987449406e 100644
--- a/src/ffluci/view/cbi/tsection.htm
+++ b/src/ffluci/view/cbi/tsection.htm
@@ -5,7 +5,19 @@
<fieldset class="cbi-tsection-node" id="cbi-<%=self.config%>-<%=k%>">
<% if not self.anonymous then %><legend><%=k%></legend><% end %>
<% self:render_children(k) %>
+ <% if self.addremove then %>
+ <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:cbi_del Eintrag entfernen%>" />
+ <% end %>
</fieldset>
<br />
<% end %>
+<% if self.addremove then %>
+ <div class="cbi-tsection-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-tsection-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ültiger Wert%></div><% end %>
+ </div>
+<% end %>
</div>
diff --git a/src/ffluci/view/cbi/value.htm b/src/ffluci/view/cbi/value.htm
index a898d08c1d..bbb5f5f3b5 100644
--- a/src/ffluci/view/cbi/value.htm
+++ b/src/ffluci/view/cbi/value.htm
@@ -1,7 +1,8 @@
<div class="cbi-value">
<div class="cbi-value-title"><%=self.title%></div>
<div class="cbi-value-field">
- <input type="text" name="cbid.<%=self.config.."."..self.section.."."..self.option%>" value="<%=(self:ucivalue() or "")%>" />
+ <input type="text" <% if self.size then %>size="<%=self.size%>" <% end %><% if self.maxlength then %>maxlength="<%=self.maxlength%>" <% end %>name="cbid.<%=self.config.."."..self.section.."."..self.option%>" value="<%=(self:ucivalue() or "")%>" />
</div>
<div class="cbi-value-description"><%=self.description%></div>
+ <% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültiger Wert%></div><% end %>
</div> \ No newline at end of file