Introduce named urls properly and remove deprecated urls constructs (fixes #171)

aniav · aniav · commit 7eb9afccb098 · 2015-07-13T20:44:03.000+02:00
diff --git a/en/django_forms/README.md b/en/django_forms/README.md
@@ -44,7 +44,7 @@ So once again we will create: a link to the page, a URL, a view and a template.
 It's time to open `blog/templates/blog/base.html`. We will add a link in `div` named `page-header`:
 
 ```html
-<a href="{% url 'blog.views.post_new' %}" class="top-menu"><span class="glyphicon glyphicon-plus"></span></a>
+<a href="{% url 'post_new' %}" class="top-menu"><span class="glyphicon glyphicon-plus"></span></a>
 ```
 
 Note that we want to call our new view `post_new`.
@@ -63,7 +63,7 @@ After adding the line, your html file should now look like this:
     </head>
     <body>
         <div class="page-header">
-            <a href="{% url 'blog.views.post_new' %}" class="top-menu"><span class="glyphicon glyphicon-plus"></span></a>
+            <a href="{% url 'post_new' %}" class="top-menu"><span class="glyphicon glyphicon-plus"></span></a>
             <h1><a href="/">Django Girls Blog</a></h1>
         </div>
         <div class="content container">
@@ -95,8 +95,8 @@ from django.conf.urls import include, url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.post_list),
-    url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail),
+    url(r'^$', views.post_list, name='post_list'),
+    url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail, name='post_detail'),
     url(r'^post/new/$', views.post_new, name='post_new'),
 ]
 ```
diff --git a/en/django_models/README.md b/en/django_models/README.md
@@ -105,6 +105,7 @@ Let's open `blog/models.py`, remove everything from it and write code like this:
 from django.db import models
 from django.utils import timezone
 
+
 class Post(models.Model):
     author = models.ForeignKey('auth.User')
     title = models.CharField(max_length=200)
@@ -167,4 +168,4 @@ Django prepared for us a migration file that we have to apply now to our databas
       Rendering model states... DONE
       Applying blog.0001_initial... OK
 
-Hurray! Our Post model is now in our database! It would be nice to see it, right? Jump to the next chapter to see what your Post looks like!
+Hurray! Our Post model is now in our database! It would be nice to see it, right? Jump to the next chapter to see what your Post looks like!
diff --git a/en/django_urls/README.md b/en/django_urls/README.md
@@ -104,12 +104,14 @@ After that, we can add our first URL pattern:
 
 ```python
 urlpatterns = [
-    url(r'^$', views.post_list),
+    url(r'^$', views.post_list, name='post_list'),
 ]
 ```
 
 As you can see, we're now assigning a `view` called `post_list` to `^$` URL. This regular expression will match `^` (a beginning) followed by `$` (an end) - so only an empty string will match. And that's correct, because in Django url resolvers, 'http://127.0.0.1:8000/' is not a part of URL. This pattern will show Django that `views.post_list` is the right place to go if someone enters your website at the 'http://127.0.0.1:8000/' address.
 
+The last part `name='post_list'` is the name of the url that will be used to identify the view. This can be the same as the name of the view but it can also be something completelly different. We will be using the named urls later in the project but it is important to name each url in the app and to try to keep the names of urls unique and easy to remember.
+
 Everything all right? Open http://127.0.0.1:8000/ in your browser to see the result.
 
 ![Error](images/error1.png)
diff --git a/en/extend_your_application/README.md b/en/extend_your_application/README.md
@@ -31,10 +31,10 @@ We will start with adding a link inside `blog/templates/blog/post_list.html` fil
 {% raw %}We want to have a link to a post detail page on the post's title. Let's change `<h1><a href="">{{ post.title }}</a></h1>` into a link:{% endraw %}
 
 ```html
-<h1><a href="{% url 'blog.views.post_detail' pk=post.pk %}">{{ post.title }}</a></h1>
+<h1><a href="{% url 'post_detail' pk=post.pk %}">{{ post.title }}</a></h1>
 ```
 
-{% raw %}Time to explain the mysterious `{% url 'blog.views.post_detail' pk=post.pk %}`. As you might suspect, the `{% %}` notation means that we are using Django template tags. This time we will use one that will create a URL for us!{% endraw %}
+{% raw %}Time to explain the mysterious `{% url 'post_detail' pk=post.pk %}`. As you might suspect, the `{% %}` notation means that we are using Django template tags. This time we will use one that will create a URL for us!{% endraw %}
 
 `blog.views.post_detail` is a path to a `post_detail` *view* we want to create. Please note: `blog` is the name of our application (the directory `blog`), `views` is from the name of the `views.py` file and the last bit - `post_detail` - is the name of the *view*.
 
@@ -46,15 +46,15 @@ Let's create a URL in `urls.py` for our `post_detail` *view*!
 
 ### URL: http://127.0.0.1:8000/post/1/
 
-We want to create a URL to point Django to a *view* called `post_detail`, that will show an entire blog post. Add the line `url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail),` to the `blog/urls.py` file. It should look like this:
+We want to create a URL to point Django to a *view* named `post_detail` in the `blog/urls.py` file, that will show an entire blog post. Add the line `url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail, name='post_detail'),` to the `blog/urls.py` file. It should look like this:
 
 ```python
 from django.conf.urls import include, url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.post_list),
-    url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail),
+    url(r'^$', views.post_list, name='post_list'),
+    url(r'^post/(?P<pk>[0-9]+)/$', views.post_detail, name='post_detail'),
 ]
 ```
 
diff --git a/en/extend_your_application/images/no_reverse_match2.png b/en/extend_your_application/images/no_reverse_match2.png
