openstack
/
horizon
Code Issues Proposed changes

Merge "Fix warning message not showing on launch instance modal"

This commit is contained in:
Zuul 2017-12-17 13:36:34 +00:00 committed by Gerrit Code Review
parent 6164fe0079 9c3d01a77c
commit 64cc85967f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/flavor/flavor.html
View File

@ -54,26 +54,26 @@ limitations under the License.
<td class="rsp-p1">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.vcpus"
popover="{$ item.errors.vcpus $}"
uib-popover="{$ item.errors.vcpus $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.vcpus $}
</td>
<td class="rsp-p1">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.ram"
popover="{$ item.errors.ram $}"
uib-popover="{$ item.errors.ram $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.ram | mb $}
</td>
<td class="rsp-p1">{$ ::item.totalDisk | gb $}</td>
<td class="rsp-p2">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.disk"
popover="{$ item.errors.disk $}"
uib-popover="{$ item.errors.disk $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.rootDisk | gb $}
</td>
<td class="rsp-p2">{$ ::item.ephemeralDisk | gb $}</td>
@ -175,26 +175,26 @@ limitations under the License.
<td class="rsp-p1">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.vcpus"
popover="{$ item.errors.vcpus $}"
uib-popover="{$ item.errors.vcpus $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.vcpus $}
</td>
<td class="rsp-p1">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.ram"
popover="{$ item.errors.ram $}"
uib-popover="{$ item.errors.ram $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.ram | mb $}
</td>
<td class="rsp-p1">{$ ::item.totalDisk | gb $}</td>
<td class="rsp-p2">
<span class="invalid fa fa-exclamation-triangle"
ng-show="item.errors.disk"
popover="{$ item.errors.disk $}"
uib-popover="{$ item.errors.disk $}"
popover-placement="top" popover-append-to-body="true"
popover-trigger="mouseenter mouseleave"/>
popover-trigger="'mouseenter'"/>
{$ ::item.rootDisk | gb $}
</td>
<td class="rsp-p2">{$ ::item.ephemeralDisk | gb $}</td>

8
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
View File

@ -164,8 +164,8 @@
<td ng-class="ctrl.tableBodyCells[4].classList">
<span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
class="invalid fa fa-exclamation-triangle"
popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="mouseenter mouseleave"
uib-popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="'mouseenter'"
popover-append-to-body="true"
popover-placement="top"></span>
{$ ctrl.tableBodyCells[4].filter ? ctrl.tableBodyCells[4].filter(row[ctrl.tableBodyCells[4].key], ctrl.tableBodyCells[4].filterArg) : row[ctrl.tableBodyCells[4].key] $}
@ -253,8 +253,8 @@
<td ng-class="ctrl.tableBodyCells[4].classList">
<span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
class="invalid fa fa-exclamation-triangle"
popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="mouseenter mouseleave"
uib-popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="'mouseenter'"
popover-append-to-body="true"
popover-placement="top"></span>
{$ ctrl.tableBodyCells[4].filter ? ctrl.tableBodyCells[4].filter(row[ctrl.tableBodyCells[4].key], ctrl.tableBodyCells[4].filterArg) : row[ctrl.tableBodyCells[4].key] $}