Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-base / luasrc / view / cbi / upload.htm

diff --git a/modules/luci-base/luasrc/view/cbi/upload.htm b/modules/luci-base/luasrc/view/cbi/upload.htm
index 157f3b36fa26e94b26140f17841f6ca8165454e0..e610495380a87340a14cf4d69f944067636f5215 100644 (file)
--- a/modules/luci-base/luasrc/view/cbi/upload.htm
+++ b/modules/luci-base/luasrc/view/cbi/upload.htm
@@ -1,24 +1,14 @@
-<%
-       local t = require("luci.tools.webadmin")
-       local v = self:cfgvalue(section)
-       local s = v and nixio.fs.stat(v)
--%>
 <%+cbi/valueheader%>
-       <% if s then %>
-               <%:Uploaded File%> (<%=t.byte_format(s.size)%>)
-                <% if self.unsafeupload then %>
-                   <input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
-                   <input class="cbi-button cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
-                <% end %>
-       <% end %>
 
-        <% if not self.unsafeupload then %>
-               <input type="hidden"<%= attr("value", v) .. attr("name", "cbi.rlf." .. section .. "." .. self.option) .. attr("id", "cbi.rlf." .. section .. "." .. self.option) %> />
-       <% end %>
-               
-       <% if (not s) or (s and not self.unsafeupload) then %>
-               <input class="cbi-input-file" type="file"<%= attr("name", cbid) .. attr("id", cbid) %> />
-       <% end %>
-       <input type="text" class="cbi-input-text" onchange="cbi_d_update(this.id)"<%=
-               attr("name", cbid .. ".textbox") .. attr("id", cbid .. ".textbox") .. attr("value", luci.cbi.AbstractValue.cfgvalue(self, section) or self.default) .. ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder") .. ifattr(self.readonly, "readonly") .. ifattr(self.maxlength, "maxlength") %> />
+<div<%=attr("data-ui-widget", luci.util.serialize_json({
+       "FileUpload", self:cfgvalue(section) or self.default, {
+               id = cbid,
+               name = cbid,
+               show_hidden = self.show_hidden,
+               enable_remove = self.enable_remove,
+               enable_upload = self.enable_upload,
+               root_directory = "/" --self.root_directory
+       }
+}))%>></div>
+
 <%+cbi/valuefooter%>