Major reformat of docker.htm for readability

pull/1/head
riley 1 year ago
parent edb8e9a645
commit 360b0eb483

@ -1,42 +1,54 @@
<%
local taskd = require "luci.model.tasks"
local status = taskd.status(self.task_id)
-- Check if a task is running
local task_running = status.running
<% if self.task_start_failed then %> -- Check for a task start failure
<div class="alert-message warning"><%:Another task running, try again later.%> <a href="javascript:void(taskd.show_log('<%=self.task_id%>'))"><%:Click here to check running task%></a></div> if self.task_start_failed then
%>
<div class="alert-message warning">
<%:Another task running, try again later.%>
<a href="javascript:void(taskd.show_log('<%=self.task_id%>'))">
<%:Click here to check running task%>
</a>
</div>
<% end %> <% end %>
<%+cbi/map%> <%+cbi/map%>
<%
local task_running = false
local taskd = require "luci.model.tasks"
local status = taskd.status(self.task_id)
task_running = status.running
-%>
<div class="cbi-page-actions control-group"> <div class="cbi-page-actions control-group">
<% <%
if not task_running then if not task_running then
%>
<%
local util = require "luci.util" local util = require "luci.util"
local container_status = util.trim(util.exec(self.script_path.." status")) local container_status = util.trim(util.exec(self.script_path.." status"))
local container_status_lower = string.lower(util.trim(util.exec(self.script_path.." status"))) local container_status_lower = string.lower(container_status)
local container_install = not string.match(container_status_lower, " is not installed$") local container_install = not string.match(container_status_lower, " is not installed$")
local container_running = string.match(string.lower(container_status), "^up .* (seconds|minutes|hours)") local container_running = string.match(string.lower(container_status), "^up .* (seconds|minutes|hours)")
if container_install then if container_install then
-%> %>
<input class="btn cbi-button cbi-button-apply" type="button" value="<%:Upgrade%>/<%:Apply%>" onclick="cbi_submit(this, 'cbi.apply', 'upgrade')" /> <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Upgrade%>/<%:Apply%>" onclick="cbi_submit(this, 'cbi.apply', 'upgrade')" />
<% <%
if container_running then if container_running then
-%> %>
<input class="btn cbi-button cbi-button-remove" type="button" value="<%:Stop%>" onclick="cbi_submit(this, 'cbi.apply', 'stop')" /> <input class="btn cbi-button cbi-button-remove" type="button" value="<%:Stop%>" onclick="cbi_submit(this, 'cbi.apply', 'stop')" />
<input class="btn cbi-button cbi-button-reload" type="button" value="<%:Restart%>" onclick="cbi_submit(this, 'cbi.apply', 'restart')" /> <input class="btn cbi-button cbi-button-reload" type="button" value="<%:Restart%>" onclick="cbi_submit(this, 'cbi.apply', 'restart')" />
<% else %> <%
else
%>
<input class="btn cbi-button cbi-button-apply" type="button" value="<%:Start%>" onclick="cbi_submit(this, 'cbi.apply', 'start')" /> <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Start%>" onclick="cbi_submit(this, 'cbi.apply', 'start')" />
<input class="btn cbi-button cbi-button-remove" type="button" value="<%:Remove%>" onclick="cbi_submit(this, 'cbi.apply', 'rm')" /> <input class="btn cbi-button cbi-button-remove" type="button" value="<%:Remove%>" onclick="cbi_submit(this, 'cbi.apply', 'rm')" />
<% end <%
else %> end
else
%>
<input class="btn cbi-button cbi-button-apply" type="button" value="<%:Install%>" onclick="cbi_submit(this, 'cbi.apply', 'install')" /> <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Install%>" onclick="cbi_submit(this, 'cbi.apply', 'install')" />
<% end <%
end
else else
%> %>
<input class="btn cbi-button cbi-button-apply" type="button" value="<%:Task Running%>&hellip;" onclick="taskd.show_log('<%=self.task_id%>')" /> <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Task Running%>&hellip;" onclick="taskd.show_log('<%=self.task_id%>')" />
@ -46,9 +58,10 @@ end
</div> </div>
<%+tasks/embed%> <%+tasks/embed%>
<% <%
if self.auto_show_task and task_running then if self.auto_show_task and task_running then
-%> %>
<script> <script>
taskd.show_log("<%=self.task_id%>"); taskd.show_log("<%=self.task_id%>");
</script> </script>

Loading…
Cancel
Save