Merge branch 'master' of github.com:asendecka/djangogirls-tutorial

olasitarska · olasitarska · commit cecc00fee163 · 2014-07-01T23:52:28.000+02:00
diff --git a/css/README.md b/css/README.md
@@ -44,13 +44,13 @@ Now we need to tell Django how it can find it. Open up a `mysite/mysite/settings
         os.path.join(BASE_DIR, "static"),
     )
 
-This way Django will now where your static files are.
+This way Django will know where your static files are.
 
 That's it! Time to see if it works :)
 
 ## Your first CSS file!
 
-First things first: let's now create a CSS file. Create a new folder called `css` inside your `static` folder. Then create a new file called `blog.css` inside this `css` directory. Ready?
+First things first: let's create a CSS file now. Create a new folder called `css` inside your `static` folder. Then create a new file called `blog.css` inside this `css` directory. Ready?
 
 Time to write some CSS! Open up your `blog.css` file in code editor.
 
diff --git a/extend_your_application/README.md b/extend_your_application/README.md
@@ -120,3 +120,30 @@ It worked! But what happens when you click a link in blog post title?
 Oh no! Error once again. But we already know how to deal with it, right? We need to add a template!
 
 We will create a file in `blog/template/blog` called `post_detail.html`.
+
+It will look like this:
+    {% extends 'mysite/base.html' %}
+    {% load future %}
+
+    {% block content %}
+        <div class="date">
+            {% if post.published_date %}
+                {{ post.published_date }}
+            {% endif %}
+        </div>
+        <h1>{{ post.title }}</h1>
+        <p>{{ post.text }}</p>
+    {% endblock %}
+
+Once again we are extending `base.html`. In `content` block we want to display post's published_date (if exists), title and text. But we should discuss some important things, right?
+
+`{% if ... %} ... {% endif %}` is a templatetag we can use when we want to check something. In this scenario we want to check if post's `published_date` is not empty.
+
+Ok we can refresh our page and see if `Page not found` is gone now.
+
+![Post detail page](images/post_detail.png)
+
+Yay! It works!
+
+You should be proud of yourself!
+
diff --git a/extend_your_application/images/post_detail.png b/extend_your_application/images/post_detail.png
