diff options
-rw-r--r-- | luci2/htdocs/luci2/template/system.upgrade.htm | 82 | ||||
-rw-r--r-- | luci2/htdocs/luci2/view/system.upgrade.js | 2 |
2 files changed, 40 insertions, 44 deletions
diff --git a/luci2/htdocs/luci2/template/system.upgrade.htm b/luci2/htdocs/luci2/template/system.upgrade.htm index 2dfe5b4..e9b8d3a 100644 --- a/luci2/htdocs/luci2/template/system.upgrade.htm +++ b/luci2/htdocs/luci2/template/system.upgrade.htm @@ -1,53 +1,51 @@ -<div class="cbi-form" id="tabs" style="display:none"> - <ul class="nav nav-tabs"> - <li class="active"><a data-toggle="tab" href="#actions"><%:Actions%></a></li> - <li><a data-toggle="tab" href="#config"><%:Configuration%></a></li> - </ul> +<ul class="nav nav-tabs"> + <li class="active"><a data-toggle="tab" href="#actions"><%:Actions%></a></li> + <li><a data-toggle="tab" href="#config"><%:Configuration%></a></li> +</ul> - <div class="tab-content"> - <div class="tab-pane active" id="actions"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"><%:Backup / Restore%></h3> - </div> - <div class="panel-body"> - <p><%: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).%></p> - <p> - <form action="/cgi-bin/luci-backup" method="post" style="display:inline"> - <input type="hidden" name="sessionid" /> - <input class="btn btn-primary" type="button" id="btn_backup" value="<%:Generate archive%>" /> - </form> - <input class="btn btn-danger" type="button" id="btn_reset" value="<%:Perform reset%>" /> - </p> - - <p><%:To restore configuration files, you can upload a previously generated backup archive here.%></p> - <p> - <input class="btn btn-primary" type="button" id="btn_restore" value="<%:Upload archive...%>" /> - </p> - </div> +<div class="tab-content"> + <div class="tab-pane active" id="actions"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title"><%:Backup / Restore%></h3> </div> + <div class="panel-body"> + <p><%: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).%></p> + <p> + <form action="/cgi-bin/luci-backup" method="post" style="display:inline"> + <input type="hidden" name="sessionid" /> + <input class="btn btn-primary" type="button" id="btn_backup" value="<%:Generate archive%>" /> + </form> + <input class="btn btn-danger" type="button" id="btn_reset" value="<%:Perform reset%>" /> + </p> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title"><%:Flash new firmware image%></h3> - </div> - <div class="panel-body"> - <p><%: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).%></p> - <p> - <input class="btn btn-primary" type="button" id="btn_flash" value="<%:Flash image...%>" /> - </p> - </div> + <p><%:To restore configuration files, you can upload a previously generated backup archive here.%></p> + <p> + <input class="btn btn-primary" type="button" id="btn_restore" value="<%:Upload archive...%>" /> + </p> </div> </div> - <div class="tab-pane" id="config"> - <div class="panel"> - <textarea class="form-control"></textarea> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title"><%:Flash new firmware image%></h3> </div> - <div class="pull-right"> - <input class="btn btn-primary" type="button" id="btn_save" value="<%:Save%>" /> - <input class="btn btn-default" type="button" id="btn_list" value="<%:Show current backup file list …%>" /> + <div class="panel-body"> + <p><%: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).%></p> + <p> + <input class="btn btn-primary" type="button" id="btn_flash" value="<%:Flash image...%>" /> + </p> </div> </div> </div> + + <div class="tab-pane" id="config"> + <div class="panel"> + <textarea class="form-control"></textarea> + </div> + <div class="pull-right"> + <input class="btn btn-primary" type="button" id="btn_save" value="<%:Save%>" /> + <input class="btn btn-default" type="button" id="btn_list" value="<%:Show current backup file list …%>" /> + </div> + </div> </div> diff --git a/luci2/htdocs/luci2/view/system.upgrade.js b/luci2/htdocs/luci2/view/system.upgrade.js index be8885b..9caac28 100644 --- a/luci2/htdocs/luci2/view/system.upgrade.js +++ b/luci2/htdocs/luci2/view/system.upgrade.js @@ -228,8 +228,6 @@ L.ui.view.extend({ ); }); }); - }).then(function() { - $('#tabs').show().tabs(); }); } }); |