Skip to content

Commit 2d9e8bc

Browse files
authored
Fix deprecations: Round 1 (#643)
* Remove an unneccesary include * Declare the app name for namespaced-include * Drop django.contrib.webdesign * Correctly hook into template settings
1 parent 87c3172 commit 2d9e8bc

File tree

13 files changed

+16
-25
lines changed

13 files changed

+16
-25
lines changed

junction/profiles/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
from . import views
55

6+
app_name = "junction.profiles"
7+
68
urlpatterns = [
79
url(r'^$', views.dashboard, name='dashboard'),
810
url(r'^edit/$', views.profile, name='profile'),
9-
10-
1111
]

junction/templates/pages/home_page.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{% extends 'base.html' %}
22

33
{% load django_markdown %}
4-
{% load webdesign %}
54
{% load static from staticfiles %}
65

76
{% block head_title %}Welcome to {{ SITE_INFO.site_name }}{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Blog Archive</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Code of Conduct</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Frequently Asked Questions</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Schedule</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Speakers</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Sponsors</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% extends 'base.html' %}
22

3-
{% load webdesign %}
43

54
{% block head_title %}{{ block.super }}{% endblock %}
65

@@ -10,4 +9,4 @@ <h1>Venue</h1>
109

1110
{% block content %}
1211
{% lorem 3 p %}
13-
{% endblock %}
12+
{% endblock %}

junction/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
url(r'^$', HomePageView.as_view(), name="page-home"),
4545

4646
# Django Admin
47-
url(r'^nimda/', include(admin.site.urls)),
47+
url(r'^nimda/', admin.site.urls),
4848

4949
# Third Party Stuff
5050
url(r'^accounts/', include('allauth.urls')),

0 commit comments

Comments
 (0)