Skip to content
Snippets Groups Projects
Commit 01efb19e authored by Wes Felter's avatar Wes Felter
Browse files

UI: Clean up HTML a little.

parent fff3706e
No related branches found
No related tags found
No related merge requests found
Showing
with 60 additions and 79 deletions
......@@ -56,8 +56,8 @@
<hr>
<footer class="footer">
<p><a href="http://floodlight.openflowhub.org/">Floodlight </a> © <a href="http://www.bigswitch.com/">Big Switch Networks</a>, <a href="http://www.research.ibm.com/arl/">IBM</a>, et. al.
Powered by <a href="http://documentcloud.github.com/backbone/">Backbone.js</a>, <a href="http://twitter.github.com/bootstrap/">Bootstrap</a>, <a href="http://jquery.com/">jQuery</a>, <a href="http://mbostock.github.com/d3/">D3.js</a>, etc.</p>
<p><a href="http://floodlight.openflowhub.org/">Floodlight </a> &copy; <a href="http://www.bigswitch.com/">Big Switch Networks</a>, <a href="http://www.research.ibm.com/arl/">IBM</a>, et. al.
Powered by <a href="http://documentcloud.github.com/backbone/">Backbone.js</a>, <a href="http://twitter.github.com/bootstrap/">Bootstrap</a>, <a href="http://jquery.com/">jQuery</a>, <a href="http://mbostock.github.com/d3/">D3.js</a>, etc.</p>
</footer>
</div> <!-- /container -->
......
<td><%= cookie %></td><td><%= priority %></td><td><%= matchHTML %></td><td><%= actionText %></td><td><%= packetCount %></td><td><%= byteCount %></td><td><%= durationSeconds %> s</td><td><%= idleTimeout %> s</td>
<td><%= cookie %></td><td><%= priority %></td><td><%= matchHTML %></td><td><%= actionText %></td><td><%= packetCount %></td><td><%= byteCount %></td><td><%= durationSeconds %> s</td><td><%= idleTimeout %> s</td>
<div class="page-header">
<h1>Flows (<%= nflows %>)</h1>
<h1>Flows (<%= nflows %>)</h1>
</div>
<table class="table table-striped flow-table">
<thead><tr><th>Cookie</th><th>Priority</th><th>Match</th><th>Action</th><th>Packets</th><th>Bytes</th><th>Age</th><th>Timeout</th></tr></thead>
<tbody>
<!-- flows will be inserted here by FlowListView:render -->
</tbody>
<thead><tr><th>Cookie</th><th>Priority</th><th>Match</th><th>Action</th><th>Packets</th><th>Bytes</th><th>Age</th><th>Timeout</th></tr></thead>
<tbody>
<!-- flows will be inserted here by FlowListView:render -->
</tbody>
</table>
<!-- TODO implement pagination -->
<!--
<div class="pagination pagination-right"><ul>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
</ul></div>
-->
\ No newline at end of file
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
......@@ -7,8 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<!-- TODO we could use a better version of the OF logo without the drop shadow -->
<img src="img/floodlight.png" style="float:left;">
<img src="img/floodlight.png" style="float:left;">
<div class="nav-collapse">
<ul class="nav">
......@@ -19,10 +17,10 @@
<!-- <li><a href="/vlans">VLANs</a></li> -->
</ul>
<form id="searchForm" class="navbar-search pull-right dropdown">
<input id="searchText" type="text" class="search-query dropdown-toggle" placeholder="Search (try an IP or MAC address)">
<input id="searchText" type="text" class="search-query dropdown-toggle"
placeholder="Search (try an IP or MAC address)">
</form>
</div>
<!--/.nav-collapse -->
</div> <!--/.nav-collapse -->
</div>
</div>
</div>
......@@ -5,20 +5,3 @@
<div id="host-list"></div>
<!-- <div id="vlan-list"></div> -->
<!-- Floodlight doesn't provide an API for this
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Recent Events</h1>
</div>
<table class="table striped-table">
<thead><tr><th>Time</th><th>Device</th><th>Message</th></tr></thead>
<tbody>
<tr><td>Fri Mar 30 15:16:52 CDT 2012</td><td>Switch <a href="">C</a></td><td><i class="icon-fire"></i> caught on fire.</td></tr>
<tr><td>Fri Mar 30 15:14:15 CDT 2012</td><td>Host <a href="">BroVM</a></td><td><i class="icon-resize-horizontal"></i> moved from <a href="">switch a port x</a> to <a href="">switch b port y</a>.</td></tr>
</tbody>
</table>
</div>
</div>
-->
<td><a href="/host/<%= mac %>"><%= mac %></a></td><!-- <td><%= vlan %></td> --><td><%= ipv4 %></td><td><%= swport %></td><td><%= lastSeen %></td>
<td><a href="/host/<%= mac %>"><%= mac %></a></td><!-- <td><%= vlan %></td> --><td><%= ipv4 %></td><td><%= swport %></td><td><%= lastSeen %></td>
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Hosts (<%= nhosts %>)</h1>
<h1>Hosts (<%= nhosts %>)</h1>
</div>
<table class="table table-striped host-table">
<thead><tr><th>MAC Address</th><!-- <th>VLAN</th> --><th>IP Address</th><th>Switch Port</th><th>Last Seen</th></tr></thead>
<tbody>
<!-- hosts will be inserted here by HostListView.render -->
</tbody>
<thead><tr><th>MAC Address</th><!-- <th>VLAN</th> --><th>IP Address</th><th>Switch Port</th><th>Last Seen</th>
</tr></thead>
<tbody>
<!-- hosts will be inserted here by HostListView.render -->
</tbody>
</table>
<!-- TODO implement pagination -->
<!--
<!--
<div class="pagination pagination-right"><ul>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
</ul></div>
-->
</div>
......
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Host <%= id %></h1>
<h1>Host <%= id %></h1>
</div>
<p>
<!-- VLAN: <a href="/vlan/<%= vlan %>"><%= vlan %></a><br> -->
......
<td><a id="<%= portNumber %>"><%= name %></a></td><td><%= status %></td><td><%= transmitBytes %></td><td><%= receiveBytes %></td><td><%= transmitPackets %></td><td><%= receivePackets %></td><td><%= dropped %></td><td><%= errors %></td>
<td><a id="<%= portNumber %>"><%= name %></a></td><td><%= status %></td><td><%= transmitBytes %></td><td><%= receiveBytes %></td><td><%= transmitPackets %></td><td><%= receivePackets %></td><td><%= dropped %></td><td><%= errors %></td>
<div class="page-header">
<h1>Ports (<%= nports %>)</h1>
<h1>Ports (<%= nports %>)</h1>
</div>
<table class="table table-striped port-table">
<thead><tr><th>#</th><th>Link Status</th><th>TX Bytes</th><th>RX Bytes</th><th>TX Pkts</th><th>RX Pkts</th><th>Dropped</th><th>Errors</th></tr></thead>
<tbody>
<!-- ports will be inserted here by PortListView:render -->
</tbody>
<thead><tr><th>#</th><th>Link Status</th><th>TX Bytes</th><th>RX Bytes</th><th>TX Pkts</th><th>RX Pkts</th><th>Dropped</th><th>Errors</th></tr></thead>
<tbody>
<!-- ports will be inserted here by PortListView:render -->
</tbody>
</table>
<!-- TODO implement pagination -->
<!--
<!--
<div class="pagination pagination-right"><ul>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
</ul></div>
-->
\ No newline at end of file
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Controller Status</h1>
<h1>Controller Status</h1>
</div>
<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>
<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>
<td><a href="/switch/<%= id %>"><%= id %></a></td><td><%= inetAddress %></td><td><%= manufacturerDescription %><td><%= packetCount %></td><td><%= byteCount %></td><td><%= flowCount %></td><td><%= connectedSince %></td>
<td><a href="/switch/<%= id %>"><%= id %></a></td><td><%= inetAddress %></td><td><%= manufacturerDescription %><td><%= packetCount %></td><td><%= byteCount %></td><td><%= flowCount %></td><td><%= connectedSince %></td>
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Switches (<%= nswitches %>)</h1>
<h1>Switches (<%= nswitches %>)</h1>
</div>
<table class="table table-striped switch-table">
<thead><tr><th>DPID</th><th>IP Address</th><th>Vendor</th><th>Packets</th><th>Bytes</th><th>Flows</th><th>Connected Since</th></tr></thead>
<tbody>
<!-- switches will be inserted here by SwitchListView:render -->
</tbody>
<thead><tr><th>DPID</th><th>IP Address</th><th>Vendor</th><th>Packets</th><th>Bytes</th><th>Flows</th><th>Connected Since</th></tr></thead>
<tbody>
<!-- switches will be inserted here by SwitchListView:render -->
</tbody>
</table>
<!-- TODO implement pagination -->
<!--
<!--
<div class="pagination pagination-right"><ul>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
<li><a href="">&larr;</a></li>
<li class="active"><a href="">1</a></li>
<li><a href="">2</a></li>
<li><a href="">&rarr;</a>
</ul></div>
-->
</div>
......
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Switch <%= id %> <%= inetAddress %></h1>
<h1>Switch <%= id %> <%= inetAddress %></h1>
</div>
<p>Connected since <%= connectedSince %><br>
<%= manufacturerDescription %><br>
<%= hardwareDescription %><br>
<%= softwareDescription %><br>
S/N: <%= serialNumber %><br>
<!-- <%= flowCount %> flows -->
</p>
<div id="port-list"></div> <!-- TODO would be nice to make this collapsible -->
......
<div class="row">
<div class="span12">
<div class="page-header">
<h1>Network Topology</h1>
<h1>Network Topology</h1>
</div>
<div id="topology-graph"></div>
</div>
......
<tr><td><a href="/vlan/<%= id %>"><%= id %></a></td><td><%= name %></td><td><%= nhosts %></td></tr>
<tr><td><a href="/vlan/<%= id %>"><%= id %></a></td><td><%= name %></td><td><%= nhosts %></td></tr>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment