Skip to content

Commit

Permalink
Fix remove device interface expanded panel. (#1205)
Browse files Browse the repository at this point in the history
Co-authored-by: Anthony Dillon <[email protected]>
  • Loading branch information
Caleb Ellis and anthonydillon authored Jun 4, 2020
1 parent 2e19f7c commit 5ddc461
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions legacy/src/app/partials/node-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -2467,6 +2467,7 @@ <h3 class="p-heading--five">Advanced options</h3>
<th>Subnet</th>
<th>IP Address</th>
<th><div class="u-align--right">Actions</div></th>
<th class="u-hide"></th>
</tr>

<tr data-ng-if="!isDevice" class="p-table--is-not-device">
Expand Down Expand Up @@ -2523,8 +2524,14 @@ <h3 class="p-heading--five">Advanced options</h3>
<td class="p-table--action-cell">
<div class="u-align--right">
<div class="p-contextual-menu" toggle-ctrl data-ng-if="!isAllNetworkingDisabled() || isLimitedEditingAllowed(interface)">
<button class="p-button--base is-small p-contextual-menu__toggle" data-ng-click="toggleMenu()"><i class="p-icon--contextual-menu u-no-margin--right">Actions</i></button>
<div class="p-contextual-menu__dropdown" role="menu" data-ng-show="isToggled">
<button
class="p-button--base is-small p-contextual-menu__toggle u-no-margin--right"
data-ng-click="toggleMenu()"
data-ng-if="!(isShowingDeleteConfirm() && isInterfaceSelected(interface))"
>
<i class="p-icon--contextual-menu u-no-margin--right">Actions</i>
</button>
<div class="p-contextual-menu__dropdown" role="menu" data-ng-if="isToggled">
<button class="p-contextual-menu__link"
data-ng-if="!cannotEditInterface(interface)"
aria-label="Edit"
Expand All @@ -2548,7 +2555,20 @@ <h3 class="p-heading--five">Advanced options</h3>
<div class="col-7"></div>
</div>
</td>

<td ng-if="isShowingDeleteConfirm() && isInterfaceSelected(interface)">
<div class="row">
<hr />
<div class="col-8">
<p class="u-no-margin--bottom"><span class="p-icon--warning">Warning:</span> Are you sure you want to remove this {$ getRemoveTypeText(interface) $}?</p>
</div>
<div class="col-4">
<div class="u-align--right">
<button class="p-button--base" data-ng-click="cancel()">Cancel</button>
<button class="p-button--negative u-no-margin--top" data-ng-click="confirmRemove(interface)">Remove</button>
</div>
</div>
</div>
</td>
</tr>

<!--
Expand Down

0 comments on commit 5ddc461

Please sign in to comment.