diff options
Diffstat (limited to 'modules/luci-base/luasrc/view')
| -rw-r--r-- | modules/luci-base/luasrc/view/admin_uci/changelog.htm | 66 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/admin_uci/changes.htm | 45 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/admin_uci/revert.htm | 33 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/apply_widget.htm | 172 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/cell_valueheader.htm | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/dropdown.htm | 69 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/dynlist.htm | 21 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/full_valueheader.htm | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/fvalue.htm | 18 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/lvalue.htm | 53 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/mvalue.htm | 63 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/tvalue.htm | 2 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/value.htm | 57 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/footer.htm | 13 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 23 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/view.htm | 8 |
16 files changed, 136 insertions, 511 deletions
diff --git a/modules/luci-base/luasrc/view/admin_uci/changelog.htm b/modules/luci-base/luasrc/view/admin_uci/changelog.htm deleted file mode 100644 index 9d6267cf31..0000000000 --- a/modules/luci-base/luasrc/view/admin_uci/changelog.htm +++ /dev/null @@ -1,66 +0,0 @@ -<%# - Copyright 2010 Jo-Philipp Wich <jo@mein.io> - Licensed to the public under the Apache License 2.0. --%> - -<% export("uci_changelog", function(changes) -%> -<div class="cbi-section"> - <strong><%:Legend:%></strong> - <div class="uci-change-legend"> - <div class="uci-change-legend-label"><ins> </ins> <%:Section added%></div> - <div class="uci-change-legend-label"><del> </del> <%:Section removed%></div> - <div class="uci-change-legend-label"><var><ins> </ins></var> <%:Option changed%></div> - <div class="uci-change-legend-label"><var><del> </del></var> <%:Option removed%></div> - <br style="clear:both" /> - </div> - <br /> - - <div class="uci-change-list"><% - local util = luci.util - local tpl = { - ["add-3"] = "<ins>uci add %0 <strong>%3</strong> # =%2</ins>", - ["set-3"] = "<ins>uci set %0.<strong>%2</strong>=%3</ins>", - ["set-4"] = "<var><ins>uci set %0.%2.%3=<strong>%4</strong></ins></var>", - ["remove-2"] = "<del>uci del %0.<strong>%2</strong></del>", - ["remove-3"] = "<var><del>uci del %0.%2.<strong>%3</strong></del></var>", - ["order-3"] = "<var>uci reorder %0.%2=<strong>%3</strong></var>", - ["list-add-4"] = "<var><ins>uci add_list %0.%2.%3=<strong>%4</strong></ins></var>", - ["list-del-4"] = "<var><del>uci del_list %0.%2.%3=<strong>%4</strong></del></var>", - ["rename-3"] = "<var>uci rename %0.%2=<strong>%3</strong></var>", - ["rename-4"] = "<var>uci rename %0.%2.%3=<strong>%4</strong></var>" - } - - local conf, deltas - for conf, deltas in util.kspairs(changes) do - write("<h3># /etc/config/%s</h3>" % conf) - - local _, delta, added - for _, delta in pairs(deltas) do - local t = tpl["%s-%d" %{ delta[1], #delta }] - - write(t:gsub("%%(%d)", function(n) - if n == "0" then - return conf - elseif n == "2" then - if added and delta[2] == added[1] then - return "@%s[-1]" % added[2] - else - return delta[2] - end - elseif n == "4" then - return util.shellquote(delta[4]) - else - return delta[tonumber(n)] - end - end)) - - if delta[1] == "add" then - added = { delta[2], delta[3] } - end - end - - write("<br />") - end - %></div> -</div> -<%- end) %> diff --git a/modules/luci-base/luasrc/view/admin_uci/changes.htm b/modules/luci-base/luasrc/view/admin_uci/changes.htm deleted file mode 100644 index 43bd7c23fb..0000000000 --- a/modules/luci-base/luasrc/view/admin_uci/changes.htm +++ /dev/null @@ -1,45 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io> - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> - -<%- - local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir")) - export("redirect", redir_url or url("admin/uci/changes")) - - include("admin_uci/changelog") --%> - -<h2 name="content"><%:Configuration%> / <%:Changes%></h2> - -<% if changes then %> - <%- uci_changelog(changes) -%> -<% else %> - <p><strong><%:There are no pending changes!%></strong></p> -<% end %> - -<div class="alert-message" id="cbi_apply_status" style="display:none"></div> - -<div class="cbi-page-actions"> - <% if redir_url then %> - <form method="get" action="<%=luci.util.pcdata(redir_url)%>"> - <input class="cbi-button cbi-button-link" type="submit" value="<%:Back%>" /> - </form> - <% end %> - - <form method="post" action="<%=url("admin/uci/changes")%>"> - <input type="hidden" name="token" value="<%=token%>" /> - <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> - <input class="cbi-button cbi-button-save" type="submit" name="trigger_apply" value="<%:Save & Apply%>" /> - </form> - <form method="post" action="<%=url("admin/uci/revert")%>"> - <input type="hidden" name="token" value="<%=token%>" /> - <input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" /> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" /> - </form> -</div> - -<%+footer%> diff --git a/modules/luci-base/luasrc/view/admin_uci/revert.htm b/modules/luci-base/luasrc/view/admin_uci/revert.htm deleted file mode 100644 index d8fd3de01e..0000000000 --- a/modules/luci-base/luasrc/view/admin_uci/revert.htm +++ /dev/null @@ -1,33 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io> - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> - -<%- - local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir")) - export("redirect", redir_url or url("admin/uci/changes")) - - include("admin_uci/changelog") --%> - -<h2 name="content"><%:Configuration%> / <%:Revert%></h2> - -<% if changes then %> - <p><strong><%:The following changes have been reverted%>:</strong></p> - <%- uci_changelog(changes) -%> -<% else %> - <p><strong><%:There are no pending changes to revert!%></strong></p> -<% end %> - -<% if redir_url then %> - <div class="cbi-page-actions"> - <form class="inline" method="get" action="<%=luci.util.pcdata(redir_url)%>"> - <input class="cbi-button cbi-button-link" style="margin:0" type="submit" value="<%:Back%>" /> - </form> - </div> -<% end %> - -<%+footer%> diff --git a/modules/luci-base/luasrc/view/cbi/apply_widget.htm b/modules/luci-base/luasrc/view/cbi/apply_widget.htm deleted file mode 100644 index 0f9667390e..0000000000 --- a/modules/luci-base/luasrc/view/cbi/apply_widget.htm +++ /dev/null @@ -1,172 +0,0 @@ -<% export("cbi_apply_widget", function(redirect_ok, rollback_token) -%> -<script type="text/javascript">//<![CDATA[ - var xhr = new XHR(), - uci_apply_auth = { sid: '<%=luci.dispatcher.context.authsession%>', token: '<%=token%>' }, - uci_apply_rollback = <%=math.max(luci.config and luci.config.apply and luci.config.apply.rollback or 30, 30)%>, - uci_apply_holdoff = <%=math.max(luci.config and luci.config.apply and luci.config.apply.holdoff or 4, 1)%>, - uci_apply_timeout = <%=math.max(luci.config and luci.config.apply and luci.config.apply.timeout or 5, 1)%>, - uci_apply_display = <%=math.max(luci.config and luci.config.apply and luci.config.apply.display or 1.5, 1)%>, - uci_confirm_auth = <% if rollback_token then %>{ token: '<%=rollback_token%>' }<% else %>null<% end %>, - was_xhr_poll_running = false; - - function uci_status_message(type, content) { - if (type) { - var message = showModal('', ''); - - message.classList.add('alert-message'); - DOMTokenList.prototype.add.apply(message.classList, type.split(/\s+/)); - - if (content) - message.innerHTML = content; - - if (!was_xhr_poll_running) { - was_xhr_poll_running = XHR.running(); - XHR.halt(); - } - } - else { - hideModal(); - - if (was_xhr_poll_running) - XHR.run(); - } - } - - function uci_rollback(checked) { - if (checked) { - uci_status_message('warning spinning', - '<p><%:Failed to confirm apply within %ds, waiting for rollback…%></p>'.format(uci_apply_rollback)); - - var call = function(r, data, duration) { - if (r.status === 204) { - uci_status_message('warning', - '<h4><%:Configuration has been rolled back!%></h4>' + - '<p><%:The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, proceed by applying anyway. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.%></p>'.format(uci_apply_rollback) + - '<div class="right">' + - '<input type="button" class="btn" onclick="uci_status_message(false)" value="<%:Dismiss%>" /> ' + - '<input type="button" class="btn cbi-button-action important" onclick="uci_revert()" value="<%:Revert changes%>" /> ' + - '<input type="button" class="btn cbi-button-negative important" onclick="uci_apply(false)" value="<%:Apply anyway%>" />' + - '</div>'); - - return; - } - - var delay = isNaN(duration) ? 0 : Math.max(1000 - duration, 0); - window.setTimeout(function() { - xhr.post('<%=url("admin/uci/confirm")%>', uci_apply_auth, call, uci_apply_timeout * 1000); - }, delay); - }; - - call({ status: 0 }); - } - else { - uci_status_message('warning', - '<h4><%:Device unreachable!%></h4>' + - '<p><%:Could not regain access to the device after applying the configuration changes. You might need to reconnect if you modified network related settings such as the IP address or wireless security credentials.%></p>'); - } - } - - function uci_confirm(checked, deadline) { - var tt; - var ts = Date.now(); - - uci_status_message('notice'); - - var call = function(r, data, duration) { - if (Date.now() >= deadline) { - window.clearTimeout(tt); - uci_rollback(checked); - return; - } - else if (r && (r.status === 200 || r.status === 204)) { - var indicator = document.querySelector('.uci_change_indicator'); - if (indicator) indicator.style.display = 'none'; - - uci_status_message('notice', '<p><%:Configuration has been applied.%></p>'); - - window.clearTimeout(tt); - window.setTimeout(function() { - <% if redirect_ok then -%> - location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); - <%- else -%> - window.location = window.location.href.split('#')[0]; - <% end %> - }, uci_apply_display * 1000); - - return; - } - - var delay = isNaN(duration) ? 0 : Math.max(1000 - duration, 0); - window.setTimeout(function() { - xhr.post('<%=url("admin/uci/confirm")%>', uci_confirm_auth, call, uci_apply_timeout * 1000); - }, delay); - }; - - var tick = function() { - var now = Date.now(); - - uci_status_message('notice spinning', - '<p><%:Waiting for configuration to be applied… %ds%></p>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0))); - - if (now >= deadline) - return; - - tt = window.setTimeout(tick, 1000 - (now - ts)); - ts = now; - }; - - tick(); - - /* wait a few seconds for the settings to become effective */ - window.setTimeout(call, Math.max(uci_apply_holdoff * 1000 - ((ts + uci_apply_rollback * 1000) - deadline), 1)); - } - - function uci_apply(checked) { - uci_status_message('notice spinning', '<p><%:Starting configuration apply…%></p>'); - - xhr.post('<%=url("admin/uci")%>/' + (checked ? 'apply_rollback' : 'apply_unchecked'), uci_apply_auth, function(r, tok) { - if (r.status === (checked ? 200 : 204)) { - if (checked && tok !== null && typeof(tok) === 'object' && typeof(tok.token) === 'string') - uci_confirm_auth = tok; - - uci_confirm(checked, Date.now() + uci_apply_rollback * 1000); - } - else if (checked && r.status === 204) { - uci_status_message('notice', '<p><%:There are no changes to apply.%></p>'); - window.setTimeout(function() { - <% if redirect_ok then -%> - location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); - <%- else -%> - uci_status_message(false); - <%- end %> - }, uci_apply_display * 1000); - } - else { - uci_status_message('warning', '<p><%_Apply request failed with status <code>%h</code>%></p>'.format(r.responseText || r.statusText || r.status)); - window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000); - } - }); - } - - function uci_revert() { - uci_status_message('notice spinning', '<p><%:Reverting configuration…%></p>'); - - xhr.post('<%=url("admin/uci/revert")%>', uci_apply_auth, function(r) { - if (r.status === 200) { - uci_status_message('notice', '<p><%:Changes have been reverted.%></p>'); - window.setTimeout(function() { - <% if redirect_ok then -%> - location.href = decodeURIComponent('<%=luci.util.urlencode(redirect_ok)%>'); - <%- else -%> - window.location = window.location.href.split('#')[0]; - <%- end %> - }, uci_apply_display * 1000); - } - else { - uci_status_message('warning', '<p><%_Revert request failed with status <code>%h</code>%></p>'.format(r.statusText || r.status)); - window.setTimeout(function() { uci_status_message(false); }, uci_apply_display * 1000); - } - }); - } -//]]></script> -<%- end) %> diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm index cb11d8f61a..4b70957543 100644 --- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm +++ b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm @@ -3,7 +3,7 @@ local descr = luci.util.trim(striptags(self.description)) local ftype = self.typename or (self.template and self.template:gsub("^.+/", "")) -%> -<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>"<%= +<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.password then %> nowrap<% end %>"<%= attr("data-name", self.option) .. ifattr(ftype and #ftype > 0, "data-type", ftype) .. ifattr(title and #title > 0, "data-title", title, true) .. diff --git a/modules/luci-base/luasrc/view/cbi/dropdown.htm b/modules/luci-base/luasrc/view/cbi/dropdown.htm index 6f4b89905b..927ecf2396 100644 --- a/modules/luci-base/luasrc/view/cbi/dropdown.htm +++ b/modules/luci-base/luasrc/view/cbi/dropdown.htm @@ -1,54 +1,19 @@ <%+cbi/valueheader%> - -<%- - local selected = { } - - if self.multiple then - local val - for val in luci.util.imatch(self:cfgvalue(section)) do - selected[val] = true - end - else - selected[self:cfgvalue(section)] = true - end - - if not next(selected) and self.default then - selected[self.default] = true - end --%> - -<div class="cbi-dropdown"<%= - attr("name", cbid) .. - attr("display-items", self.display or self.size or 3) .. - attr("dropdown-items", self.dropdown or self.display or self.size or 5) .. - attr("placeholder", self.placeholder or translate("-- please select --")) .. - ifattr(self.multiple, "multiple", "multiple") .. - ifattr(self.optional or self.rmempty, "optional", "optional") -%>> - <ul> - <% local i, key; for i, key in pairs(self.keylist) do %> - <li<%= - attr("data-index", i) .. - attr("data-depends", self:deplist2json(section, self.deplist[i])) .. - attr("data-value", key) .. - ifattr(selected[key], "selected", "selected") - %>> - <%=pcdata(self.vallist[i])%> - </li> - <% end %> - <% if self.custom then %> - <li> - <input type="password" style="display:none" /> - <input class="create-item-input" type="text"<%= - attr("placeholder", self.custom ~= true and - self.custom or - (self.multiple and - translate("Enter custom values") or - translate("Enter custom value"))) - %> /> - </li> - <% end %> - </ul> -</div> - +<div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Dropdown", self:cfgvalue(section) or self.default, self:choices(), { + id = cbid, + name = cbid, + sort = self.keylist, + multiple = self.multiple, + datatype = self.datatype, + optional = self.optional or self.rmempty, + readonly = self.readonly, + maxlength = self.maxlength, + placeholder = self.placeholder, + display_items = self.display or self.size or 3, + dropdown_items = self.dropdown or self.display or self.size or 5, + custom_placeholder = self.custom or + (self.multiple and translate("Enter custom values") or translate("Enter custom value")) + } +}))%>></div> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/dynlist.htm b/modules/luci-base/luasrc/view/cbi/dynlist.htm index fa7dbdb418..2a3da67ff9 100644 --- a/modules/luci-base/luasrc/view/cbi/dynlist.htm +++ b/modules/luci-base/luasrc/view/cbi/dynlist.htm @@ -1,13 +1,12 @@ <%+cbi/valueheader%> -<div<%= - attr("data-prefix", cbid) .. - attr("data-browser-path", self.default_path) .. - attr("data-dynlist", luci.util.serialize_json({ - self.keylist, self.vallist, - self.datatype, self.optional or self.rmempty - })) .. - attr("data-values", luci.util.serialize_json(self:cfgvalue(section))) .. - ifattr(self.size, "data-size", self.size) .. - ifattr(self.placeholder, "data-placeholder", self.placeholder) -%>></div> +<div<%=attr("data-ui-widget", luci.util.serialize_json({ + "DynamicList", self:cfgvalue(section) or self.default, self:choices(), { + name = cbid, + size = self.size, + sort = self.keylist, + datatype = self.datatype, + optional = self.optional or self.rmempty, + placeholder = self.placeholder + } +}))%>></div> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm b/modules/luci-base/luasrc/view/cbi/full_valueheader.htm index 10a554329f..1d9ebeba94 100644 --- a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm +++ b/modules/luci-base/luasrc/view/cbi/full_valueheader.htm @@ -1,4 +1,4 @@ -<div class="cbi-value<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.last_child then %> cbi-value-last<% end %>" id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>"> +<div class="cbi-value<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.last_child then %> cbi-value-last<% end %><% if self.password then %> nowrap<% end %>" id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>"> <%- if self.title and #self.title > 0 then -%> <label class="cbi-value-title"<%= attr("for", cbid) %>> <%- if self.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=self.titleref%>"><%- end -%> diff --git a/modules/luci-base/luasrc/view/cbi/fvalue.htm b/modules/luci-base/luasrc/view/cbi/fvalue.htm index 197d03cf31..7f975b95e1 100644 --- a/modules/luci-base/luasrc/view/cbi/fvalue.htm +++ b/modules/luci-base/luasrc/view/cbi/fvalue.htm @@ -1,10 +1,12 @@ <%+cbi/valueheader%> - <input type="hidden" value="1"<%= - attr("name", "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option) - %> /> - <input class="cbi-input-checkbox" data-update="click change" type="checkbox"<%= - attr("id", cbid) .. attr("name", cbid) .. attr("value", self.enabled or 1) .. - ifattr((self:cfgvalue(section) or self.default) == self.enabled, "checked", "checked") - %> /> - <label<%= attr("for", cbid)%>></label> +<div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Checkbox", self:cfgvalue(section) or self.default, { + id = cbid, + name = cbid, + readonly = self.readonly, + hiddenname = "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option, + value_enabled = self.enabled or 1, + value_disabled = self.disabled or 0 + } +}))%>></div> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/lvalue.htm b/modules/luci-base/luasrc/view/cbi/lvalue.htm index 34d02eeca0..28141472f4 100644 --- a/modules/luci-base/luasrc/view/cbi/lvalue.htm +++ b/modules/luci-base/luasrc/view/cbi/lvalue.htm @@ -1,43 +1,14 @@ -<% - local i, key - local br = self.orientation == "horizontal" and ' ' or '<br />' -%> - <%+cbi/valueheader%> -<% if self.widget == "select" then %> - <select class="cbi-input-select" data-update="change"<%= - attr("id", cbid) .. - attr("name", cbid) .. - ifattr(self.size, "size") - %>> - <% for i, key in pairs(self.keylist) do -%> - <option<%= - attr("id", cbid.."-"..key) .. - attr("value", key) .. - attr("data-index", i) .. - attr("data-depends", self:deplist2json(section, self.deplist[i])) .. - ifattr(tostring(self:cfgvalue(section) or self.default) == key, "selected", "selected") - %>><%=pcdata(self.vallist[i])%></option> - <%- end %> - </select> -<% elseif self.widget == "radio" then %> - <div> - <% for i, key in pairs(self.keylist) do %> - <label<%= - attr("data-index", i) .. - attr("data-depends", self:deplist2json(section, self.deplist[i])) - %>> - <input class="cbi-input-radio" data-update="click change" type="radio"<%= - attr("id", cbid.."-"..key) .. - attr("name", cbid) .. - attr("value", key) .. - ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked") - %> /> - <label<%= attr("for", cbid.."-"..key)%>></label> - <%=pcdata(self.vallist[i])%> - </label> - <% if i == self.size then write(br) end %> - <% end %> - </div> -<% end %> +<div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Select", self:cfgvalue(section) or self.default, self:choices(), { + id = cbid, + name = cbid, + size = self.size, + sort = self.keylist, + widget = self.widget, + datatype = self.datatype, + optional = self.optional, + placeholder = self.placeholder + } +}))%>></div> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm index db17450d27..1f4f4dbcc6 100644 --- a/modules/luci-base/luasrc/view/cbi/mvalue.htm +++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm @@ -1,43 +1,24 @@ -<% - local i, key - local v = self:valuelist(section) or {} --%> - <%+cbi/valueheader%> -<% if self.widget == "select" then %> - <select class="cbi-input-select" multiple="multiple" data-update="click change"<%= - attr("id", cbid) .. - attr("name", cbid) .. - ifattr(self.size, "size") - %>> - <% for i, key in pairs(self.keylist) do -%> - <option<%= - attr("id", cbid.."-"..key) .. - attr("value", key) .. - attr("data-index", i) .. - attr("data-depends", self:deplist2json(section, self.deplist[i])) .. - ifattr(luci.util.contains(v, key), "selected", "selected") - %>><%=pcdata(self.vallist[i])%></option> - <%- end %> - </select> -<% elseif self.widget == "checkbox" then %> - <div> - <% for i, key in pairs(self.keylist) do %> - <label<%= - attr("data-index", i) .. - attr("data-depends", self:deplist2json(section, self.deplist[i])) - %>> - <input class="cbi-input-checkbox" type="checkbox" data-update="click change"<%= - attr("id", cbid.."-"..key) .. - attr("name", cbid) .. - attr("value", key) .. - ifattr(luci.util.contains(v, key), "checked", "checked") - %> /> - <label<%= attr("for", cbid.."-"..key)%>></label> - <%=pcdata(self.vallist[i])%> - </label> - <% if self.size and (i % self.size) == 0 then write('<br />') end %> - <% end %> - </div> -<% end %> +<% + local util = require "luci.util" + local values = {} + local value + for value in util.imatch(self:cfgvalue(section) or self.default) do + values[#values+1] = value + end +%> +<div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Select", values, self:choices(), { + id = cbid, + name = cbid, + size = self.size, + sort = self.keylist, + multiple = true, + widget = self.widget, + datatype = self.datatype, + optional = self.optional or self.rmempty, + readonly = self.readonly, + placeholder = self.placeholder + } +}))%>></div> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/tvalue.htm b/modules/luci-base/luasrc/view/cbi/tvalue.htm index d1e9e66728..f3b12bd094 100644 --- a/modules/luci-base/luasrc/view/cbi/tvalue.htm +++ b/modules/luci-base/luasrc/view/cbi/tvalue.htm @@ -1,5 +1,5 @@ <%+cbi/valueheader%> <textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap") .. ifattr(self.readonly, "readonly") %>> - <%-=pcdata(self:cfgvalue(section))-%> + <%-=pcdata(self:cfgvalue(section) or self.default)-%> </textarea> <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm index 27f3cb2bd9..6060310b19 100644 --- a/modules/luci-base/luasrc/view/cbi/value.htm +++ b/modules/luci-base/luasrc/view/cbi/value.htm @@ -1,26 +1,35 @@ <%+cbi/valueheader%> - <%- if self.password then -%> - <input type="password" style="position:absolute; left:-1000px" aria-hidden="true" tabindex="-1"<%= - attr("name", "password." .. cbid) - %> /> - <%- end -%> - <input data-update="change"<%= - attr("id", cbid) .. - attr("name", cbid) .. - attr("type", self.password and "password" or "text") .. - attr("class", self.password and "cbi-input-password" or "cbi-input-text") .. - attr("value", self:cfgvalue(section) or self.default) .. - ifattr(self.password, "autocomplete", "new-password") .. - ifattr(self.size, "size") .. - ifattr(self.placeholder, "placeholder") .. - ifattr(self.readonly, "readonly") .. - ifattr(self.maxlength, "maxlength") .. - ifattr(self.datatype, "data-type", self.datatype) .. - ifattr(self.datatype, "data-optional", self.optional or self.rmempty) .. - ifattr(self.combobox_manual, "data-manual", self.combobox_manual) .. - ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist }) - %> /> - <%- if self.password then -%> - <button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'; event.preventDefault()">∗</button> - <% end %> + +<% local choices = self:choices() + if choices then %> + <div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Combobox", self:cfgvalue(section) or self.default, choices, { + id = cbid, + name = cbid, + size = self.size, + sort = self.keylist, + datatype = self.datatype, + optional = self.optional or self.rmempty, + readonly = self.readonly, + maxlength = self.maxlength, + placeholder = self.placeholder, + custom_placeholder = self.combobox_manual + } + }))%>></div> +<% else %> + <div<%=attr("data-ui-widget", luci.util.serialize_json({ + "Textfield", self:cfgvalue(section) or self.default, { + id = cbid, + name = cbid, + size = self.size, + datatype = self.datatype, + optional = self.optional or self.rmempty, + password = self.password, + readonly = self.readonly, + maxlength = self.maxlength, + placeholder = self.placeholder + } + }))%>></div> +<% end %> + <%+cbi/valuefooter%> diff --git a/modules/luci-base/luasrc/view/footer.htm b/modules/luci-base/luasrc/view/footer.htm index 1667d3aa9a..ba14ec8678 100644 --- a/modules/luci-base/luasrc/view/footer.htm +++ b/modules/luci-base/luasrc/view/footer.htm @@ -1,6 +1,6 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2019 Jo-Philipp Wich <jo@mein.io> Licensed to the public under the Apache License 2.0. -%> @@ -8,18 +8,15 @@ local is_rollback_pending, rollback_time_remaining, rollback_session, rollback_token = luci.model.uci:rollback_pending() if is_rollback_pending or trigger_apply or trigger_revert then - include("cbi/apply_widget") - cbi_apply_widget(redirect, rollback_token) %> - <div class="alert-message" id="cbi_apply_status" style="display:none"></div> <script type="text/javascript"> - document.addEventListener("DOMContentLoaded", function() { + document.addEventListener("luci-loaded", function() { <% if trigger_apply then -%> - uci_apply(true); + L.ui.changes.apply(true); <%- elseif trigger_revert then -%> - uci_revert(); + L.ui.changes.revert(); <%- else -%> - uci_confirm(true, Date.now() + <%=rollback_time_remaining%> * 1000); + L.ui.changes.confirm(true, Date.now() + <%=rollback_time_remaining%> * 1000, <%=luci.http.write_json(rollback_token)%>); <%- end %> }); </script> diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index d68e39f917..1ef0e5b013 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -1,6 +1,6 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> + Copyright 2008-2019 Jo-Philipp Wich <jo@mein.io> Licensed to the public under the Apache License 2.0. -%> @@ -9,16 +9,25 @@ include("themes/" .. theme .. "/header") luci.dispatcher.context.template_header_sent = true end + + local applyconf = luci.config and luci.config.apply %> +<script type="text/javascript" src="<%=resource%>/promis.min.js"></script> <script type="text/javascript" src="<%=resource%>/luci.js"></script> <script type="text/javascript"> L = new LuCI(<%= luci.http.write_json({ - token = token, - resource = resource, - scriptname = luci.http.getenv("SCRIPT_NAME"), - pathinfo = luci.http.getenv("PATH_INFO"), - requestpath = luci.dispatcher.context.requestpath, - pollinterval = luci.config.main.pollinterval or 5 + token = token, + resource = resource, + scriptname = luci.http.getenv("SCRIPT_NAME"), + pathinfo = luci.http.getenv("PATH_INFO"), + requestpath = luci.dispatcher.context.requestpath, + pollinterval = luci.config.main.pollinterval or 5, + sessionid = luci.dispatcher.context.authsession, + apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30), + apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1), + apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1), + apply_display = math.max(applyconf and applyconf.display or 1.5, 1), + rollback_token = rollback_token }) %>); </script> diff --git a/modules/luci-base/luasrc/view/view.htm b/modules/luci-base/luasrc/view/view.htm new file mode 100644 index 0000000000..bddd8e4464 --- /dev/null +++ b/modules/luci-base/luasrc/view/view.htm @@ -0,0 +1,8 @@ +<%+header%> + +<div id="view"> + <div class="spinning"><%:Loading view…%></div> + <script type="text/javascript">L.require('view.<%=view%>');</script> +</div> + +<%+footer%> |