From b99c0f195fa0001a0ac44e83e355e26788c17607 Mon Sep 17 00:00:00 2001
From: Adam Dodman <adam.dodman@gmx.com>
Date: Thu, 5 Oct 2017 22:05:34 +0100
Subject: [PATCH] Move some structure to child files, allows more flexibility

---
 templates/add_quote.html    |  2 ++
 templates/index.html        |  2 ++
 templates/layout.html       |  2 ++
 templates/login.html        |  2 ++
 templates/passwd_reset.html |  3 +-
 templates/quote_view.html   | 62 ++++++++++++++++++++-----------------
 6 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/templates/add_quote.html b/templates/add_quote.html
index ca74781..6eb2ce3 100644
--- a/templates/add_quote.html
+++ b/templates/add_quote.html
@@ -1,5 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
+<div class="container">
 <h1> Add new Quote </h1>
 <form method="post">
   <div class="form-group">
@@ -24,4 +25,5 @@
   </div>
 
 </form>
+</div>
 {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index b8a0b48..456e5fa 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,8 +1,10 @@
 {% extends "layout.html" %}
 {% block body %}
+<div class="container">
 <div class="jumbotron">
   <h1>Clockwork Quotes Database</h1>
   <p><a class="btn btn-lg btn-success" href="/quotes" role="button">View Quotes</a></p>
   <p><a class="btn btn-lg btn-info" href="/addquote" role="button">Add a Quote</a></p>
 </div>
+</div>
 {% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index ea11ba9..24ef3c9 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -54,8 +54,10 @@
     {% endfor %}
   {% endif %}
   {% endwith %}
+  </div>
   {% block body %}{% endblock %}
 
+  <div class="container">
   <footer class="footer">
     <p>&copy; Adam Dodman 2017</p>
   </footer>
diff --git a/templates/login.html b/templates/login.html
index b6a01f0..cd43fe0 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,5 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
+<div class="container">
 <form  method="post" role="form" data-toggle="validator">
   <div class="form-group has-feedback">
     <label class="control-label col-sm-4" for="username">Username:</label>
@@ -21,6 +22,7 @@
     </div>
   </div>
 </form>
+</div>
 
 
 {% endblock %}
diff --git a/templates/passwd_reset.html b/templates/passwd_reset.html
index 9ab71f2..08330a1 100644
--- a/templates/passwd_reset.html
+++ b/templates/passwd_reset.html
@@ -1,5 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
+<div class="container">
 <h1> Password Reset: </h1>
 <form  method="post" role="form" data-toggle="validator">
   <div class="form-group">
@@ -29,6 +30,6 @@
     </div>
   </div>
 </form>
-
+</div>
 
 {% endblock %}
diff --git a/templates/quote_view.html b/templates/quote_view.html
index 8dc0b69..ad0d16e 100644
--- a/templates/quote_view.html
+++ b/templates/quote_view.html
@@ -17,34 +17,38 @@
 {% endblock %}
 
 {% block body %}
-  <div class="table-responsive">
-    <table class="table table-hover table-bordered" id="QuoteTable">
-      <thead>
-        <tr>
-          <th>Date Added</th>
-          <th>User</th>
-          <th>Quote</th>
-          <th>Context</th>
-          {% if data[1] %}
-          <th>Added By:</th>
-          <th><span class="glyphicon glyphicon-trash"></span></th>
-          {% endif %}
-        </tr>
-      </thead>
-      <tbody>
-  {% for entry in data[0] %}
-        <tr>
-          <td><a href="/">{{ entry[2] }}</a></td>
-          <td>{{ uid_to_user(entry[3]) }}</td>
-          <td>{{ entry[1] }}</td>
-          <td>{{ entry[4] }}</td>
-          {% if data[1] %}
-          <td>{{ uid_to_user(entry[5]) }}</td>
-          <td><a href="/deletequote?id={{ entry[0] }}" class="btn btn-danger"role="button" ><span class="glyphicon glyphicon-trash"></span></a></td>
-          {% endif %}
-        </tr>
-  {% endfor %}
-      </tbody>
-    </table>
+<div class="container-fluid">
+  <div class="col-md-12">
+    <div class="table-responsive">
+      <table class="table table-hover table-bordered" id="QuoteTable">
+        <thead>
+          <tr>
+            <th>Date Added</th>
+            <th>User</th>
+            <th>Quote</th>
+            <th>Context</th>
+            {% if data[1] %}
+            <th>Added By:</th>
+            <th><span class="glyphicon glyphicon-trash"></span></th>
+            {% endif %}
+          </tr>
+        </thead>
+        <tbody>
+    {% for entry in data[0] %}
+          <tr>
+            <td><a href="/">{{ entry[2] }}</a></td>
+            <td>{{ uid_to_user(entry[3]) }}</td>
+            <td>{{ entry[1] }}</td>
+            <td>{{ entry[4] }}</td>
+            {% if data[1] %}
+            <td>{{ uid_to_user(entry[5]) }}</td>
+            <td><a href="/deletequote?id={{ entry[0] }}" class="btn btn-danger"role="button" ><span class="glyphicon glyphicon-trash"></span></a></td>
+            {% endif %}
+          </tr>
+    {% endfor %}
+        </tbody>
+      </table>
+    </div>
   </div>
+</div>
 {% endblock %}