diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py index fa58a83c..d36e2657 100644 --- a/dynamicweb/settings.py +++ b/dynamicweb/settings.py @@ -40,7 +40,8 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'digital_glarus' + 'digital_glarus', + 'railshosting', ) MIDDLEWARE_CLASSES = ( @@ -51,8 +52,8 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', ) +# 'django.middleware.security.SecurityMiddleware', ROOT_URLCONF = 'dynamicweb.urls' @@ -107,6 +108,6 @@ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') try: - from .settings_local import * + from .local.local_settings import * except ImportError as e: pass diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index dc7bef66..1c115de2 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -8,4 +8,5 @@ urlpatterns = [ url(r'^admin/', include(admin.site.urls)), url(r'^digital.glarus/', include('digital_glarus.urls', namespace="digital_glarus")), + url(r'^railshosting/', include('railshosting.urls', namespace="railshosting")), ] diff --git a/railshosting/models.py b/railshosting/models.py index 6c129de7..28530a09 100644 --- a/railshosting/models.py +++ b/railshosting/models.py @@ -1,6 +1,6 @@ from django.db import models -class RailsBetaUSer(models.Model): +class RailsBetaUser(models.Model): email = models.EmailField(unique=True) received_date = models.DateTimeField('date received') diff --git a/railshosting/templates/css/bootstrap.css b/railshosting/static/railshosting/css/bootstrap.css similarity index 100% rename from railshosting/templates/css/bootstrap.css rename to railshosting/static/railshosting/css/bootstrap.css diff --git a/railshosting/templates/css/bootstrap.min.css b/railshosting/static/railshosting/css/bootstrap.min.css similarity index 100% rename from railshosting/templates/css/bootstrap.min.css rename to railshosting/static/railshosting/css/bootstrap.min.css diff --git a/railshosting/templates/css/landing-page.css b/railshosting/static/railshosting/css/landing-page.css similarity index 100% rename from railshosting/templates/css/landing-page.css rename to railshosting/static/railshosting/css/landing-page.css diff --git a/railshosting/templates/font-awesome/css/font-awesome.css b/railshosting/static/railshosting/font-awesome/css/font-awesome.css similarity index 100% rename from railshosting/templates/font-awesome/css/font-awesome.css rename to railshosting/static/railshosting/font-awesome/css/font-awesome.css diff --git a/railshosting/templates/font-awesome/css/font-awesome.min.css b/railshosting/static/railshosting/font-awesome/css/font-awesome.min.css similarity index 100% rename from railshosting/templates/font-awesome/css/font-awesome.min.css rename to railshosting/static/railshosting/font-awesome/css/font-awesome.min.css diff --git a/railshosting/templates/font-awesome/fonts/FontAwesome.otf b/railshosting/static/railshosting/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from railshosting/templates/font-awesome/fonts/FontAwesome.otf rename to railshosting/static/railshosting/font-awesome/fonts/FontAwesome.otf diff --git a/railshosting/templates/font-awesome/fonts/fontawesome-webfont.eot b/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from railshosting/templates/font-awesome/fonts/fontawesome-webfont.eot rename to railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.eot diff --git a/railshosting/templates/font-awesome/fonts/fontawesome-webfont.svg b/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from railshosting/templates/font-awesome/fonts/fontawesome-webfont.svg rename to railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.svg diff --git a/railshosting/templates/font-awesome/fonts/fontawesome-webfont.ttf b/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from railshosting/templates/font-awesome/fonts/fontawesome-webfont.ttf rename to railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/railshosting/templates/font-awesome/fonts/fontawesome-webfont.woff b/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from railshosting/templates/font-awesome/fonts/fontawesome-webfont.woff rename to railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.woff diff --git a/railshosting/templates/font-awesome/less/bordered-pulled.less b/railshosting/static/railshosting/font-awesome/less/bordered-pulled.less similarity index 100% rename from railshosting/templates/font-awesome/less/bordered-pulled.less rename to railshosting/static/railshosting/font-awesome/less/bordered-pulled.less diff --git a/railshosting/templates/font-awesome/less/core.less b/railshosting/static/railshosting/font-awesome/less/core.less similarity index 100% rename from railshosting/templates/font-awesome/less/core.less rename to railshosting/static/railshosting/font-awesome/less/core.less diff --git a/railshosting/templates/font-awesome/less/fixed-width.less b/railshosting/static/railshosting/font-awesome/less/fixed-width.less similarity index 100% rename from railshosting/templates/font-awesome/less/fixed-width.less rename to railshosting/static/railshosting/font-awesome/less/fixed-width.less diff --git a/railshosting/templates/font-awesome/less/font-awesome.less b/railshosting/static/railshosting/font-awesome/less/font-awesome.less similarity index 100% rename from railshosting/templates/font-awesome/less/font-awesome.less rename to railshosting/static/railshosting/font-awesome/less/font-awesome.less diff --git a/railshosting/templates/font-awesome/less/icons.less b/railshosting/static/railshosting/font-awesome/less/icons.less similarity index 100% rename from railshosting/templates/font-awesome/less/icons.less rename to railshosting/static/railshosting/font-awesome/less/icons.less diff --git a/railshosting/templates/font-awesome/less/larger.less b/railshosting/static/railshosting/font-awesome/less/larger.less similarity index 100% rename from railshosting/templates/font-awesome/less/larger.less rename to railshosting/static/railshosting/font-awesome/less/larger.less diff --git a/railshosting/templates/font-awesome/less/list.less b/railshosting/static/railshosting/font-awesome/less/list.less similarity index 100% rename from railshosting/templates/font-awesome/less/list.less rename to railshosting/static/railshosting/font-awesome/less/list.less diff --git a/railshosting/templates/font-awesome/less/mixins.less b/railshosting/static/railshosting/font-awesome/less/mixins.less similarity index 100% rename from railshosting/templates/font-awesome/less/mixins.less rename to railshosting/static/railshosting/font-awesome/less/mixins.less diff --git a/railshosting/templates/font-awesome/less/path.less b/railshosting/static/railshosting/font-awesome/less/path.less similarity index 100% rename from railshosting/templates/font-awesome/less/path.less rename to railshosting/static/railshosting/font-awesome/less/path.less diff --git a/railshosting/templates/font-awesome/less/rotated-flipped.less b/railshosting/static/railshosting/font-awesome/less/rotated-flipped.less similarity index 100% rename from railshosting/templates/font-awesome/less/rotated-flipped.less rename to railshosting/static/railshosting/font-awesome/less/rotated-flipped.less diff --git a/railshosting/templates/font-awesome/less/spinning.less b/railshosting/static/railshosting/font-awesome/less/spinning.less similarity index 100% rename from railshosting/templates/font-awesome/less/spinning.less rename to railshosting/static/railshosting/font-awesome/less/spinning.less diff --git a/railshosting/templates/font-awesome/less/stacked.less b/railshosting/static/railshosting/font-awesome/less/stacked.less similarity index 100% rename from railshosting/templates/font-awesome/less/stacked.less rename to railshosting/static/railshosting/font-awesome/less/stacked.less diff --git a/railshosting/templates/font-awesome/less/variables.less b/railshosting/static/railshosting/font-awesome/less/variables.less similarity index 100% rename from railshosting/templates/font-awesome/less/variables.less rename to railshosting/static/railshosting/font-awesome/less/variables.less diff --git a/railshosting/templates/font-awesome/scss/_bordered-pulled.scss b/railshosting/static/railshosting/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_bordered-pulled.scss rename to railshosting/static/railshosting/font-awesome/scss/_bordered-pulled.scss diff --git a/railshosting/templates/font-awesome/scss/_core.scss b/railshosting/static/railshosting/font-awesome/scss/_core.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_core.scss rename to railshosting/static/railshosting/font-awesome/scss/_core.scss diff --git a/railshosting/templates/font-awesome/scss/_fixed-width.scss b/railshosting/static/railshosting/font-awesome/scss/_fixed-width.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_fixed-width.scss rename to railshosting/static/railshosting/font-awesome/scss/_fixed-width.scss diff --git a/railshosting/templates/font-awesome/scss/_icons.scss b/railshosting/static/railshosting/font-awesome/scss/_icons.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_icons.scss rename to railshosting/static/railshosting/font-awesome/scss/_icons.scss diff --git a/railshosting/templates/font-awesome/scss/_larger.scss b/railshosting/static/railshosting/font-awesome/scss/_larger.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_larger.scss rename to railshosting/static/railshosting/font-awesome/scss/_larger.scss diff --git a/railshosting/templates/font-awesome/scss/_list.scss b/railshosting/static/railshosting/font-awesome/scss/_list.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_list.scss rename to railshosting/static/railshosting/font-awesome/scss/_list.scss diff --git a/railshosting/templates/font-awesome/scss/_mixins.scss b/railshosting/static/railshosting/font-awesome/scss/_mixins.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_mixins.scss rename to railshosting/static/railshosting/font-awesome/scss/_mixins.scss diff --git a/railshosting/templates/font-awesome/scss/_path.scss b/railshosting/static/railshosting/font-awesome/scss/_path.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_path.scss rename to railshosting/static/railshosting/font-awesome/scss/_path.scss diff --git a/railshosting/templates/font-awesome/scss/_rotated-flipped.scss b/railshosting/static/railshosting/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_rotated-flipped.scss rename to railshosting/static/railshosting/font-awesome/scss/_rotated-flipped.scss diff --git a/railshosting/templates/font-awesome/scss/_spinning.scss b/railshosting/static/railshosting/font-awesome/scss/_spinning.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_spinning.scss rename to railshosting/static/railshosting/font-awesome/scss/_spinning.scss diff --git a/railshosting/templates/font-awesome/scss/_stacked.scss b/railshosting/static/railshosting/font-awesome/scss/_stacked.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_stacked.scss rename to railshosting/static/railshosting/font-awesome/scss/_stacked.scss diff --git a/railshosting/templates/font-awesome/scss/_variables.scss b/railshosting/static/railshosting/font-awesome/scss/_variables.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/_variables.scss rename to railshosting/static/railshosting/font-awesome/scss/_variables.scss diff --git a/railshosting/templates/font-awesome/scss/font-awesome.scss b/railshosting/static/railshosting/font-awesome/scss/font-awesome.scss similarity index 100% rename from railshosting/templates/font-awesome/scss/font-awesome.scss rename to railshosting/static/railshosting/font-awesome/scss/font-awesome.scss diff --git a/railshosting/templates/fonts/glyphicons-halflings-regular.eot b/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from railshosting/templates/fonts/glyphicons-halflings-regular.eot rename to railshosting/static/railshosting/fonts/glyphicons-halflings-regular.eot diff --git a/railshosting/templates/fonts/glyphicons-halflings-regular.svg b/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from railshosting/templates/fonts/glyphicons-halflings-regular.svg rename to railshosting/static/railshosting/fonts/glyphicons-halflings-regular.svg diff --git a/railshosting/templates/fonts/glyphicons-halflings-regular.ttf b/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from railshosting/templates/fonts/glyphicons-halflings-regular.ttf rename to railshosting/static/railshosting/fonts/glyphicons-halflings-regular.ttf diff --git a/railshosting/templates/fonts/glyphicons-halflings-regular.woff b/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from railshosting/templates/fonts/glyphicons-halflings-regular.woff rename to railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff diff --git a/railshosting/templates/fonts/glyphicons-halflings-regular.woff2 b/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from railshosting/templates/fonts/glyphicons-halflings-regular.woff2 rename to railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff2 diff --git a/railshosting/templates/img/Beta.png b/railshosting/static/railshosting/img/Beta.png similarity index 100% rename from railshosting/templates/img/Beta.png rename to railshosting/static/railshosting/img/Beta.png diff --git a/railshosting/templates/img/banner-bg copy.jpg b/railshosting/static/railshosting/img/banner-bg copy.jpg similarity index 100% rename from railshosting/templates/img/banner-bg copy.jpg rename to railshosting/static/railshosting/img/banner-bg copy.jpg diff --git a/railshosting/templates/img/banner-bg.jpg b/railshosting/static/railshosting/img/banner-bg.jpg similarity index 100% rename from railshosting/templates/img/banner-bg.jpg rename to railshosting/static/railshosting/img/banner-bg.jpg diff --git a/railshosting/templates/img/banner-bg.psd b/railshosting/static/railshosting/img/banner-bg.psd similarity index 100% rename from railshosting/templates/img/banner-bg.psd rename to railshosting/static/railshosting/img/banner-bg.psd diff --git a/railshosting/templates/img/checkmark.png b/railshosting/static/railshosting/img/checkmark.png similarity index 100% rename from railshosting/templates/img/checkmark.png rename to railshosting/static/railshosting/img/checkmark.png diff --git a/railshosting/templates/img/configure.jpg b/railshosting/static/railshosting/img/configure.jpg similarity index 100% rename from railshosting/templates/img/configure.jpg rename to railshosting/static/railshosting/img/configure.jpg diff --git a/railshosting/templates/img/deluxeroom.jpg b/railshosting/static/railshosting/img/deluxeroom.jpg similarity index 100% rename from railshosting/templates/img/deluxeroom.jpg rename to railshosting/static/railshosting/img/deluxeroom.jpg diff --git a/railshosting/templates/img/dog.png b/railshosting/static/railshosting/img/dog.png similarity index 100% rename from railshosting/templates/img/dog.png rename to railshosting/static/railshosting/img/dog.png diff --git a/railshosting/templates/img/dog.psd b/railshosting/static/railshosting/img/dog.psd similarity index 100% rename from railshosting/templates/img/dog.psd rename to railshosting/static/railshosting/img/dog.psd diff --git a/railshosting/templates/img/economy.jpg b/railshosting/static/railshosting/img/economy.jpg similarity index 100% rename from railshosting/templates/img/economy.jpg rename to railshosting/static/railshosting/img/economy.jpg diff --git a/railshosting/templates/img/favicon.ico b/railshosting/static/railshosting/img/favicon.ico similarity index 100% rename from railshosting/templates/img/favicon.ico rename to railshosting/static/railshosting/img/favicon.ico diff --git a/railshosting/templates/img/header-bg.jpg b/railshosting/static/railshosting/img/header-bg.jpg similarity index 100% rename from railshosting/templates/img/header-bg.jpg rename to railshosting/static/railshosting/img/header-bg.jpg diff --git a/railshosting/templates/img/home.png b/railshosting/static/railshosting/img/home.png similarity index 100% rename from railshosting/templates/img/home.png rename to railshosting/static/railshosting/img/home.png diff --git a/railshosting/templates/img/how.png b/railshosting/static/railshosting/img/how.png similarity index 100% rename from railshosting/templates/img/how.png rename to railshosting/static/railshosting/img/how.png diff --git a/railshosting/templates/img/how1.png b/railshosting/static/railshosting/img/how1.png similarity index 100% rename from railshosting/templates/img/how1.png rename to railshosting/static/railshosting/img/how1.png diff --git a/railshosting/templates/img/how2.png b/railshosting/static/railshosting/img/how2.png similarity index 100% rename from railshosting/templates/img/how2.png rename to railshosting/static/railshosting/img/how2.png diff --git a/railshosting/templates/img/how3.png b/railshosting/static/railshosting/img/how3.png similarity index 100% rename from railshosting/templates/img/how3.png rename to railshosting/static/railshosting/img/how3.png diff --git a/railshosting/templates/img/how4.png b/railshosting/static/railshosting/img/how4.png similarity index 100% rename from railshosting/templates/img/how4.png rename to railshosting/static/railshosting/img/how4.png diff --git a/railshosting/templates/img/intro-bg.jpg b/railshosting/static/railshosting/img/intro-bg.jpg similarity index 100% rename from railshosting/templates/img/intro-bg.jpg rename to railshosting/static/railshosting/img/intro-bg.jpg diff --git a/railshosting/templates/img/intro-bg.psd b/railshosting/static/railshosting/img/intro-bg.psd similarity index 100% rename from railshosting/templates/img/intro-bg.psd rename to railshosting/static/railshosting/img/intro-bg.psd diff --git a/railshosting/templates/img/ipad.png b/railshosting/static/railshosting/img/ipad.png similarity index 100% rename from railshosting/templates/img/ipad.png rename to railshosting/static/railshosting/img/ipad.png diff --git a/railshosting/templates/img/logo_black.svg b/railshosting/static/railshosting/img/logo_black.svg similarity index 100% rename from railshosting/templates/img/logo_black.svg rename to railshosting/static/railshosting/img/logo_black.svg diff --git a/railshosting/templates/img/logo_white.svg b/railshosting/static/railshosting/img/logo_white.svg similarity index 100% rename from railshosting/templates/img/logo_white.svg rename to railshosting/static/railshosting/img/logo_white.svg diff --git a/railshosting/templates/img/phones.png b/railshosting/static/railshosting/img/phones.png similarity index 100% rename from railshosting/templates/img/phones.png rename to railshosting/static/railshosting/img/phones.png diff --git a/railshosting/templates/img/presidentialroom.jpg b/railshosting/static/railshosting/img/presidentialroom.jpg similarity index 100% rename from railshosting/templates/img/presidentialroom.jpg rename to railshosting/static/railshosting/img/presidentialroom.jpg diff --git a/railshosting/templates/img/standardroom.jpg b/railshosting/static/railshosting/img/standardroom.jpg similarity index 100% rename from railshosting/templates/img/standardroom.jpg rename to railshosting/static/railshosting/img/standardroom.jpg diff --git a/railshosting/templates/img/ubuntu.png b/railshosting/static/railshosting/img/ubuntu.png similarity index 100% rename from railshosting/templates/img/ubuntu.png rename to railshosting/static/railshosting/img/ubuntu.png diff --git a/railshosting/templates/js/bootstrap.js b/railshosting/static/railshosting/js/bootstrap.js similarity index 100% rename from railshosting/templates/js/bootstrap.js rename to railshosting/static/railshosting/js/bootstrap.js diff --git a/railshosting/templates/js/bootstrap.min.js b/railshosting/static/railshosting/js/bootstrap.min.js similarity index 100% rename from railshosting/templates/js/bootstrap.min.js rename to railshosting/static/railshosting/js/bootstrap.min.js diff --git a/railshosting/templates/js/jquery.js b/railshosting/static/railshosting/js/jquery.js similarity index 100% rename from railshosting/templates/js/jquery.js rename to railshosting/static/railshosting/js/jquery.js diff --git a/railshosting/templates/LICENSE b/railshosting/templates/railshosting/LICENSE similarity index 100% rename from railshosting/templates/LICENSE rename to railshosting/templates/railshosting/LICENSE diff --git a/railshosting/templates/README.md b/railshosting/templates/railshosting/README.md similarity index 100% rename from railshosting/templates/README.md rename to railshosting/templates/railshosting/README.md diff --git a/railshosting/templates/beta.html b/railshosting/templates/railshosting/beta.html similarity index 70% rename from railshosting/templates/beta.html rename to railshosting/templates/railshosting/beta.html index c56e4192..0bb8682f 100644 --- a/railshosting/templates/beta.html +++ b/railshosting/templates/railshosting/beta.html @@ -1,3 +1,5 @@ +{% load staticfiles %} + @@ -12,15 +14,15 @@ Rails Hosting.ch - Ruby on Rails as easy as possible - + - + - + - + @@ -44,25 +46,25 @@ - + @@ -78,7 +80,7 @@
-
+

Thank you for your interest in joining Rails-Hosting Beta.
    We will come back to you shortly to give you access to our  infrastructure.

@@ -103,24 +105,24 @@

Copyright © ungleich GmbH 2015. All Rights Reserved

@@ -130,10 +132,10 @@ - + - + diff --git a/railshosting/templates/checkout.html b/railshosting/templates/railshosting/checkout.html similarity index 100% rename from railshosting/templates/checkout.html rename to railshosting/templates/railshosting/checkout.html diff --git a/railshosting/templates/index.html b/railshosting/templates/railshosting/index.html similarity index 87% rename from railshosting/templates/index.html rename to railshosting/templates/railshosting/index.html index 4ae18fbc..323c137d 100644 --- a/railshosting/templates/index.html +++ b/railshosting/templates/railshosting/index.html @@ -1,3 +1,5 @@ +{% load staticfiles %} + @@ -12,15 +14,15 @@ Rails Hosting.ch - Ruby on Rails as easy as possible - + - + - + - + @@ -44,7 +46,7 @@ - +
- +
@@ -166,7 +168,7 @@

We take care of everything for you! You don't need your infrastructure. We give you everything you need in Ruby on Rails hosting. Full root access, 24x7 support.

- +
@@ -199,7 +201,7 @@
- +

Economy

Suited for smaller applications

@@ -214,7 +216,7 @@
- +

Standard

Suited for standard Ruby on Rails applications

@@ -230,7 +232,7 @@
- +

Deluxe

Suited for performance critical project

@@ -245,7 +247,7 @@
- +

Presidential Premium

Suited for performance critical &

@@ -279,10 +281,14 @@

Let me try!

 

 

-
+ {% if error_message %}

{{ error_message }}

{% endif %} + {{ form.non_field_errors }} + {{ form.email.errors }} + + {% csrf_token %}
- - + +
@@ -363,10 +369,10 @@ - + - + diff --git a/railshosting/templates/login.html b/railshosting/templates/railshosting/login.html similarity index 100% rename from railshosting/templates/login.html rename to railshosting/templates/railshosting/login.html diff --git a/railshosting/templates/logo_black.svg b/railshosting/templates/railshosting/logo_black.svg similarity index 100% rename from railshosting/templates/logo_black.svg rename to railshosting/templates/railshosting/logo_black.svg diff --git a/railshosting/templates/signup.html b/railshosting/templates/railshosting/signup.html similarity index 100% rename from railshosting/templates/signup.html rename to railshosting/templates/railshosting/signup.html diff --git a/railshosting/views.py b/railshosting/views.py index abe2d166..cc0a2909 100644 --- a/railshosting/views.py +++ b/railshosting/views.py @@ -14,20 +14,20 @@ class RailsBetaUserForm(ModelForm): fields = [ 'email' ] def index(request): - form = RailsBetaUserForm() - return render(request, 'railshosting/index.html') - -def beta(request): - message = RailsBetaUser(received_date=datetime.datetime.now()) - form = MessageForm(request.POST, instance=message) - - context = { - 'email': form, - } + email = RailsBetaUser(received_date=datetime.datetime.now()) + context = {} + context['form'] = RailsBetaUserForm() if request.method == 'POST': + form = RailsBetaUserForm(request.POST, instance=email) + context['form'] = form if form.is_valid(): form.save() - return HttpResponseRedirect(reverse("railshosting:beta") + return HttpResponseRedirect(reverse("railshosting:beta")) + else: + context['error_message'] = "a problem" - return render(request, 'railshosting/beta.html', context) + return render(request, 'railshosting/index.html', context) + +def beta(request): + return render(request, 'railshosting/beta.html')