From aec2cfe2ccccb78820368264eed7105b409615f5 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Tue, 26 Feb 2013 11:31:34 -0800 Subject: [PATCH 1/2] Multi-edit: Allow horizontal overflow --- ui/css/cloudstack3.css | 2 +- ui/scripts/ui/widgets/multiEdit.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index cf18ab215e6..5751fe3c271 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -7286,6 +7286,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t } .multi-edit { + overflow: auto; } .multi-edit > form { @@ -7464,7 +7465,6 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t } .multi-edit .data .data-body { - width: 96%; margin: auto auto auto 11px; overflow: hidden; } diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index fe6c1454cfc..2480f56f872 100755 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -222,8 +222,7 @@ } // Align width to main header - var targetWidth = $multi.find('th.' + fieldName).width() + 5; - $td.width(targetWidth); + _medit.refreshItemWidths($multi); if (data._hideFields && $.inArray(fieldName, data._hideFields) > -1) { @@ -523,10 +522,15 @@ * Align width of each data row to main header */ refreshItemWidths: function($multi) { + $multi.find('.data-body').width( + $multi.find('form > table.multi-edit').width() + ); + $multi.find('.data tr').filter(function() { return !$(this).closest('.expandable-listing').size(); }).each(function() { var $tr = $(this); + $tr.find('td').each(function() { var $td = $(this); From 6831937145fbd5982bce88c815f3cf4b56106657 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Tue, 26 Feb 2013 12:21:15 -0800 Subject: [PATCH 2/2] Fix/cleanup zone wizard UI->public traffic multi-edit --- ui/css/cloudstack3.css | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 5751fe3c271..d6d5da2e0c1 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -6899,7 +6899,9 @@ label.error { /*** Multi-edit*/ .multi-wizard.zone-wizard .multi-edit { - width: 100%; + width: 732px; + float: left; + margin-left: 0px; } .multi-wizard.zone-wizard .multi-edit table { @@ -6907,22 +6909,45 @@ label.error { width: 98%; } -.multi-wizard.zone-wizard .multi-edit table th, -.multi-wizard.zone-wizard .multi-edit table td { - min-width: 97px; - max-width: 97px; +.multi-wizard.zone-wizard .multi-edit table td, +.multi-wizard.zone-wizard .multi-edit table th { + padding: 4px; +} + +.multi-wizard.zone-wizard .multi-edit table th { + padding-top: 11px; + padding-bottom: 8px; +} + +.multi-wizard.zone-wizard .multi-edit table input { + margin: 2px 0px 2px -5px; + padding: 2px 0px; } .multi-wizard.zone-wizard .multi-edit .data { - width: 102%; float: left; overflow: visible; } +.multi-wizard.zone-wizard .multi-edit .data-body { + margin: 0; +} + .multi-wizard.zone-wizard .multi-edit .data-body .data-item { float: left; } +.multi-wizard.zone-wizard .multi-edit .data-body .data-item td { + padding-top: 8px; + padding-bottom: 8px; +} + +.multi-wizard.zone-wizard .multi-edit .data-body .data-item td span { + font-size: 10px; + text-overflow: ellipsis; + max-width: 91px; +} + /*** Select container fields*/ .multi-wizard.zone-wizard .select-container .field { width: 100%;