mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
adds table overflow scroll
This commit is contained in:
parent
4b071745fa
commit
e175cdbfd7
|
@ -522,7 +522,7 @@
|
||||||
{{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
|
{{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-8" id="ldaptestrow">
|
<div class="col-md-8" id="ldaptestrow">
|
||||||
<a {{ $setting->demoMode }} class="btn btn-default btn-sm pull-left" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
|
<a {{ $setting->demoMode }} class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-8 col-md-offset-3">
|
<div class="col-md-8 col-md-offset-3">
|
||||||
<br />
|
<br />
|
||||||
|
@ -700,11 +700,13 @@
|
||||||
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.login.message + ' </li>'
|
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.login.message + ' </li>'
|
||||||
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
|
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
|
||||||
html += '</ul>'
|
html += '</ul>'
|
||||||
|
html += '<div style="overflow:auto;">'
|
||||||
html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
|
html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
|
||||||
html += '<table class="table table-bordered table-condensed" style=" table-layout:fixed; width:100%; background-color: #fff">'
|
html += '<table class="table table-bordered table-condensed" style=" table-layout:fixed; width:100%;background-color: #fff">'
|
||||||
html += buildLdapResultsTableHeader()
|
html += buildLdapResultsTableHeader()
|
||||||
html += buildLdapResultsTableBody(results.user_sync.users)
|
html += buildLdapResultsTableBody(results.user_sync.users)
|
||||||
html += '<table>'
|
html += '</table>'
|
||||||
|
html += '</div>'
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -729,7 +731,7 @@
|
||||||
{
|
{
|
||||||
let body = '<tbody>'
|
let body = '<tbody>'
|
||||||
for (var i in users) {
|
for (var i in users) {
|
||||||
body += '<tr><td style="overflow:hidden;">' + users[i].employee_number + '</td><td style="overflow:hidden;">' + users[i].username + '</td><td style="overflow:hidden;">' + users[i].firstname + '</td><td style="overflow:hidden;">' + users[i].lastname + '</td><td style="overflow:hidden;">' + users[i].email + '</td></tr>'
|
body += '<tr><td>' + users[i].employee_number + '</td><td>' + users[i].username + '</td><td>' + users[i].firstname + '</td><td>' + users[i].lastname + '</td><td>' + users[i].email + '</td></tr>'
|
||||||
}
|
}
|
||||||
body += "</tbody>"
|
body += "</tbody>"
|
||||||
return body;
|
return body;
|
||||||
|
|
Loading…
Reference in a new issue