diff options
| author | Simon Rettberg | 2014-11-26 21:01:37 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-11-26 21:01:37 +0100 |
| commit | 177791970ee86a6653b051ee393801ad37134d70 (patch) | |
| tree | 696fd696c89d4d587365fa7172ab0e184e183f07 /templates/serversetup | |
| parent | Add HTTPS config module for webif, update everything to use FileUtil class, m... (diff) | |
| download | slx-admin-177791970ee86a6653b051ee393801ad37134d70.tar.gz slx-admin-177791970ee86a6653b051ee393801ad37134d70.tar.xz slx-admin-177791970ee86a6653b051ee393801ad37134d70.zip | |
Lots of small bugfixes, proxy config WIP, https config WIP, translation updates, added masterpassword to pxe menu, ...
Diffstat (limited to 'templates/serversetup')
| -rw-r--r-- | templates/serversetup/ipxe.html | 18 | ||||
| -rw-r--r-- | templates/serversetup/ipxe_update.html | 20 |
2 files changed, 33 insertions, 5 deletions
diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html index 21f3d87b..ec8ddc2f 100644 --- a/templates/serversetup/ipxe.html +++ b/templates/serversetup/ipxe.html @@ -15,7 +15,7 @@ <strong>{{lang_bootBehavior}}</strong> <label class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label> <label class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label> - <label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> "my-entry"</label> + <label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> {{lang_customEntry}} ("custom")</label> </div> <div class="form-group"> @@ -27,8 +27,16 @@ </div> <div class="form-group"> + <strong>{{lang_masterPassword}}</strong> + <div class="form-narrow"> + <input type="text" class="form-control" name="masterpassword" value="{{masterpassword}}"> + </div> + <i>{{lang_masterPasswordHelp}}</i> + </div> + + <div class="form-group"> <strong>{{lang_menuCustom}}</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a> - <textarea class="form-control" name="custom">{{custom}}</textarea> + <textarea class="form-control" name="custom" rows="8">{{custom}}</textarea> </div> </div> @@ -45,13 +53,13 @@ <div class="modal-body"> {{lang_menuCustomHint1}} <br>{{lang_example}}: - <pre>LABEL my-entry - MENU LABEL ^My Entry + <pre>LABEL custom + MENU LABEL ^My Boot Entry KERNEL http://1.2.3.4/kernel INITRD http://1.2.3.4/initramfs-stage31 APPEND custom=option IPAPPEND 3</pre> - {{lang_menuCustomHint2}} LABEL <strong>my-entry</strong> + {{lang_menuCustomHint2}} LABEL <strong>custom</strong> {{lang_menuCustomHint3}} </div> <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div> diff --git a/templates/serversetup/ipxe_update.html b/templates/serversetup/ipxe_update.html new file mode 100644 index 00000000..9c598667 --- /dev/null +++ b/templates/serversetup/ipxe_update.html @@ -0,0 +1,20 @@ +<div class="panel panel-default"> + <div class="panel-heading">{{lang_menuGeneration}}</div> + <div class="panel-body"> + <div data-tm-id="{{taskid}}" data-tm-log="error" data-tm-callback="restartCb">{{lang_menuGeneration}}</div> + <div id="genfailed" class="alert alert-danger" style="display:none"> + {{lang_generationFailed}} + </div> + </div> +</div> + +<script type="text/javascript"> + function restartCb(task) + { + if (!task || !task.statusCode) + return; + if (task.statusCode === 'TASK_ERROR') { + $('#genfailed').show('slow'); + } + } +</script> |