From 360b0eb483232d4a3636a04d75ee9f178928116f Mon Sep 17 00:00:00 2001
From: riley <riley@tench.com>
Date: Wed, 13 Sep 2023 13:13:40 -0400
Subject: [PATCH] Major reformat of docker.htm for readability

---
 luasrc/view/tasks/docker.htm | 101 ++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/luasrc/view/tasks/docker.htm b/luasrc/view/tasks/docker.htm
index 454bf21..b412f33 100644
--- a/luasrc/view/tasks/docker.htm
+++ b/luasrc/view/tasks/docker.htm
@@ -1,57 +1,70 @@
+<% 
+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 %>
-<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>
+-- Check for a task start failure
+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 %>
 
 <%+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">
 <%
-if not task_running then
-%>
-    <%
-    local util  = require "luci.util"
-    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_install = not string.match(container_status_lower, " is not installed$")
+    if not task_running then
+        local util  = require "luci.util"
+        
+        local container_status = 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_running = string.match(string.lower(container_status), "^up .* (seconds|minutes|hours)")
-    if container_install then
-    -%>
-    <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Upgrade%>/<%:Apply%>" onclick="cbi_submit(this, 'cbi.apply', 'upgrade')" />
-    <%
-        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-reload" type="button" value="<%:Restart%>" onclick="cbi_submit(this, 'cbi.apply', 'restart')" />
-        <% 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-remove" type="button" value="<%:Remove%>" onclick="cbi_submit(this, 'cbi.apply', 'rm')" />
-        <% end
-      else %>
-    <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Install%>" onclick="cbi_submit(this, 'cbi.apply', 'install')" />
-    <% end
-else
-    %>
-    <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Task Running%>&hellip;" onclick="taskd.show_log('<%=self.task_id%>')" />
+        
+        if container_install then
+%>
+            <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Upgrade%>/<%:Apply%>" onclick="cbi_submit(this, 'cbi.apply', 'upgrade')" />
 <%
-end
+            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-reload" type="button" value="<%:Restart%>" onclick="cbi_submit(this, 'cbi.apply', 'restart')" />
+<% 
+            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-remove" type="button" value="<%:Remove%>" onclick="cbi_submit(this, 'cbi.apply', 'rm')" />
+<%
+            end 
+        else 
+%>
+            <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Install%>" onclick="cbi_submit(this, 'cbi.apply', 'install')" />
+<%
+        end 
+    else 
+%>
+        <input class="btn cbi-button cbi-button-apply" type="button" value="<%:Task Running%>&hellip;" onclick="taskd.show_log('<%=self.task_id%>')" />
+<%
+    end 
 %>
 </div>
 
 <%+tasks/embed%>
-<%
-if self.auto_show_task and task_running then
--%>
-<script>
-    taskd.show_log("<%=self.task_id%>");
-</script>
-<%
-end
+
+<% 
+if self.auto_show_task and task_running then 
+%>
+    <script>
+        taskd.show_log("<%=self.task_id%>");
+    </script>
+<% 
+end 
 %>