diff --git a/config/settings/common.py b/config/settings/common.py index eb8bde3..519fb5d 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -47,6 +47,7 @@ LOCAL_APPS = ( # custom users app 'mhackspace.users.apps.UsersConfig', 'mhackspace.feeds', + 'mhackspace.contact', # Your stuff: custom apps go here ) diff --git a/config/settings/local.py b/config/settings/local.py index dce1b6b..a67ba42 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -71,3 +71,7 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner' # Your local stuff: Below this line define 3rd party library settings # ------------------------------------------------------------------------------ +CAPTCHA = { + 'secret': '', + 'site': '' +} diff --git a/config/urls.py b/config/urls.py index a6245bc..f9ae71c 100644 --- a/config/urls.py +++ b/config/urls.py @@ -7,10 +7,15 @@ from django.conf.urls.static import static from django.contrib import admin from django.views.generic import TemplateView from django.views import defaults as default_views +from mhackspace.contact.views import contact urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name='home'), url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name='about'), + url(r'^chat/$', TemplateView.as_view(template_name='pages/chat.html'), name='chat'), + url(r'^mailing-list/$', TemplateView.as_view(template_name='pages/mailing-list.html'), name='group'), + + url(r'^contact/$', contact, name='contact'), # Django Admin, use {% url 'admin:index' %} url(settings.ADMIN_URL, admin.site.urls), diff --git a/mhackspace/contact/forms.py b/mhackspace/contact/forms.py new file mode 100644 index 0000000..855c97d --- /dev/null +++ b/mhackspace/contact/forms.py @@ -0,0 +1,20 @@ +from django import forms + +TYPES = ( + ('general', 'General'), + ('donate', 'Donate equipment money or time'), + ('event', 'Event') +) + +class ContactForm(forms.Form): + contact_name = forms.CharField(required=True) + contact_email = forms.EmailField(required=True) + subject = forms.CharField(required=True) + message = forms.CharField( + required=True, + widget=forms.Textarea + ) + type = forms.MultipleChoiceField( + required=True, + widget=forms.Select, + choices=TYPES) diff --git a/mhackspace/contact/templatetags/recapture.py b/mhackspace/contact/templatetags/recapture.py new file mode 100644 index 0000000..d097d22 --- /dev/null +++ b/mhackspace/contact/templatetags/recapture.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from django import template +from mhackspace.feeds.models import Feed +from scaffold.readers.rss_reader import feed_reader +from django.conf import settings + +register = template.Library() + +@register.inclusion_tag('partials/recapture.html') +def google_capture(): + return settings.CAPTCHA diff --git a/mhackspace/contact/views.py b/mhackspace/contact/views.py new file mode 100644 index 0000000..917c7e7 --- /dev/null +++ b/mhackspace/contact/views.py @@ -0,0 +1,10 @@ +from django.shortcuts import render +from mhackspace.contact.forms import ContactForm + +# add to your views +def contact(request): + form_class = ContactForm + + return render(request, 'pages/contact.html', { + 'form': form_class, + }) diff --git a/mhackspace/static/images/favicon.png b/mhackspace/static/images/favicon.png new file mode 100755 index 0000000..b7d9d72 Binary files /dev/null and b/mhackspace/static/images/favicon.png differ diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index 54dc0a5..9eabaf6 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -12,7 +12,7 @@ - + {% block css %} @@ -23,7 +23,6 @@ {% endcompress %} {% endblock %} - @@ -43,16 +42,16 @@ Home
  • - Chat + Chat
  • Donate
  • - Contat + Contact
  • - Mailing List + Mailing List
  • Login diff --git a/mhackspace/templates/pages/chat.html b/mhackspace/templates/pages/chat.html new file mode 100644 index 0000000..8174238 --- /dev/null +++ b/mhackspace/templates/pages/chat.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} +{% load feed_views %} + +{% block content %} +

    Introduction

    + +Pop in and say hi, please be patient users tend to idle, but will likely respond given a chance. + + +
    +
    + +
    +
    + +{% endblock content %} diff --git a/mhackspace/templates/pages/contact.html b/mhackspace/templates/pages/contact.html new file mode 100644 index 0000000..cf44ea5 --- /dev/null +++ b/mhackspace/templates/pages/contact.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load i18n %} +{% load crispy_forms_tags %} +{% load recapture %} + +{% block content %} +

    Contact us

    + +
    + {% csrf_token %} + {{ form|crispy }} + {{ google_capture }} + +
    + +{% endblock content %} + +{% block javascript %} + {{ block.super }} + +{% endblock %} diff --git a/mhackspace/templates/pages/mailing-list.html b/mhackspace/templates/pages/mailing-list.html new file mode 100644 index 0000000..b3f8df2 --- /dev/null +++ b/mhackspace/templates/pages/mailing-list.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load feed_views %} + +{% block content %} +

    Mailing list

    + + +{% endblock content %} + +{% block javascript %} + {{ block.super }} + +{% endblock %} diff --git a/mhackspace/templates/partials/captcha.html b/mhackspace/templates/partials/captcha.html new file mode 100644 index 0000000..b286b89 --- /dev/null +++ b/mhackspace/templates/partials/captcha.html @@ -0,0 +1 @@ +