From 4a26c0c397dd467afb1cf9723fe907c1f54f766e Mon Sep 17 00:00:00 2001
From: Mike Cohen <mike.cohen@bigswitch.com>
Date: Thu, 3 May 2012 22:25:44 -0700
Subject: [PATCH] Cleaned up web ui with Floodlight logo
---
src/main/resources/web/css/bootstrap.css | 54 ++++++++++++--------
src/main/resources/web/img/floodlight.png | Bin 0 -> 7972 bytes
src/main/resources/web/index.html | 5 ++
src/main/resources/web/js/main.js | 4 +-
src/main/resources/web/js/views/topology.js | 4 +-
src/main/resources/web/tpl/header.html | 6 +--
src/main/resources/web/tpl/status.html | 11 ++--
7 files changed, 51 insertions(+), 33 deletions(-)
create mode 100644 src/main/resources/web/img/floodlight.png
diff --git a/src/main/resources/web/css/bootstrap.css b/src/main/resources/web/css/bootstrap.css
index 495188af7..98f31f3f0 100644
--- a/src/main/resources/web/css/bootstrap.css
+++ b/src/main/resources/web/css/bootstrap.css
@@ -135,8 +135,8 @@ body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18px;
- color: #333333;
- background-color: #ffffff;
+ color: #0c028; /* #333333 */
+ background-color: white; /* #ffffff; */
}
a {
color: #0088cc;
@@ -148,6 +148,7 @@ a:hover {
}
.row {
margin-left: -20px;
+ margin-top: 5px;
*zoom: 1;
}
.row:before,
@@ -358,21 +359,21 @@ h6 small {
color: #999999;
}
h1 {
- font-size: 30px;
- line-height: 36px;
+ font-size: 23px;
+ line-height: 25px;
}
h1 small {
font-size: 18px;
}
h2 {
- font-size: 24px;
- line-height: 36px;
+ font-size: 18px;
+ line-height: 22px;
}
h2 small {
font-size: 18px;
}
h3 {
- line-height: 27px;
+ line-height: 18px;
font-size: 18px;
}
h3 small {
@@ -381,7 +382,7 @@ h3 small {
h4,
h5,
h6 {
- line-height: 18px;
+ line-height: 16px;
}
h4 {
font-size: 14px;
@@ -2489,7 +2490,7 @@ input[type="submit"].btn.btn-mini {
font-size: 11px;
font-weight: bold;
line-height: 18px;
- color: #999999;
+ color: white;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
}
@@ -2782,8 +2783,9 @@ input[type="submit"].btn.btn-mini {
.navbar-inner {
padding-left: 20px;
padding-right: 20px;
- background-color: #2c2c2c;
- background-image: -moz-linear-gradient(top, #333333, #222222);
+ background-color: white;
+ border-bottom: 2px solid #221e50;
+/* background-image: -moz-linear-gradient(top, #333333, #222222);
background-image: -ms-linear-gradient(top, #333333, #222222);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
background-image: -webkit-linear-gradient(top, #333333, #222222);
@@ -2796,7 +2798,7 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);*/
}
.navbar .container {
width: auto;
@@ -2919,7 +2921,7 @@ input[type="submit"].btn.btn-mini {
.navbar-search {
position: relative;
float: left;
- margin-top: 6px;
+ margin-top: 17px;
margin-bottom: 0;
}
.navbar-search .search-query {
@@ -2989,40 +2991,42 @@ input[type="submit"].btn.btn-mini {
left: 0;
display: block;
float: left;
- margin: 0 10px 0 0;
+ margin: 0 10px 0px 0;
}
.navbar .nav.pull-right {
float: right;
}
.navbar .nav > li {
display: block;
+ margin-top: 10px;
+ font-size: 130%;
float: left;
}
.navbar .nav > li > a {
float: none;
padding: 10px 10px 11px;
- line-height: 19px;
- color: #999999;
+ line-height: 25px;
+ color: #221e50;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.navbar .nav > li > a:hover {
background-color: transparent;
- color: #ffffff;
- text-decoration: none;
+ color: #221e50;
+ text-decoration: underline;
}
.navbar .nav .active > a,
.navbar .nav .active > a:hover {
- color: #ffffff;
- text-decoration: none;
- background-color: #222222;
+ color: #221e50;
+ text-decoration: underline;
+ background-color: white;
}
.navbar .divider-vertical {
height: 40px;
width: 1px;
margin: 0 9px;
overflow: hidden;
- background-color: #222222;
+ background-color: white;
border-right: 1px solid #333333;
}
.navbar .nav.pull-right {
@@ -3988,3 +3992,9 @@ a.thumbnail:hover {
.invisible {
visibility: hidden;
}
+
+td.status-head {
+ font-weight:bold;
+ width:150px;
+ padding:7px;
+}
\ No newline at end of file
diff --git a/src/main/resources/web/img/floodlight.png b/src/main/resources/web/img/floodlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..98d047798ecd496ae12a2dfc8025ebfb3423417a
GIT binary patch
literal 7972
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
aM+mX$N8}*@T6e9l78YwUl{xk&qyGzXk>T?I
literal 0
HcmV?d00001
diff --git a/src/main/resources/web/index.html b/src/main/resources/web/index.html
index 78118293f..1812037ae 100644
--- a/src/main/resources/web/index.html
+++ b/src/main/resources/web/index.html
@@ -51,7 +51,11 @@
<div class="header"></div>
<!-- FIXME closing these alerts returns to the dashboard; why? -->
+
+
<div class="container">
+
+<!--
<div class="row">
<div class="span12">
<div class="alert alert-info">
@@ -69,6 +73,7 @@ This Web interface is <strong>incomplete and buggy</strong>! Don't be surprised
</div>
</div>
</div>
+-->
<div id="content"></div>
diff --git a/src/main/resources/web/js/main.js b/src/main/resources/web/js/main.js
index 00f0b9feb..cde561b7f 100644
--- a/src/main/resources/web/js/main.js
+++ b/src/main/resources/web/js/main.js
@@ -99,8 +99,9 @@ tpl.loadTemplates(['home', 'status', 'topology', 'header', 'switch', 'switch-lis
$(document).ready(function () {
// trigger Backbone routing when clicking on links, thanks to Atinux and pbnv
+ app.navigate("", true);
- window.document.addEventListener('click', function(e) {
+ window.document.addEventListener('click', function(e) {
e = e || window.event
var target = e.target || e.srcElement
if ( target.nodeName.toLowerCase() === 'a' ) {
@@ -112,6 +113,7 @@ tpl.loadTemplates(['home', 'status', 'topology', 'header', 'switch', 'switch-lis
window.addEventListener('popstate', function(e) {
app.navigate(location.pathname.substr(1), true);
});
+
});
});
diff --git a/src/main/resources/web/js/views/topology.js b/src/main/resources/web/js/views/topology.js
index b79694895..dee1461f6 100644
--- a/src/main/resources/web/js/views/topology.js
+++ b/src/main/resources/web/js/views/topology.js
@@ -25,8 +25,8 @@ window.TopologyView = Backbone.View.extend({
render:function (eventName) {
$(this.el).html(this.template());
// code from D3 force-directed graph example since there's no other docs
- var width = 940,
- height = 940; // might as well make it square
+ var width = 500,
+ height = 400; // might as well make it square
var color = d3.scale.category20();
var force = d3.layout.force()
.charge(-120)
diff --git a/src/main/resources/web/tpl/header.html b/src/main/resources/web/tpl/header.html
index ca69b473d..ae4545bab 100644
--- a/src/main/resources/web/tpl/header.html
+++ b/src/main/resources/web/tpl/header.html
@@ -1,3 +1,4 @@
+
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
@@ -7,8 +8,7 @@
<span class="icon-bar"></span>
</a>
<!-- TODO we could use a better version of the OF logo without the drop shadow -->
- <img src="img/openflow-logo-40px.png" style="float:left;">
- <a class="brand" href="/">Floodlight</a>
+ <img src="img/floodlight.png" style="float:left;">
<div class="nav-collapse">
<ul class="nav">
@@ -25,4 +25,4 @@
<!--/.nav-collapse -->
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/resources/web/tpl/status.html b/src/main/resources/web/tpl/status.html
index a5da864c5..86b77bf39 100644
--- a/src/main/resources/web/tpl/status.html
+++ b/src/main/resources/web/tpl/status.html
@@ -3,10 +3,11 @@
<div class="page-header">
<h1>Controller Status</h1>
</div>
-Hostname: <%= host %>:<%= ofport %><br>
-Healthy: <%= healthy %><br>
-Uptime: <%= uptime %><br>
-JVM memory bloat: <%= free %> free out of <%= total %><br>
-Modules loaded: <%= moduleText %>
+<table class="status-table">
+ <tr><td class="status-head">Hostname:<td><%= host %>:<%= ofport %></td></tr>
+ <tr><td class="status-head">Healthy:<td><%= healthy %></td>
+ <tr><td class="status-head">Uptime:<td><%= uptime %><td>
+ <tr><td class="status-head">JVM memory bloat:<td><%= free %> free out of <%= total %></td>
+ <Tr><td class="status-head">Modules loaded:<td><%= moduleText %></td>
</div>
</div>
--
GitLab