diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 2d09f59400b..2d49c044c8a 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -12450,10 +12450,37 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it display: inline-block; } +.accounts-wizard .content td { + white-space: nowrap; + text-overflow: ellipsis; +} + +.accounts-wizard .content td.select, +.accounts-wizard .content th.select { + background: none; + border-right: 1px solid #BFBFBF; + width: 60px !important; + min-width: 60px !important; + max-width: 60px !important; +} + +.accounts-wizard .content .select input { + padding: 0; + width: auto; + height: auto; + margin: 18px 0 0 24px; +} + .accounts-wizard .content:last-child { margin-left: 14px; } +.accounts-wizard table thead th:first-child { + width: 50px; + min-width: 50px; + max-width: 50px; +} + .accounts-wizard .input-area { width: 320px; font-size: 13px; diff --git a/ui/index.jsp b/ui/index.jsp index 096747b10ac..c638f93789a 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -516,10 +516,10 @@ - - - - + + + + diff --git a/ui/scripts/ui-custom/accountsWizard.js b/ui/scripts/ui-custom/accountsWizard.js index f2017f8c04c..5ef0fa96b3a 100644 --- a/ui/scripts/ui-custom/accountsWizard.js +++ b/ui/scripts/ui-custom/accountsWizard.js @@ -132,17 +132,32 @@ success: function(json) { if (json.ldapuserresponse.count > 0) { $(json.ldapuserresponse.LdapUser).each(function() { - var result = $(""); - result.append(""); - result.append(""); - result.append(""); - result.append(""); - $table.append(result); + var $result = $(''); + + $result.append( + $('"); - result.append(""); - $table.append(result); + var $result = $(''); + + $result.append( + $('
SelectRealnameUsernameEmail
" + this.firstname + " " + this.lastname + "" + this.username + "" + this.email + "
').addClass('select').append( + $('').attr({ + type: 'checkbox', name: 'username', value: this.username + }) + ), + $('').addClass('name').html(this.firstname + ' ' + this.lastname) + .attr('title', this.firstname + ' ' + this.lastname), + $('').addClass('username').html(this.username) + .attr('title', this.username), + $('').addClass('email').html(this.email) + .attr('title', this.email) + ) + + $table.append($result); }); } else { - var result = $("
No data to show
').attr('colspan', 4).html(_l('label.no.data')) + ); + + $table.append($result); } } });