layout changed, jquery added, comparision fixed
diff --git a/web_app/templates/base.html b/web_app/templates/base.html
index 2067d55..8612238 100644
--- a/web_app/templates/base.html
+++ b/web_app/templates/base.html
@@ -2,9 +2,13 @@
<html>
<head>
{% block head %}
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css"/>
+ <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
+ <script type="text/javascript" src="{{ url_for('static', filename='script.js')}}"></script>
+ <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap-combined.min.css" rel="stylesheet">
+ <style type=text/css>{{ get_resource_as_string('static/style.css') }}</style>
{% endblock %}
</head>
<body>
diff --git a/web_app/templates/index.html b/web_app/templates/index.html
index 3b37939..1ac9b26 100644
--- a/web_app/templates/index.html
+++ b/web_app/templates/index.html
@@ -7,23 +7,19 @@
{% endblock %}
</head>
<body>
- <h1>Tests</h1>
{% block body %}
<div>
- <table>
+ <h1 align="center">Tests report : </h1>
+ <table align="center" class="table table-striped">
<th>Build name</th>
<th> Date </th>
{% for test in tests %}
<tr>
<td>
- <h2>
- <a href="{{ test.url }} ">{{ test.name }}</a>
- </h2>
+ <a href="{{ test.url }} ">{{ test.name }}</a>
</td>
<td>
- <h3>
- {{ test.date }}
- </h3>
+ {{ test.date }}
</td>
</tr>
{% endfor %}
diff --git a/web_app/templates/lab_header.html b/web_app/templates/lab_header.html
index 203adf2..f40d6f4 100644
--- a/web_app/templates/lab_header.html
+++ b/web_app/templates/lab_header.html
@@ -5,34 +5,49 @@
{% for node in lab.nodes %}
{% for p in node.processors %}
- <div>
- Processor model : {{ p.model }}
- Processor frequency : {{ p.frequency }}
- </div>
+ <ul>
+ <li>
+ Processor model : {{ p.model }}
+ Processor frequency : {{ p.frequency }}
+ </li>
+ </ul>
{% endfor %}
{% for i in node.interfaces %}
- <div>
- name : {{ i.name }}
- MAC frequency : {{ i.mac }}
- max speed : {{ i.max_speed }}
- current speed : {{ i.current_speed }}
- state : {{ i.state }}
- </div>
+ <ul>
+ <li>
+ <div>
+
+ name : {{ i.name }}
+ MAC frequency : {{ i.mac }}
+ max speed : {{ i.max_speed }}
+ current speed : {{ i.current_speed }}
+ state : {{ i.state }}
+ </div>
+ </li>
+ </ul>
{% endfor %}
{% for disk in node.disks %}
- <div>
- Disk name : {{ disk.name }}
- Size: {{ disk.size }}
- </div>
+ <ul>
+ <li>
+ <div>
+ Disk name : {{ disk.name }}
+ Size: {{ disk.size }}
+ </div>
+ </li>
+ </ul>
{% endfor %}
- <div>
- Memory total : node.memory.total
- Memory : node.memory.maximum_capacity
- </div>
-
+ <ul>
+ <li>
+ <div>
+ Memory total : node.memory.total
+ Memory : node.memory.maximum_capacity
+ </div>
+ </li>
+ </ul>
+</ul>
{% endfor %}
</div>
\ No newline at end of file
diff --git a/web_app/templates/table.html b/web_app/templates/table.html
index ae9a2be..76ef6de 100644
--- a/web_app/templates/table.html
+++ b/web_app/templates/table.html
@@ -12,7 +12,7 @@
</div>
{% block body %}
<h1 align="center">Perf-1-Env</h1>
- <table class="table" width="600">
+ <table class="table table-bordered" width="600">
{% for header in headers %}
<th>
{{ header }}
diff --git a/web_app/templates/test.html b/web_app/templates/test.html
index d3b233f..aba2f60 100644
--- a/web_app/templates/test.html
+++ b/web_app/templates/test.html
@@ -13,7 +13,7 @@
<br>
<div class="table-responsive">
<div id="images">
- <table align="center" cellspacing="20">
+ <table align="center" class="table table-bordered">
{% for url in urls %}
{% if loop.index is divisibleby 2 %}
<tr>