Fix #380 Inherit templates in demo app from base template

aio-libs · Mar 26, 2016 · f4312fd · f4312fd
1 parent 2bef9df
commit f4312fd
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/demos/polls/aiohttpdemo_polls/templates/404.html b/demos/polls/aiohttpdemo_polls/templates/404.html
@@ -1 +1,3 @@
-<h1>Page Not Found</h1>
+{% extends "base.html" %}
+
+{% set title = "Page Not Found" %}
diff --git a/demos/polls/aiohttpdemo_polls/templates/500.html b/demos/polls/aiohttpdemo_polls/templates/500.html
@@ -1 +1,3 @@
-<h1>Internal Server Error</h1>
+{% extends "base.html" %}
+
+{% set title = "Internal Server Error" %}
diff --git a/demos/polls/aiohttpdemo_polls/templates/base.html b/demos/polls/aiohttpdemo_polls/templates/base.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    {% block head %}
+        <link rel="stylesheet" type="text/css"
+              href="{{ url('static', filename='style.css') }}" />
+        <title>{{title}}</title>
+    {% endblock %}
+  </head>
+  <body>
+    <h1>{{title}}</h1>
+    <div>
+      {% block content %}
+      {% endblock %}
+    </div>
+  </body>
+</html>
diff --git a/demos/polls/aiohttpdemo_polls/templates/detail.html b/demos/polls/aiohttpdemo_polls/templates/detail.html
@@ -1,5 +1,8 @@
-<h1>{{ question.question_text }}</h1>
+{% extends "base.html" %}
 
+{% set title = question.question_text %}
+
+{% block content %}
 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 
 <form action="{{ url('vote', parts={'question_id': question.id}) }}" method="post">
@@ -9,3 +12,4 @@ <h1>{{ question.question_text }}</h1>
 {% endfor %}
 <input type="submit" value="Vote" />
 </form>
+{% endblock %}
diff --git a/demos/polls/aiohttpdemo_polls/templates/index.html b/demos/polls/aiohttpdemo_polls/templates/index.html
@@ -1,6 +1,8 @@
-<link rel="stylesheet" type="text/css"
-href="{{ url('static', filename='style.css') }}" />
+{% extends "base.html" %}
 
+{% set title = "Main" %}
+
+{% block content %}
 {% if questions %}
     <ul>
     {% for question in questions %}
@@ -10,3 +12,4 @@
 {% else %}
     <p>No polls are available.</p>
 {% endif %}
+{% endblock %}
diff --git a/demos/polls/aiohttpdemo_polls/templates/results.html b/demos/polls/aiohttpdemo_polls/templates/results.html
@@ -1,9 +1,13 @@
-<h1>{{ question.question }}</h1>
+{% extends "base.html" %}
 
+{% set title = question.question %}
+
+{% block content %}
 <ul>
 {% for choice in choices %}
     <li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes }}</li>
 {% endfor %}
 </ul>
 
 <a href="{{ url('poll', parts={'question_id': question.id}) }}">Vote again?</a>
+{% endblock %}