openstack
/
fuel-web
Code Issues Proposed changes

Change interface name display 

Closes-Bug: #1511280

Change-Id: Id624411849c1af99ca362fe75d66fba92e651601
This commit is contained in:
Julia Aranovich 2015-12-03 17:28:07 +03:00
parent 582c1dbe9d
commit b6a5109945
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nailgun/static/styles/main.less
View File

@ -3450,22 +3450,14 @@ input[type=range] {
margin-bottom: 0;
}
.ifc-connection {
@ifc-size: 40px;
border-radius: @base-ifc-indent;
background: @gray + 50%;
padding: @base-ifc-indent;
margin-right: @base-ifc-indent;
text-align: center;
.ifc-name {
.text-emboss;
.font-semibold;
font-size: @base-font-size - 2px;
color: @base-text-color - 20%;
line-height: 1;
}
.ifc-connection-status {
@ifc-connection-status-size: 40px;
height: @ifc-connection-status-size;
width: @ifc-connection-status-size;
height: @ifc-size;
width: @ifc-size;
&.ifc-online {
background: url(@common-icons-sprite) no-repeat 0 -160px;
}
@ -3477,7 +3469,15 @@ input[type=range] {
.ifc-info, .ifc-info .btn-link {
padding: 0;
border: 0;
line-height: 1.1;
max-width: 160px;
word-break: break-all;
line-height: 1;
> div:not(:last-child) {
margin-bottom: 4px;
}
.ifc-name {
.font-semibold;
}
}
}

4
nailgun/static/tests/functional/pages/interfaces.js
View File

@ -31,7 +31,7 @@ define([
.then(function(ifcElements) {
return ifcElements.reduce(function(result, ifcElement) {
return ifcElement
.findByCssSelector('div.ifc-name')
.findByCssSelector('.ifc-name')
.then(function(ifcDiv) {
return ifcDiv
.getVisibleText()
@ -131,7 +131,7 @@ define([
.then(function(bondElement) {
ifcsNames.push(bondName);
return bondElement
.findAllByCssSelector('div.ifc-name')
.findAllByCssSelector('.ifc-name')
.then(function(ifcNamesElements) {
assert.equal(ifcNamesElements.length, ifcsNames.length, 'Unexpected number of interfaces in bond');

1
nailgun/static/translations/core.json
View File

@ -368,6 +368,7 @@
"vlan_id": "VLAN ID",
"vlan_id_plural": "VLAN IDs",
"mac": "MAC",
"name": "Name",
"configuration_template_warning": "Cannot configure bonding and networks: network configuration template is used.",
"bond_button": "Bond Network Interfaces",
"unbond_button": "Unbond Network Interfaces",

6
nailgun/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js
View File

@ -762,11 +762,13 @@ function($, _, Backbone, React, i18n, utils, models, dispatcher, dialogs, contro
<div key={'info-' + slaveInterface.get('name')} className='ifc-info-block clearfix'>
<div className='ifc-connection pull-left'>
<div className={utils.classNames(connectionStatusClasses(slaveInterface))} />
<div className='ifc-name'>{slaveInterface.get('name')}</div>
</div>
<div className='ifc-info pull-left'>
{this.props.nodes.length == 1 &&
<div>{i18n(ns + 'mac')}: {slaveInterface.get('mac')}</div>
[
<div key='ifc-name'>{i18n(ns + 'name')}: <span className='ifc-name'>{slaveInterface.get('name')}</span></div>,
<div key='ifc-mac'>{i18n(ns + 'mac')}: {slaveInterface.get('mac')}</div>
]
}
<div>
{i18n(ns + 'speed')}: {this.props.interfaceSpeeds[index].join(', ')}