diff options
Diffstat (limited to 'modules-available/rebootcontrol/templates')
8 files changed, 72 insertions, 35 deletions
diff --git a/modules-available/rebootcontrol/templates/header.html b/modules-available/rebootcontrol/templates/header.html index d5e79a14..47d97714 100644 --- a/modules-available/rebootcontrol/templates/header.html +++ b/modules-available/rebootcontrol/templates/header.html @@ -42,28 +42,37 @@ </div> <div class="modal-body"> <label>{{lang_wolDiscoverHeading}}</label> - <div class="checkbox"> - <input {{perms.woldiscover.disabled}} id="wol-auto-discover" - type="checkbox" name="enabled" {{wol_auto_checked}}> - <label for="wol-auto-discover">{{lang_wolAutoDiscoverCheck}}</label> - </div> - <div class="checkbox"> - <input {{perms.woldiscover.disabled}} id="wol-c2c" - type="checkbox" name="enabled-c2c" {{wol_c2c_checked}}> - <label for="wol-c2c">{{lang_wolDiscoverClientToClient}}</label> - </div> - <div class="slx-space"></div> - <p>{{lang_wolDiscoverDescription}}</p> - <button {{perms.woldiscover.disabled}} class="btn btn-primary pull-right" - onclick="generateNewKeypair()" type="submit"> - <span class="glyphicon glyphicon-floppy-disk"></span> - {{lang_save}} - </button> - <div class="clearfix"></div> + <div class="checkbox"> + <input {{perms.woldiscover.disabled}} id="wol-auto-discover" + type="checkbox" name="enabled" {{wol_auto_checked}}> + <label for="wol-auto-discover">{{lang_wolAutoDiscoverCheck}}</label> + </div> + <div class="checkbox"> + <input {{perms.woldiscover.disabled}} id="wol-c2c" + type="checkbox" name="enabled-c2c" {{wol_c2c_checked}}> + <label for="wol-c2c">{{lang_wolDiscoverClientToClient}}</label> + </div> + <div class="slx-space"></div> + <p>{{lang_wolDiscoverDescription}}</p> + </div> + <div class="modal-body"> + <label for="bcast-input">{{lang_directedBroadcastOverrideHeading}}</label> + <div class="input-group"> + <span class="input-group-addon">{{lang_directedBroadcastAddress}}</span> + <input {{perms.woldiscover.disabled}} type="text" pattern="[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" + minlength="7" maxlength="15" class="form-control" name="dbcast" value="{{dbcast}}" id="bcast-input"> + </div> + <p>{{lang_directedBroadcastDescription}}</p> + </div> + <div class="modal-body"> + <button {{perms.woldiscover.disabled}} class="btn btn-primary pull-right" + onclick="generateNewKeypair()" type="submit"> + <span class="glyphicon glyphicon-floppy-disk"></span> + {{lang_save}} + </button> + <div class="clearfix"></div> </div> </form> - <div class="modal-body"> - </div> </div> </div> </div> @@ -98,4 +107,4 @@ document.addEventListener('DOMContentLoaded', function() { }); -</script>
\ No newline at end of file +</script> diff --git a/modules-available/rebootcontrol/templates/status-checkconnection.html b/modules-available/rebootcontrol/templates/status-checkconnection.html index e31d95ea..da1177e7 100644 --- a/modules-available/rebootcontrol/templates/status-checkconnection.html +++ b/modules-available/rebootcontrol/templates/status-checkconnection.html @@ -1,4 +1,4 @@ -<h3>{{lang_checkingJumpHost}}: {{host}}</h3> +<h3>{{lang_checkingJumpHost}}: {{host}} – {{timestamp_s}}</h3> <div class="clearfix"></div> <div class="collapse alert alert-success" id="result-ok"> diff --git a/modules-available/rebootcontrol/templates/status-exec.html b/modules-available/rebootcontrol/templates/status-exec.html index 403b7fca..a3efef5f 100644 --- a/modules-available/rebootcontrol/templates/status-exec.html +++ b/modules-available/rebootcontrol/templates/status-exec.html @@ -1,3 +1,5 @@ +<h3>{{timestamp_s}}</h3> + <div data-tm-id="{{id}}" data-tm-log="error" data-tm-callback="updateStatus">{{lang_executingRemotely}}</div> <div class="slx-space"></div> @@ -14,7 +16,11 @@ {{#clients}} <div class="list-group-item" id="client-{{machineuuid}}"> <div class="row"> - <div class="col-md-6 col-sm-8 col-xs-12 slx-bold">{{hostname}}{{^hostname}}{{clientip}}{{/hostname}}</div> + <div class="col-md-6 col-sm-8 col-xs-12 slx-bold"> + <a href="?do=statistics&uuid={{machineuuid}}"> + {{hostname}}{{^hostname}}{{clientip}}{{/hostname}} + </a> + </div> <div class="col-md-4 col-sm-2 col-xs-6 state"></div> <div class="col-md-2 col-sm-2 col-xs-6 text-right exitCode"></div> </div> @@ -57,6 +63,13 @@ function updateStatusClient(id, status) { $p.find('.exitCode').text(status.exitCode).addClass((status.exitCode === 0 ? 'text-success' : 'text-danger')); } ignoreHosts[id] = true; + var txt = status.stdout.trim(); + if (txt.startsWith('<') && txt.endsWith('</svg>')) { + var $i = $('<img class="img-responsive">'); + $i[0].src = 'data:image/svg+xml,' + encodeURIComponent(txt); + $p.find('.stdout').hide(); + $p.append($i); + } } } diff --git a/modules-available/rebootcontrol/templates/status-reboot.html b/modules-available/rebootcontrol/templates/status-reboot.html index 7b46cab4..34971845 100644 --- a/modules-available/rebootcontrol/templates/status-reboot.html +++ b/modules-available/rebootcontrol/templates/status-reboot.html @@ -1,4 +1,5 @@ -<h3>{{action}}</h3> +<h3>{{action}} – {{timestamp_s}}</h3> + {{#locations}} <div class="loc">{{name}}</div> {{/locations}} @@ -18,7 +19,7 @@ <tbody> {{#clients}} <tr> - <td>{{hostname}}{{^hostname}}{{machineuuid}}{{/hostname}}</td> + <td><a href="?do=statistics&uuid={{machineuuid}}">{{hostname}}{{^hostname}}{{machineuuid}}{{/hostname}}</a></td> <td>{{clientip}}</td> <td> <span id="status-{{machineuuid}}" class="machineuuid" data-uuid="{{machineuuid}}"></span> diff --git a/modules-available/rebootcontrol/templates/status-wol.html b/modules-available/rebootcontrol/templates/status-wol.html index 5a53a6f8..70517f84 100644 --- a/modules-available/rebootcontrol/templates/status-wol.html +++ b/modules-available/rebootcontrol/templates/status-wol.html @@ -1,10 +1,12 @@ +<h3>{{timestamp_s}}</h3> + {{#locations}} <div class="loc">{{name}}</div> {{/locations}} <div class="clearfix slx-space"></div> {{#tasks}} -<div data-tm-id="{{.}}" data-tm-callback="wolCallback" data-tm-log="messages" data-tm-log-fail-only="true">{{lang_aWolJob}}</div> +<div data-tm-id="{{.}}" data-tm-callback="wolCallback" data-tm-log="messages">{{lang_aWolJob}}</div> {{/tasks}} {{^tasks}} <div class="alert alert-warning"> @@ -29,17 +31,23 @@ <tbody> {{#clients}} <tr> - <td>{{hostname}}{{^hostname}}{{machineuuid}}{{^machineuuid}}{{clientip}}{{/machineuuid}}{{/hostname}}</td> - <td>{{clientip}}</td> + <td> {{#machineuuid}} + <a href="?do=statistics&uuid={{machineuuid}}"> + {{hostname}}{{^hostname}}{{machineuuid}}{{/hostname}} + </a> + {{/machineuuid}} + {{^machineuuid}} + {{hostname}}{{^hostname}}{{clientip}}{{/hostname}} + {{/machineuuid}} + </td> + <td>{{clientip}}</td> <td> + {{#machineuuid}} <span id="status-{{machineuuid}}" class="machineuuid" data-uuid="{{machineuuid}}"></span> <span id="spinner-{{machineuuid}}" class="glyphicon glyphicon-refresh slx-rotation"></span> - </td> - {{/machineuuid}} - {{^machineuuid}} - <td></td> {{/machineuuid}} + </td> </tr> {{/clients}} </tbody> @@ -48,7 +56,7 @@ <a class="text-muted" href="#debug-out" data-toggle="collapse">Debug</a> <pre id="debug-out" class="collapse"></pre> -<script><!-- +<script> function wolCallback(task) { if (task.statusCode === 'TASK_WAITING' || task.statusCode === 'TASK_PROCESSING') { stillActive = 25; @@ -71,4 +79,4 @@ function wolCallback(task) { $do.text(txt); } } -//--></script>
\ No newline at end of file +</script> diff --git a/modules-available/rebootcontrol/templates/subnet-edit.html b/modules-available/rebootcontrol/templates/subnet-edit.html index 5a6adf3c..570865c7 100644 --- a/modules-available/rebootcontrol/templates/subnet-edit.html +++ b/modules-available/rebootcontrol/templates/subnet-edit.html @@ -39,12 +39,14 @@ </div> {{/jumpHosts}} </div> + {{#showC2C}} <div class="list-group-item"> <label>{{lang_reachableFrom}}</label> {{#sourceNets}} <div>{{cidr}}</div> {{/sourceNets}} </div> + {{/showC2C}} </div> <div class="panel-footer text-right"> <button type="submit" class="btn btn-danger" name="action" value="delete" diff --git a/modules-available/rebootcontrol/templates/subnet-list.html b/modules-available/rebootcontrol/templates/subnet-list.html index 8ecf66b4..2bc9208f 100644 --- a/modules-available/rebootcontrol/templates/subnet-list.html +++ b/modules-available/rebootcontrol/templates/subnet-list.html @@ -30,7 +30,7 @@ <td class="text-center">{{#fixed}}<span class="glyphicon glyphicon-lock"></span>{{/fixed}}</td> <td class="text-center">{{#isdirect}}<span class="glyphicon glyphicon-ok"></span>{{/isdirect}}</td> <td class="text-right"><span class="badge">{{jumphostcount}}</span> / <span class="badge">{{sourcecount}}</span></td> - <td class="{{lastseen_class}}">{{lastseen_s}}</td> + <td class="{{lastseen_class}} text-nowrap">{{lastseen_s}}</td> </tr> {{/subnets}} </tbody> diff --git a/modules-available/rebootcontrol/templates/task-list.html b/modules-available/rebootcontrol/templates/task-list.html index 5ab75675..dcb04450 100644 --- a/modules-available/rebootcontrol/templates/task-list.html +++ b/modules-available/rebootcontrol/templates/task-list.html @@ -2,6 +2,7 @@ <table class="table"> <thead> <tr> + <th>{{lang_when}}</th> <th>{{lang_task}}</th> <th>{{lang_location}}</th> <th>{{lang_clientCount}}</th> @@ -12,6 +13,9 @@ {{#list}} <tr> <td class="text-nowrap"> + {{timestamp_s}} + </td> + <td class="text-nowrap"> <a href="?do=rebootcontrol&show=task&what=task&taskid={{id}}">{{type}}</a> <div class="small">{{action}}</div> </td> |