From 8312d92a637e9ca421305192b313160eb9f33709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Nut=CC=A6iu?= <denis.nutiu@gmail.com>
Date: Thu, 13 Apr 2017 22:38:22 +0300
Subject: [PATCH] Upgrading to bootstrap

---
 src/static/style.css      | 44 ++++++++++++++++++-----------
 src/templates/index.html  | 59 +++++++++++++++++++--------------------
 src/templates/mybase.html | 37 +++++++++++++++++++++---
 3 files changed, 90 insertions(+), 50 deletions(-)
diff --git a/src/static/style.css b/src/static/style.css
index 8042fa7..ebae6d7 100644
--- a/src/static/style.css
+++ b/src/static/style.css
@@ -16,27 +16,39 @@
     along with scoreboard-benchmark .  If not, see <http://www.gnu.org/licenses/>.
  */
 
-header {
-    text-align: center;
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  /* Margin bottom by footer height */
+  margin-bottom: 60px;
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  /* Set the fixed height of the footer here */
+  height: 60px;
+  line-height: 60px; /* Vertically center the text there */
+  background-color: #f5f5f5;
 }
 
 
-footer {
-    text-align: center;
+/* Custom page CSS
+-------------------------------------------------- */
+
+body > .container {
+  padding: 60px 15px 0;
 }
 
-main table {
-    font-family: arial, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
+.footer > .container {
+  padding-right: 15px;
+  padding-left: 15px;
 }
 
-main td, main th {
-    border: 1px solid #dddddd;
-    text-align: left;
-    padding: 8px;
-}
-
-main tr:nth-child(even) {
-    background-color: #dddddd;
+code {
+  font-size: 80%;
 }
\ No newline at end of file
diff --git a/src/templates/index.html b/src/templates/index.html
index bc9d1b0..9e208e5 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -1,35 +1,34 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="author" content="Metonymy">
-    <meta name="description" content="The scoreboard for the benchmarks!">
-    <meta name="keywords" content="flask python metonymyqt benchmark scoreboard">
-    <link rel="stylesheet" href="{{ url_for('static', filename='style.css')}}">
-    <title>Scoreboard!</title>
-</head>
-<body>
-    <header>
-        <h1>The Scoreboard!</h1>
-    </header>
-    <main>
-        <table>
+{% extends "mybase.html" %}
+
+{% block main %}
+{{ super() }}
+<div class="panel panel-default">
+    <!-- Default panel contents -->
+    <div class="panel-heading">Scoreboard</div>
+    <div class="panel-body">
+        <p>The results are send here via JSON from the java app.</p>
+    </div>
+
+  <!-- Table -->
+    <table class="table">
+        <thead>
             <tr>
-                <th>Text</th>
+                <th>GPU</th>
+                <th>CPU</th>
                 <th>Score</th>
-                <th>Information</th>
+                <th>Details</th>
             </tr>
+        </thead>
+        <tbody>
             {% for item in results %}
-                <tr>
-                    <td>{{ item.text }}</td>
-                    <td>{{ item.score }}</td>
-                    <td><a href="{{ url_for('scoreboard.entry', id=item.id) }}">See more</a></td>
-                </tr>
+            <tr>
+                <td>{{ item.gpu }}</td>
+                <td>{{ item.cpu }}</td>
+                <td>{{ item.score }}</td>
+                <td><a href="{{ url_for('scoreboard.entry', id=item.id) }}">See more</a></td>
+            </tr>
             {% endfor %}
-        </table>
-    </main>
-    <footer>
-        Copyright 2017 Fellowship of the Bits
-    </footer>
-</body>
-</html>
\ No newline at end of file
+        </tbody>
+    </table>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/templates/mybase.html b/src/templates/mybase.html
index 5b4e8ad..fc1476f 100644
--- a/src/templates/mybase.html
+++ b/src/templates/mybase.html
@@ -7,16 +7,45 @@
 <meta name="keywords" content="flask python metonymyqt benchmark scoreboard">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 {% endblock %}
+{% block styles %}
+{{super()}}
+<link rel="stylesheet"
+      href="{{url_for('static', filename='style.css')}}">
+{% endblock %}
 
+{% block content %}
+
+<div class="navbar navbar-default" role="navigation">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle"
+            data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        <a class="navbar-brand" href="/">FOTB</a> </div>
+        <div class="navbar-collapse collapse"> <ul class="nav navbar-nav">
+            <li><a href="/">Home</a></li> </ul>
+        </div>
+    </div>
+</div>
 
 <header>
     {% block header %}
     {% endblock %}
+    <div class="alert alert-info" role="alert">
+        <strong>Heads up!</strong> This application is not complete! If you find any bugs please report them to:
+        <a href="mailto:metonymy@fedoraproject.com">Metonymy</a>
+    </div>
 </header>
-<main>
+<div class="container" role="main">
     {% block main %}
     {% endblock %}
-</main>
-<footer>
-    Copyright 2017 Fellowship of the Bits
+</div>
+<footer class="footer">
+    <div class="container">
+        <span class="text-muted">Copyright © 2017 Fellowship of the Bits</span>
+    </div>
 </footer>
+{% endblock %}

Text	GPU	CPU	Score	Information	Details
{{ item.text }}	{{ item.score }}	See more
{{ item.gpu }}	{{ item.cpu }}	{{ item.score }}	See more