From b7311f230812038a8e2c144a4e740c6f5f6bccaa Mon Sep 17 00:00:00 2001
From: binaryDiv <binarydiv@gmail.com>
Date: Sun, 10 Nov 2019 23:37:31 +0100
Subject: [PATCH] #4: add base template; extend base template in views

---
 issues/templates/issues/detail.html    | 18 +++++++++-----
 issues/templates/issues/index.html     | 30 ++++++++++++++---------
 issues/templates/issues/new.html       | 32 ++++++++++++++----------
 projects/templates/projects/index.html | 28 ++++++++++++---------
 projects/templates/projects/view.html  | 34 +++++++++++++++-----------
 templates/base.html                    | 12 +++++++++
 templates/registration/login.html      | 18 +++++++++-----
 7 files changed, 110 insertions(+), 62 deletions(-)
 create mode 100644 templates/base.html

diff --git a/issues/templates/issues/detail.html b/issues/templates/issues/detail.html
index 42ea47c..e25b70d 100644
--- a/issues/templates/issues/detail.html
+++ b/issues/templates/issues/detail.html
@@ -1,6 +1,12 @@
-<h2>#{{ issue.id }}: {{ issue.title }}</h2>
-<p>
-    <b>Project:</b> {{ issue.project }}<br/>
-    <b>Created:</b> {{ issue.create_date }}
-</p>
-<p>{{ issue.text }}</p>
\ No newline at end of file
+{% extends "base.html" %}
+
+{% block title %}Issue: {{ issue.title }}{% endblock %}
+
+{% block content %}
+    <h2>#{{ issue.id }}: {{ issue.title }}</h2>
+    <p>
+        <b>Project:</b> {{ issue.project }}<br/>
+        <b>Created:</b> {{ issue.create_date }}
+    </p>
+    <p>{{ issue.text }}</p>
+{% endblock %}
diff --git a/issues/templates/issues/index.html b/issues/templates/issues/index.html
index c109698..9eb3e07 100644
--- a/issues/templates/issues/index.html
+++ b/issues/templates/issues/index.html
@@ -1,13 +1,19 @@
-{% if issue_list %}
-    <ul>
-    {% for issue in issue_list %}
-        <li>
-            <a href="{% url 'issues:detail' issue.id %}">{{ issue.title }}</a>
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
-    <p>No issues.</p>
-{% endif %}
+{% extends "base.html" %}
 
-<p><a href="{% url 'issues:new' %}">Create new issue</a></p>
+{% block title %}Issues{% endblock %}
+
+{% block content %}
+    {% if issue_list %}
+        <ul>
+        {% for issue in issue_list %}
+            <li>
+                <a href="{% url 'issues:detail' issue.id %}">{{ issue.title }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>No issues.</p>
+    {% endif %}
+
+    <p><a href="{% url 'issues:new' %}">Create new issue</a></p>
+{% endblock %}
diff --git a/issues/templates/issues/new.html b/issues/templates/issues/new.html
index e9b9899..0e6d87c 100644
--- a/issues/templates/issues/new.html
+++ b/issues/templates/issues/new.html
@@ -1,15 +1,21 @@
-<h2>Create new issue</h2>
+{% extends "base.html" %}
 
-{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+{% block title %}Create issue{% endblock %}
 
-<form action="{% url 'issues:new' %}" method="post">
-    {% csrf_token %}
-    <table>
-        {{ form.as_table }}
-        <tr>
-            <td colspan="2">
-                <input type="submit" value="Create issue" />
-            </td>
-        </tr>
-    </table>
-</form>
+{% block content %}
+    <h2>Create new issue</h2>
+
+    {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+    <form action="{% url 'issues:new' %}" method="post">
+        {% csrf_token %}
+        <table>
+            {{ form.as_table }}
+            <tr>
+                <td colspan="2">
+                    <input type="submit" value="Create issue" />
+                </td>
+            </tr>
+        </table>
+    </form>
+{% endblock %}
diff --git a/projects/templates/projects/index.html b/projects/templates/projects/index.html
index b64c0da..ee9bb64 100644
--- a/projects/templates/projects/index.html
+++ b/projects/templates/projects/index.html
@@ -1,11 +1,17 @@
-{% if project_list %}
-    <ul>
-    {% for project in project_list %}
-        <li>
-            <a href="{% url 'projects:view' project.project_key %}">{{ project.project_key }}: {{ project.name }}</a>
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
-    <p>No projects.</p>
-{% endif %}
\ No newline at end of file
+{% extends "base.html" %}
+
+{% block title %}Projects{% endblock %}
+
+{% block content %}
+    {% if project_list %}
+        <ul>
+        {% for project in project_list %}
+            <li>
+                <a href="{% url 'projects:view' project.project_key %}">{{ project.project_key }}: {{ project.name }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>No projects.</p>
+    {% endif %}
+{% endblock %}
diff --git a/projects/templates/projects/view.html b/projects/templates/projects/view.html
index e38e16f..afae756 100644
--- a/projects/templates/projects/view.html
+++ b/projects/templates/projects/view.html
@@ -1,15 +1,21 @@
-<h2>{{ project.project_key }} - {{ project.name }}</h2>
-<p>{{ project.description }}</p>
+{% extends "base.html" %}
 
-<h3>Issues</h3>
-{% if issue_list %}
-    <ul>
-    {% for issue in issue_list %}
-        <li>
-            <a href="{% url 'issues:detail' issue.id %}">{{ issue.title }}</a>
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
-    <p>This project has no issues yet.</p>
-{% endif %}
\ No newline at end of file
+{% block title %}Project: {{ project.name }}{% endblock %}
+
+{% block content %}
+    <h2>{{ project.project_key }} - {{ project.name }}</h2>
+    <p>{{ project.description }}</p>
+
+    <h3>Issues</h3>
+    {% if issue_list %}
+        <ul>
+        {% for issue in issue_list %}
+            <li>
+                <a href="{% url 'issues:detail' issue.id %}">{{ issue.title }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>This project has no issues yet.</p>
+    {% endif %}
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..c54107f
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{% block title %}Tofu{% endblock %} - Tofu</title>
+</head>
+
+<body>
+    <h1>Tofu</h1>
+
+    {% block content %}No content.{% endblock %}
+</body>
+</html>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 1325723..f3d53be 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,7 +1,13 @@
-<h2>Login</h2>
+{% extends "base.html" %}
 
-<form method="POST">
-    {% csrf_token %}
-    {{ form.as_p }}
-    <button type="submit">Login</button>
-</form>
+{% block title %}Login{% endblock %}
+
+{% block content %}
+    <h2>Login</h2>
+
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Login</button>
+    </form>
+{% endblock %}