Home Explore Help
Sign In
david
/
TDD
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Use Bootstrap to improve layout

david 5 years ago
parent
65c381390e
commit
e89ccd9ab5
4 changed files with 37 additions and 13 deletions
Split View Show Diff Stats
  1. 2 2
      functional_tests/tests.py
  2. 32 8
      lists/templates/base.html
  3. 1 1
      lists/templates/home.html
  4. 2 2
      lists/templates/list.html

+ 2 - 2
functional_tests/tests.py
View File 

@@ -1,4 +1,4 @@
 
-from django.test import LiveServerTestCase
 
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 
 from selenium import webdriver
 
 from selenium.webdriver.common.keys import Keys
 
 from selenium.common.exceptions import WebDriverException
 
@@ -6,7 +6,7 @@ import time
 
 
 MAX_WAIT = 10
 
 
-class NewVisitorTest(LiveServerTestCase):
 
+class NewVisitorTest(StaticLiveServerTestCase):
 
 
     def setUp(self):
 
         #self.browser = webdriver.Firefox()

+ 32 - 8
lists/templates/base.html
View File 

@@ -1,15 +1,39 @@
 
-<html>
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
   <head>
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>To-Do lists</title>
 
+    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
+    <link href="/static/base.css" rel="stylesheet">
 
   </head>
 
 
   <body>
 
-    <h1>{% block header_text %}{% endblock %}</h1>
 
-    <form method="POST" action="{% block form_action %}{% endblock %}">
 
-      <input name="item_text" id="id_new_item" placeholder="Enter a to-do item" />
 
-      {% csrf_token %}
 
-    </form>
 
-    {% block table %}
 
-    {% endblock %}
 
+    <div class="container">
 
+
 
+      <div class="row">
 
+        <div class="col-md-6 col-md-offset-3 jumbotron">
 
+          <div class="text-center">
 
+            <h1>{% block header_text %}{% endblock %}</h1>
 
+            <form method="POST" action="{% block form_action %}{% endblock %}">
 
+              <input name="item_text" id="id_new_item"
 
+                class="form-control input-lg"
 
+                placeholder="Enter a to-do item" />
 
+              {% csrf_token %}
 
+            </form>
 
+          </div>
 
+        </div>
 
+      </div>
 
+
 
+      <div class="row">
 
+        <div class="col-md-6 col-md-offset-3">
 
+          {% block table %}
 
+          {% endblock %}
 
+        </div>
 
+      </div>
 
+
 
+    </div>
 
   </body>
 
 </html>

+ 1 - 1
lists/templates/home.html
View File 

@@ -1,5 +1,5 @@
 
 {% extends "base.html" %}
 
 
-{% block header_text %}Start a new To-Do list{% endblock %}
 
+{% block header_text %}To-Do list{% endblock %}
 
 
 {% block form_action %}/lists/new{% endblock %}

+ 2 - 2
lists/templates/list.html
View File 

@@ -1,11 +1,11 @@
 
 {% extends 'base.html' %}
 
 
-{% block header_text %}Your To-Do list{% endblock %}
 
+{% block header_text %}To-Do list{% endblock %}
 
 
 {% block form_action %}/lists/{{ list.id }}/add_item{% endblock %}
 
 
 {% block table %}
 
-  <table id="id_list_table">
 
+  <table id="id_list_table" class="table">
 
     {% for item in list.item_set.all %}
 
       <tr><td>{{ forloop.counter }}: {{ item.text }}</td></tr>
 
     {% endfor %}