diff --git a/config/urls.py b/config/urls.py index 9f340bb..9d3b64f 100644 --- a/config/urls.py +++ b/config/urls.py @@ -11,6 +11,7 @@ from mhackspace.contact.views import contact from mhackspace.members.views import MemberListView from mhackspace.subscriptions import views as subscription from mhackspace.base.feeds import LatestEntriesFeed +from django.contrib.auth import views as auth_views urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name='home'), @@ -36,7 +37,10 @@ urlpatterns = [ url(r'membership/join/$', subscription.MembershipJoinView.as_view(), name='join_hackspace'), url(r'membership/(?P[\w\-]+)/success$', subscription.MembershipJoinSuccessView.as_view(), name='join_hackspace_success'), url(r'membership/(?P\w{0,50})/failure$', subscription.MembershipJoinFailureView.as_view(), name='join_hackspace_failure'), - + url(r'^admin/password_reset/$', auth_views.password_reset, name='admin_password_reset'), + url(r'^admin/password_reset/done/$', auth_views.password_reset_done, name='password_reset_done'), + url(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', auth_views.password_reset_confirm, name='password_reset_confirm'), + url(r'^reset/done/$', auth_views.password_reset_complete, name='password_reset_complete'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if settings.DEBUG: diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index 6f2f2d1..453a142 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -44,37 +44,11 @@ aria-label="Toggle navigation"> - + Maidstone Hackspace - - @@ -134,6 +118,8 @@ diff --git a/mhackspace/templates/pages/about.html b/mhackspace/templates/pages/about.html index bc62be8..6ed40c9 100644 --- a/mhackspace/templates/pages/about.html +++ b/mhackspace/templates/pages/about.html @@ -2,8 +2,8 @@ {% block content %} -

A hackspace also referred to as a makerspace is a community-operated, workspace where people with common interests, often in computers, machining, technology, science, digital art or electronic art, can meet, socialize and collaborate.

+

A hackspace also referred to as a maker space is a community-operated, workspace where people with common interests, often in computers, machining, technology, science, digital art or electronic art, can meet, socialise and collaborate.

-

Most people do no have the space knowleddge or finance required to create things at home, hackspaces get around this by poolng together for the bigger tools sharing of knowledge and helping out each other to create & build.

+

Most people do no have the space knowledge or finance required to create things at home, hackspaces get around this by pooling together for the bigger tools sharing of knowledge and helping out each other to create & build.

{% endblock content %} diff --git a/mhackspace/templates/pages/members.html b/mhackspace/templates/pages/members.html index d343596..ff8cfe0 100644 --- a/mhackspace/templates/pages/members.html +++ b/mhackspace/templates/pages/members.html @@ -3,7 +3,7 @@
-
Hackspace Members
+

Hackspace Members

Total Users {{ paginator.count }}
Total Members {{ total }}