diff options
| author | Steven Barth <steven@midlink.org> | 2008-04-16 09:32:43 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-04-16 09:32:43 +0000 |
| commit | 69bc3fad1f0a49427a06cec47fe6a2b8b07969b8 (patch) | |
| tree | 02e3130eb46aa7bc171638455b7bb62132e7ccd5 /core/src/ffluci | |
| parent | 5ae7b3ee9a6928238f4cd424701b9e969dd68ee8 (diff) | |
* Reintroduced public pages
* Automatically replace nil template values with ''
Diffstat (limited to 'core/src/ffluci')
| -rw-r--r-- | core/src/ffluci/template.lua | 2 | ||||
| -rw-r--r-- | core/src/ffluci/view/cbi/dvalue.htm | 2 | ||||
| -rw-r--r-- | core/src/ffluci/view/cbi/value.htm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ffluci/template.lua b/core/src/ffluci/template.lua index 502013684b..797e9d127a 100644 --- a/core/src/ffluci/template.lua +++ b/core/src/ffluci/template.lua @@ -95,7 +95,7 @@ function compile(template) local r_include = "')\ninclude('%s')\nwrite('" local r_i18n = "'..translate('%1','%2')..'" local r_uci = "'..config('%1','%2','%3')..'" - local r_pexec = "'..%s..'" + local r_pexec = "'..(%s or '')..'" local r_exec = "')\n%s\nwrite('" -- Parse the expressions diff --git a/core/src/ffluci/view/cbi/dvalue.htm b/core/src/ffluci/view/cbi/dvalue.htm index 178f2e16a1..f54667def6 100644 --- a/core/src/ffluci/view/cbi/dvalue.htm +++ b/core/src/ffluci/view/cbi/dvalue.htm @@ -6,7 +6,7 @@ <%=self.value%> <% end else %> - <%=(self:cfgvalue(section) or "")%> + <%=self:cfgvalue(section)%> <% end %> <%+cbi/valuefooter%> diff --git a/core/src/ffluci/view/cbi/value.htm b/core/src/ffluci/view/cbi/value.htm index 61033a0f50..31bf38f77c 100644 --- a/core/src/ffluci/view/cbi/value.htm +++ b/core/src/ffluci/view/cbi/value.htm @@ -1,3 +1,3 @@ <%+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%>" id="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=(self:cfgvalue(section) or "")%>" /> + <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%>" id="cbid.<%=self.config.."."..section.."."..self.option%>" value="<%=self:cfgvalue(section)%>" /> <%+cbi/valuefooter%> |