diff options
| author | Simon Rettberg | 2015-09-04 19:03:53 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-04 19:03:53 +0200 |
| commit | 5435b8d135d2003945e2361d1c82f583570dfdde (patch) | |
| tree | ee324f7754e9d9fd1fe4a5b3f3def1e56b8eeb30 /templates | |
| parent | Fix db update by adding missing return statement... (diff) | |
| download | slx-admin-5435b8d135d2003945e2361d1c82f583570dfdde.tar.gz slx-admin-5435b8d135d2003945e2361d1c82f583570dfdde.tar.xz slx-admin-5435b8d135d2003945e2361d1c82f583570dfdde.zip | |
Many changes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/sysconfig/ad-checkconnection.html | 8 | ||||
| -rw-r--r-- | templates/sysconfig/ad-checkcredentials.html | 3 | ||||
| -rw-r--r-- | templates/systemstatus/_page.html | 22 |
3 files changed, 28 insertions, 5 deletions
diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index 1c3a1091..f5fcb2a8 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -51,13 +51,15 @@ var ports = task.data.ports; for (var i = 0; i < ports.length; ++i) { if (ports[i].open && ports[i].port && (!ssl || ports[i].certFingerprint.length > 10)) { + if ($.isNumeric($('#port').val()) && $('#port').val() < ports[i].port) continue; // Prefer the global LDAP ports over the specific AD ports $('#port').val(ports[i].port); if (ssl) $('#fingerprint').val(ports[i].certFingerprint); - $('#nextbutton').show(); - $('#nextform').submit(); - return; } } + if ($('#port').val() > 0) { + $('#nextbutton').show(); + $('#nextform').submit(); + } } } </script> diff --git a/templates/sysconfig/ad-checkcredentials.html b/templates/sysconfig/ad-checkcredentials.html index e1d15678..9378adad 100644 --- a/templates/sysconfig/ad-checkcredentials.html +++ b/templates/sysconfig/ad-checkcredentials.html @@ -6,7 +6,8 @@ <div data-tm-id="{{self-search}}" data-tm-log="messages" data-tm-callback="selfCb">LDAP Self-Query</div> <div data-tm-id="{{tm-search}}" data-tm-log="messages" data-tm-callback="ldapCb">LDAP Test-Query</div> </div> -<br> +<i>{{lang_onProblemSearchBase}}</i> +<br><br> <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdAuth_Start"> <input type="hidden" name="token" value="{{token}}"> diff --git a/templates/systemstatus/_page.html b/templates/systemstatus/_page.html index 22eeb7d3..79024ad6 100644 --- a/templates/systemstatus/_page.html +++ b/templates/systemstatus/_page.html @@ -86,11 +86,31 @@ <span class="glyphicon glyphicon-refresh slx-rotation"></span> </div> </div> +<div class="panel panel-default"> + <div class="panel-heading"> + netstat -tulpn + </div> + <div class="panel-body" id="netstat"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> + </div> +</div> +<div class="panel panel-default"> + <div class="panel-heading"> + ps auxf + </div> + <div class="panel-body" id="pslist"> + <span class="glyphicon glyphicon-refresh slx-rotation"></span> + </div> +</div> <script type="text/javascript"> loadContent('#diskstat', '?do=SystemStatus&action=DiskStat'); loadContent('#addresses', '?do=SystemStatus&action=AddressList'); loadContent('#systeminfo', '?do=SystemStatus&action=SystemInfo'); loadContent('#services', '?do=SystemStatus&action=Services'); - loadContent('#dmsd-log', '?do=SystemStatus&action=DmsdLog'); + setTimeout(function() { + loadContent('#dmsd-log', '?do=SystemStatus&action=DmsdLog'); + loadContent('#netstat', '?do=SystemStatus&action=Netstat'); + loadContent('#pslist', '?do=SystemStatus&action=PsList'); + }, 500); </script> |