openstack/horizon
Code Issues Proposed changes

Merge "[Launch Instance Fix] Fix detail rows not expanding on source and flavor"

Browse Source
This commit is contained in:
Jenkins
2015-04-04 02:26:52 +00:00
committed by Gerrit Code Review
parent 135b0977c8 26a6455774
commit a55fe8224f
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html
View File

@@ -118,11 +118,14 @@ limitations under the License.
<pie-chart chart-data="item.ramChartData"
chart-settings="donutSettings"></pie-chart>
<div ng-if="metadataDefs.flavor">
<div class="row detail" ng-if="item.extras">
<hz-metadata-display
available="::metadataDefs.flavor"
existing="::item.extras">
</hz-metadata-display>
<hr>
<div class="row" ng-if="item.extras">
<div class="col-sm-12">
<hz-metadata-display
available="::metadataDefs.flavor"
existing="::item.extras">
</hz-metadata-display>
</div>
</div>
</div>
</td>

32
openstack_dashboard/static/dashboard/launch-instance/source/source-details.html
View File

@@ -1,8 +1,8 @@
<td colspan="1" class="detail"></td>
<td></td>
<td colspan="{$ ::tableHeadCells.length $}" class="detail">
<div class="row detail">
<div class="row">
<dl class="col-sm-2">
<dt>{$ ::label.min_disk $}</dt>
<dd>
@@ -17,25 +17,27 @@
</dl>
</div>
<div class="row detail"
<div class="row"
ng-if="model.metadataDefs.image || model.metadataDefs.volume">
<div ng-if="row.properties && model.metadataDefs.image">
<hz-metadata-display
available="::model.metadataDefs.image"
existing="::row.properties">
</hz-metadata-display>
</div>
<div class="col-sm-12">
<div ng-if="row.properties && model.metadataDefs.image">
<hz-metadata-display
available="::model.metadataDefs.image"
existing="::row.properties">
</hz-metadata-display>
</div>
<div ng-if="row.volume_image_metadata && model.metadataDefs.volume">
<hz-metadata-display
available="::model.metadataDefs.volume"
existing="::row.volume_image_metadata">
</hz-metadata-display>
<div ng-if="row.volume_image_metadata && model.metadataDefs.volume">
<hz-metadata-display
available="::model.metadataDefs.volume"
existing="::row.volume_image_metadata">
</hz-metadata-display>
</div>
</div>
</div>
</td>
<td class="detail"></td>
<td></td>