ONOS-4359: continued work on theming UI
- cleaning up device table view, and device details panel.
- updated xMark glyph, added xClose glyph.
Change-Id: I1f5e4496dbfaa58315ddf0a8c2e0f6e4ff163239
(cherry picked from commit a7f62e1)
diff --git a/web/gui/src/main/webapp/app/view/device/device-theme.css b/web/gui/src/main/webapp/app/view/device/device-theme.css
index cb134f5..9005b0c 100644
--- a/web/gui/src/main/webapp/app/view/device/device-theme.css
+++ b/web/gui/src/main/webapp/app/view/device/device-theme.css
@@ -18,77 +18,39 @@
ONOS GUI -- Device View (theme) -- CSS file
*/
-.light #ov-device .current-view use {
- fill: white;
+
+.light .dev-icon svg.embeddedIcon .icon .glyph {
+ fill: #0071bd;
}
-.dark #ov-device .current-view use {
- fill: #304860;
+.dark .dev-icon svg.embeddedIcon .icon .glyph {
+ /* TODO: dark theme */
+ fill: #0071bd;
}
-.light #ov-device .current-view rect {
- fill: deepskyblue;
-}
-.dark #ov-device .current-view rect {
- fill: #eee;
+.light #device-details-panel .editable {
+ border-bottom: 1px dashed #ca504b;
}
-.light #device-details-panel.floatpanel {
- background-color: rgb(229, 234, 237);
-}
-.dark #device-details-panel.floatpanel {
- background-color: #3A4042;
-}
-
-.light .close-btn svg.embeddedIcon .icon.plus .glyph {
- fill: #aaa;
-}
-.dark .close-btn svg.embeddedIcon .icon.plus .glyph {
- fill: #ccc;
-}
-
-.light .dev-icon svg.embeddedIcon .glyph {
- fill: rgb(0, 172, 229);
-}
-.dark .dev-icon svg.embeddedIcon .glyph {
- fill: #486D91;
-}
-
-#device-details-panel .editable {
- cursor: pointer;
- border-bottom: 1px dashed darkgreen;
-}
-
-#device-details-panel td.label {
- /* works for both light and dark themes ... */
- color: #777;
-}
-
-.light #device-details-panel hr {
- opacity: .5;
- border-color: #FFF;
-}
-.dark #device-details-panel hr {
- border-color: #666;
-}
.light #device-details-panel .bottom th {
- background-color: #CCC;
- /* default text color */
+ background-color: #e5e5e6;
}
.dark #device-details-panel .bottom th {
- background-color: #131313;
- color: #ccc;
+ /* TODO: dark theme */
+ background-color: #e5e5e6;
}
.light #device-details-panel .bottom tr:nth-child(odd) {
- background-color: #f9f9f9;
+ background-color: #fbfbfb;
}
.light #device-details-panel .bottom tr:nth-child(even) {
- background-color: #EBEDF2;
+ background-color: #f4f4f4;
}
.dark #device-details-panel .bottom tr:nth-child(odd) {
- background-color: #333;
+ /* TODO: dark theme */
+ background-color: #fbfbfb;
}
.dark #device-details-panel .bottom tr:nth-child(even) {
- background-color: #555;
+ /* TODO: dark theme */
+ background-color: #f4f4f4;
}
diff --git a/web/gui/src/main/webapp/app/view/device/device.css b/web/gui/src/main/webapp/app/view/device/device.css
index a84286d..fe3c47e 100644
--- a/web/gui/src/main/webapp/app/view/device/device.css
+++ b/web/gui/src/main/webapp/app/view/device/device.css
@@ -29,8 +29,6 @@
/* More in generic panel.css */
#device-details-panel.floatpanel {
- -moz-border-radius: 0;
- border-radius: 0;
z-index: 0;
}
@@ -41,8 +39,8 @@
#device-details-panel .close-btn {
position: absolute;
- right: 10px;
- top: 0;
+ right: 6px;
+ top: 6px;
cursor: pointer;
}
@@ -59,7 +57,8 @@
#device-details-panel h2 input {
- font-size: 1.0em;
+ font-size: 0.90em;
+ width: 106%;
}
#device-details-panel .top div.left {
@@ -71,20 +70,20 @@
}
#device-details-panel td.label {
- font-style: italic;
- padding-right: 12px;
+ font-weight: bold;
+ text-align: right;
+ padding-right: 6px;
}
#device-details-panel .actionBtns div {
padding: 12px 6px;
}
-#device-details-panel .top hr {
- width: 95%;
- margin: 0 auto;
+#device-details-panel hr {
+ width: 100%;
+ margin: 2px auto;
}
-
#device-details-panel .bottom table {
border-spacing: 0;
}
@@ -93,7 +92,6 @@
letter-spacing: 0.02em;
}
-
#device-details-panel .bottom th,
#device-details-panel .bottom td {
padding: 6px 12px;
diff --git a/web/gui/src/main/webapp/app/view/device/device.html b/web/gui/src/main/webapp/app/view/device/device.html
index b4d1ec0..252ae6b 100644
--- a/web/gui/src/main/webapp/app/view/device/device.html
+++ b/web/gui/src/main/webapp/app/view/device/device.html
@@ -42,7 +42,7 @@
<td colId="type" class="table-icon"></td>
<td colId="name" sortable>Friendly Name </td>
<td colId="id" sortable>Device ID </td>
- <td colId="masterid" sortable>Master Instance </td>
+ <td colId="masterid" col-width="100px" sortable>Master </td>
<td colId="num_ports" col-width="70px" sortable>Ports </td>
<td colId="mfr" sortable>Vendor </td>
<td colId="hw" sortable>H/W Version </td>
diff --git a/web/gui/src/main/webapp/app/view/device/device.js b/web/gui/src/main/webapp/app/view/device/device.js
index 78834f6..c1a64f4 100644
--- a/web/gui/src/main/webapp/app/view/device/device.js
+++ b/web/gui/src/main/webapp/app/view/device/device.js
@@ -35,7 +35,7 @@
editingName = false;
// constants
- var topPdg = 13,
+ var topPdg = 28,
ctnrPdg = 24,
scrollSize = 17,
portsTblPdg = 50,
@@ -71,14 +71,13 @@
}
function addCloseBtn(div) {
- is.loadEmbeddedIcon(div, 'plus', 30);
- div.select('g').attr('transform', 'translate(25, 0) rotate(45)');
+ is.loadEmbeddedIcon(div, 'close', 20);
div.on('click', closePanel);
}
function exitEditMode(nameH2, name) {
nameH2.html(name);
- nameH2.classed('editable', true);
+ nameH2.classed('editable clickable', true);
editingName = false;
ks.enableGlobalKeys(true);
}
@@ -112,7 +111,7 @@
tf, el;
if (!editingName) {
- nameH2.classed('editable', false);
+ nameH2.classed('editable clickable', false);
nameH2.html('');
tf = nameH2.append('input').classed('name-input', true)
.attr('type', 'text')
@@ -139,7 +138,7 @@
closeBtn = top.append('div').classed('close-btn', true);
addCloseBtn(closeBtn);
iconDiv = top.append('div').classed('dev-icon', true);
- top.append('h2').classed('editable', true).on('click', editName);
+ top.append('h2').classed('editable clickable', true).on('click', editName);
tblDiv = top.append('div').classed('top-tables', true);
tblDiv.append('div').classed('left', true).append('table');