luci-mod-admin-full: restructure and fix backup, restore and sysuprade (#517)

[project/luci.git] / modules / luci-mod-admin-full / luasrc / view / admin_system / flashops.htm

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
index 8bf1992..82a1fdb 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
@@ -17,38 +17,43 @@
 
        <fieldset class="cbi-section">
                <legend><%:Backup / Restore%></legend>
-               <form method="post" action="<%=url('admin/system/flashops')%>" enctype="multipart/form-data">
-                       <input type="hidden" name="exec" value="1" />
-                       <input type="hidden" name="token" value="<%=token%>" />
-                       <div class="cbi-section-descr"><%:Click "Generate archive" to download a tar archive of the current configuration files. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).%></div>
-                       <div class="cbi-section-node">
+               <div class="cbi-section-descr"><%:Click "Generate archive" to download a tar archive of the current configuration files. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).%></div>
+               <div class="cbi-section-node">
+                       <form class="inline" method="post" action="<%=url('admin/system/flashops/backup')%>">
+                               <input type="hidden" name="token" value="<%=token%>" />
                                <div class="cbi-value<% if not reset_avail then %> cbi-value-last<% end %>">
                                        <label class="cbi-value-title" for="image"><%:Download backup%>:</label>
                                        <div class="cbi-value-field">
                                                <input class="cbi-button cbi-button-apply" type="submit" name="backup" value="<%:Generate archive%>" />
                                        </div>
                                </div>
-                               <% if reset_avail then %>
+                       </form>
+                       <% if reset_avail then %>
+                       <form class="inline" method="post" action="<%=url('admin/system/flashops/reset')%>">
+                               <input type="hidden" name="token" value="<%=token%>" />
                                <div class="cbi-value cbi-value-last">
                                        <label class="cbi-value-title"><%:Reset to defaults%>:</label>
                                        <div class="cbi-value-field">
                                                <input onclick="return confirm('<%:Really reset all changes?%>')" class="cbi-button cbi-button-reset" type="submit" name="reset" value="<%:Perform reset%>" />
                                        </div>
                                </div>
-                               <% end %>
-                       </div>
-                       <br />
-                       <div class="cbi-section-descr"><%:To restore configuration files, you can upload a previously generated backup archive here.%></div>
-                       <div class="cbi-section-node">
+                       </form>
+                       <% end %>
+               </div>
+               <br />
+               <div class="cbi-section-descr"><%:To restore configuration files, you can upload a previously generated backup archive here.%></div>
+               <div class="cbi-section-node">
+                       <form class="inline" method="post" action="<%=url('admin/system/flashops/restore')%>" enctype="multipart/form-data">
                                <div class="cbi-value cbi-value-last">
                                        <label class="cbi-value-title" for="archive"><%:Restore backup%>:</label>
                                        <div class="cbi-value-field">
+                                               <input type="hidden" name="token" value="<%=token%>" />
                                                <input type="file" name="archive" id="archive" />
                                                <input type="submit" class="cbi-button cbi-input-apply" name="restore" value="<%:Upload archive...%>" />
                                        </div>
                                </div>
-                       </div>
-               </form>
+                       </form>
+               </div>
        </fieldset>
 
        <br />
@@ -56,8 +61,7 @@
        <fieldset class="cbi-section">
                <legend><%:Flash new firmware image%></legend>
                <% if upgrade_avail then %>
-                       <form method="post" action="<%=url('admin/system/flashops')%>" enctype="multipart/form-data">
-                               <input type="hidden" name="exec" value="1" />
+                       <form method="post" action="<%=url('admin/system/flashops/sysupgrade')%>" enctype="multipart/form-data">
                                <input type="hidden" name="token" value="<%=token%>" />
                                <div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires an OpenWrt compatible firmware image).%></div>
                                <div class="cbi-section-node">