Skip to content

Commit

Permalink
Merge pull request #1414 from GlobalNOC/1051_long_entity_names
Browse files Browse the repository at this point in the history
1051 long entity name fix
  • Loading branch information
jonstout authored Apr 20, 2022
2 parents b6c1d12 + ffe534b commit d4350a5
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 42 deletions.
56 changes: 35 additions & 21 deletions frontend/www/html_templates/l2/endpoint.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,44 @@
<div class="panel panel-default" style="padding: 0 15 0 15;">

<div style="display:flex; flex-direction: row; flex-wrap: nowrap;">
<div>
<h3>Entity:&nbsp;</h3>
<h4>Node:&nbsp;</h3>
<h4>Port:&nbsp;</h4>
<h5 class="d1q">VLAN:&nbsp;</h5>
<h5 class="qnq">STag:</h5>
<h5 class="qnq">CTag:</h5>
<h6><b>Bandwidth:</b></h6>
<h6><b>MTU:</b></h6>
</div>

<div>
<h3 class="l2vpn-entity">NA</h3>
<h4 class="l2vpn-node"></h4>
<h4><span class="l2vpn-interface"></span> <small class="l2vpn-interface-description"></small></h4>
<h5 class="l2vpn-tag"></h5>
<h5 class="l2vpn-inner-tag"></h5>
<h6 class="l2vpn-bandwidth"></h6>
<h6 class="l2vpn-mtu"></h6>
</div>
<table style="margin-top:20px;">
<tr style="vertical-align:top;">
<td><h3 style="margin-top:0px;">Entity:&nbsp;</h3></td>
<td><h3 style="margin-top:0px;" class="l2vpn-entity">NA</h3></td>
</tr>
<tr style="vertical-align:top;">
<td><h4 style="margin-top:0px;">Node:&nbsp;</h3></td>
<td><h4 style="margin-top:0px;" class="l2vpn-node"></h4></td>
</tr>
<tr style="vertical-align:top;">
<td><h4 style="margin-top:0px;">Port:&nbsp;</h4></td>
<td><h4 style="margin-top:0px;"><span class="l2vpn-interface"></span> <small class="l2vpn-interface-description"></small></h4></td>
</tr>
<tr style="vertical-align:top;">
<td>
<h5 style="margin-top:0px;" class="qnq">STag:</h5>
<h5 style="margin-top:0px;" class="d1q">VLAN:&nbsp;</h5>
</td>
<td><h5 style="margin-top:0px;" class="l2vpn-tag"></h5></td>
</tr>
<tr style="vertical-align:top;">
<td><h5 style="margin-top:0px;" class="qnq">CTag:</h5></td>
<td><h5 style="margin-top:0px;" class="l2vpn-inner-tag"></h5></td>
<td></td>
</tr>
<tr style="vertical-align:top;">
<td><h6 style="margin-top:0px;"><b>Bandwidth:</b></h6></td>
<td><h6 style="margin-top:0px;" class="l2vpn-bandwidth"></h6></td>
</tr>
<tr style="vertical-align:top;">
<td><h6 style="margin-top:0px;"><b>MTU:</b></h6></td>
<td><h6 style="margin-top:0px;" class="l2vpn-mtu"></h6></td>
</tr>
</table>

<iframe class="l2vpn-graph" height="185" frameborder="0" style="flex: 1;"></iframe>

<div class="l2vpn-endpoint-buttons">
<div class="l2vpn-endpoint-buttons" style="flex-basis:60px;flex-shrink:0;flex-grow:0;">
<button class="btn btn-link l2vpn-modify-button" type="button" onclick="" style="padding: 12 6 12 6;" title="Modify endpoint">
<span class="glyphicon glyphicon-edit"></span>
</button>
Expand Down
55 changes: 34 additions & 21 deletions frontend/www/html_templates/l3/endpoint.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,39 @@
<div class="panel panel-default" style="padding: 0 15 0 15;">

<div style="display:flex; flex-direction: row; flex-wrap: nowrap;">
<div>
<h3>Entity:&nbsp;</h3>
<h4>Node:&nbsp;</h3>
<h4>Port:&nbsp;</h4>
<h5 class="d1q">VLAN:&nbsp;</h5>
<h5 class="qnq">STag:</h5>
<h5 class="qnq">CTag:</h5>
<h6><b>Bandwidth:</b></h6>
<h6><b>MTU:</b></h6>
</div>

<div>
<h3 class="entity">NA</h3>
<h4 class="node"></h4>
<h4><span class="interface"></span> <small class="interface-description"></small></h4>
<h5 class="tag"></h5>
<h5 class="inner-tag"></h5>
<h6 class="bandwidth"></h6>
<h6 class="mtu"></h6>
</div>
<table style="margin-top:20px;">
<tr style="vertical-align:top;">
<td><h3 style="margin-top:0px;">Entity:&nbsp;</h3></td>
<td><h3 style="margin-top:0px;" class="entity">NA</h3></td>
</tr>
<tr style="vertical-align:top;">
<td><h4 style="margin-top:0px;">Node:&nbsp;</h3></td>
<td><h4 style="margin-top:0px;" class="node"></h4></td>
</tr>
<tr style="vertical-align:top;">
<td><h4 style="margin-top:0px;">Port:&nbsp;</h4></td>
<td><h4 style="margin-top:0px;"><span class="interface"></span> <small class="interface-description"></small></h4></td>
</tr>
<tr style="vertical-align:top;">
<td>
<h5 style="margin-top:0px;" class="qnq">STag:</h5>
<h5 style="margin-top:0px;" class="d1q">VLAN:&nbsp;</h5>
</td>
<td><h5 style="margin-top:0px;" class="tag"></h5></td>
</tr>
<tr style="vertical-align:top;">
<td><h5 style="margin-top:0px;" class="qnq">CTag:</h5></td>
<td><h5 style="margin-top:0px;" class="inner-tag"></h5></td>
</tr>
<tr style="vertical-align:top;">
<td><h6 style="margin-top:0px;"><b>Bandwidth:</b></h6></td>
<td><h6 style="margin-top:0px;" class="bandwidth"></h6></td>
</tr>
<tr style="vertical-align:top;">
<td><h6 style="margin-top:0px;"><b>MTU:</b></h6></td>
<td><h6 style="margin-top:0px;" class="mtu"></h6></td>
</tr>
</table>

<div style="flex: 1; padding: 46px 16px 8px;">
<button class="btn btn-sm btn-primary add-peering-button" type="button" onclick="" style="margin: 0 0 6px">
Expand All @@ -48,7 +61,7 @@ <h6 class="mtu"></h6>
</div>
</div>

<div class="endpoint-buttons" style="display: none;">
<div class="endpoint-buttons" style="display:none;flex-basis:92px;flex-shrink:0;flex-grow:0;">
<button class="btn btn-link view-endpoint-configuration-button" type="button" style="padding: 12 6 12 6;" title="Download router configuration">
<span class="glyphicon glyphicon-save"></span>
</button>
Expand Down

0 comments on commit d4350a5

Please sign in to comment.