diff options
| author | Steven Barth <steven@midlink.org> | 2008-08-28 19:31:25 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-08-28 19:31:25 +0000 |
| commit | 4ca6f02af21d968e7da2018515f41cee4e4efd3f (patch) | |
| tree | c67065312e102dd731022391ec9cc035d730512f /libs/cbi/luasrc/view | |
| parent | 565bc6d4c2e73827d35f87a6237ad322f19065f2 (diff) | |
CBI-UVL Validation Integration part #1
Diffstat (limited to 'libs/cbi/luasrc/view')
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/cell_valuefooter.htm | 2 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/full_valuefooter.htm | 2 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/tblsection.htm | 13 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/ucisection.htm | 7 |
4 files changed, 24 insertions, 0 deletions
diff --git a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm b/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm index 7d1ac4ee68..6ca530657d 100644 --- a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm +++ b/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm @@ -15,6 +15,8 @@ $Id$ <% if self.tag_error[section] then -%> <div class="cbi-error"><%=self.tag_error[section]%></div> + <%- elseif self.tag_reqerror[section] then -%> + <div class="cbi-error"><%:cbi_reqerror%></div> <%- elseif self.tag_invalid[section] then -%> <div class="cbi-error"><%:cbi_invalid%></div> <%- elseif self.tag_missing[section] then -%> diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm index a01f6bd6c8..8003f53fe5 100644 --- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm +++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm @@ -28,6 +28,8 @@ $Id$ <% if self.tag_error[section] then -%> <div class="cbi-error"><%=self.tag_error[section]%></div> + <%- elseif self.tag_reqerror[section] then -%> + <div class="cbi-error"><%:cbi_reqerror%></div> <%- elseif self.tag_invalid[section] then -%> <div class="cbi-error"><%:cbi_invalid%></div> <%- elseif self.tag_missing[section] then -%> diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm index 6ed078026e..a557c584fd 100644 --- a/libs/cbi/luasrc/view/cbi/tblsection.htm +++ b/libs/cbi/luasrc/view/cbi/tblsection.htm @@ -89,6 +89,19 @@ end </td> <%- end -%> </tr> + <% if self.tag_deperror[section] or self.tag_invalid[section] or self.tag_error[section] then %> + <tr class="cbi-section-table-row"> + <td colspan="<%=count%>"> + <%- if self.tag_deperror[section] then -%> + <div class="cbi-error"><%:cbi_deperror%></div> + <%- elseif self.tag_invalid[section] then -%> + <div class="cbi-error"><%:cbi_invalid_section%></div> + <%- elseif self.tag_error[section] then -%> + <div class="cbi-error"><%=self.tag_error[section]%></div> + <%- end -%> + </td> + </tr> + <% end %> <%- end -%> <%- if isempty then -%> diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm index 1d318f7915..c245940d4b 100644 --- a/libs/cbi/luasrc/view/cbi/ucisection.htm +++ b/libs/cbi/luasrc/view/cbi/ucisection.htm @@ -16,6 +16,13 @@ $Id$ <% self:render_children(section, scope or {}) %> <% if #self.optionals[section] > 0 or self.dynamic then %> + <% if self.tag_deperror[section] then -%> + <div class="cbi-error"><%:cbi_deperror%></div> + <% elseif self.tag_invalid[section] then -%> + <div class="cbi-error"><%:cbi_invalid_section%></div> + <%- elseif self.tag_error[section] then -%> + <div class="cbi-error"><%=self.tag_error[section]%></div> + <%- end %> <div class="cbi-optionals"> <% if self.dynamic then %> <input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" /> |