From 6aaa04eaa2480c8f55e75025c1178d051a080fe4 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@wurzel.schottelius.org>
Date: Wed, 27 May 2015 15:41:43 +0200
Subject: [PATCH] get railshosting running
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
---
dynamicweb/settings.py | 7 +--
dynamicweb/urls.py | 1 +
railshosting/models.py | 2 +-
.../railshosting}/css/bootstrap.css | 0
.../railshosting}/css/bootstrap.min.css | 0
.../railshosting}/css/landing-page.css | 0
.../font-awesome/css/font-awesome.css | 0
.../font-awesome/css/font-awesome.min.css | 0
.../font-awesome/fonts/FontAwesome.otf | Bin
.../fonts/fontawesome-webfont.eot | Bin
.../fonts/fontawesome-webfont.svg | 0
.../fonts/fontawesome-webfont.ttf | Bin
.../fonts/fontawesome-webfont.woff | Bin
.../font-awesome/less/bordered-pulled.less | 0
.../railshosting}/font-awesome/less/core.less | 0
.../font-awesome/less/fixed-width.less | 0
.../font-awesome/less/font-awesome.less | 0
.../font-awesome/less/icons.less | 0
.../font-awesome/less/larger.less | 0
.../railshosting}/font-awesome/less/list.less | 0
.../font-awesome/less/mixins.less | 0
.../railshosting}/font-awesome/less/path.less | 0
.../font-awesome/less/rotated-flipped.less | 0
.../font-awesome/less/spinning.less | 0
.../font-awesome/less/stacked.less | 0
.../font-awesome/less/variables.less | 0
.../font-awesome/scss/_bordered-pulled.scss | 0
.../font-awesome/scss/_core.scss | 0
.../font-awesome/scss/_fixed-width.scss | 0
.../font-awesome/scss/_icons.scss | 0
.../font-awesome/scss/_larger.scss | 0
.../font-awesome/scss/_list.scss | 0
.../font-awesome/scss/_mixins.scss | 0
.../font-awesome/scss/_path.scss | 0
.../font-awesome/scss/_rotated-flipped.scss | 0
.../font-awesome/scss/_spinning.scss | 0
.../font-awesome/scss/_stacked.scss | 0
.../font-awesome/scss/_variables.scss | 0
.../font-awesome/scss/font-awesome.scss | 0
.../fonts/glyphicons-halflings-regular.eot | Bin
.../fonts/glyphicons-halflings-regular.svg | 0
.../fonts/glyphicons-halflings-regular.ttf | Bin
.../fonts/glyphicons-halflings-regular.woff | Bin
.../fonts/glyphicons-halflings-regular.woff2 | Bin
.../railshosting}/img/Beta.png | Bin
.../railshosting}/img/banner-bg copy.jpg | Bin
.../railshosting}/img/banner-bg.jpg | Bin
.../railshosting}/img/checkmark.png | Bin
.../railshosting}/img/configure.jpg | Bin
.../railshosting}/img/deluxeroom.jpg | Bin
.../railshosting}/img/dog.png | Bin
.../railshosting}/img/economy.jpg | Bin
.../railshosting}/img/favicon.ico | Bin
.../railshosting}/img/header-bg.jpg | Bin
.../railshosting}/img/home.png | Bin
.../railshosting}/img/how.png | Bin
.../railshosting}/img/how1.png | Bin
.../railshosting}/img/how2.png | Bin
.../railshosting}/img/how3.png | Bin
.../railshosting}/img/how4.png | Bin
.../railshosting}/img/intro-bg.jpg | Bin
.../railshosting}/img/ipad.png | Bin
.../railshosting}/img/logo_black.svg | 0
.../railshosting}/img/logo_white.svg | 0
.../railshosting}/img/phones.png | Bin
.../railshosting}/img/presidentialroom.jpg | Bin
.../railshosting}/img/standardroom.jpg | Bin
.../railshosting}/img/ubuntu.png | Bin
.../railshosting}/js/bootstrap.js | 0
.../railshosting}/js/bootstrap.min.js | 0
.../railshosting}/js/jquery.js | 0
.../templates/{ => railshosting}/LICENSE | 0
.../templates/{ => railshosting}/README.md | 0
.../templates/{ => railshosting}/beta.html | 40 +++++++++--------
.../{ => railshosting}/checkout.html | 0
.../templates/{ => railshosting}/index.html | 42 ++++++++++--------
.../templates/{ => railshosting}/login.html | 0
.../{ => railshosting}/logo_black.svg | 0
.../templates/{ => railshosting}/signup.html | 0
railshosting/views.py | 24 +++++-----
80 files changed, 63 insertions(+), 53 deletions(-)
rename railshosting/{templates => static/railshosting}/css/bootstrap.css (100%)
rename railshosting/{templates => static/railshosting}/css/bootstrap.min.css (100%)
rename railshosting/{templates => static/railshosting}/css/landing-page.css (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/css/font-awesome.css (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/css/font-awesome.min.css (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/fonts/FontAwesome.otf (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/fonts/fontawesome-webfont.eot (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/fonts/fontawesome-webfont.svg (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/fonts/fontawesome-webfont.ttf (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/fonts/fontawesome-webfont.woff (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/bordered-pulled.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/core.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/fixed-width.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/font-awesome.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/icons.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/larger.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/list.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/mixins.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/path.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/rotated-flipped.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/spinning.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/stacked.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/less/variables.less (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_bordered-pulled.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_core.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_fixed-width.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_icons.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_larger.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_list.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_mixins.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_path.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_rotated-flipped.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_spinning.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_stacked.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/_variables.scss (100%)
rename railshosting/{templates => static/railshosting}/font-awesome/scss/font-awesome.scss (100%)
rename railshosting/{templates => static/railshosting}/fonts/glyphicons-halflings-regular.eot (100%)
rename railshosting/{templates => static/railshosting}/fonts/glyphicons-halflings-regular.svg (100%)
rename railshosting/{templates => static/railshosting}/fonts/glyphicons-halflings-regular.ttf (100%)
rename railshosting/{templates => static/railshosting}/fonts/glyphicons-halflings-regular.woff (100%)
rename railshosting/{templates => static/railshosting}/fonts/glyphicons-halflings-regular.woff2 (100%)
rename railshosting/{templates => static/railshosting}/img/Beta.png (100%)
rename railshosting/{templates => static/railshosting}/img/banner-bg copy.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/banner-bg.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/checkmark.png (100%)
rename railshosting/{templates => static/railshosting}/img/configure.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/deluxeroom.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/dog.png (100%)
rename railshosting/{templates => static/railshosting}/img/economy.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/favicon.ico (100%)
rename railshosting/{templates => static/railshosting}/img/header-bg.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/home.png (100%)
rename railshosting/{templates => static/railshosting}/img/how.png (100%)
rename railshosting/{templates => static/railshosting}/img/how1.png (100%)
rename railshosting/{templates => static/railshosting}/img/how2.png (100%)
rename railshosting/{templates => static/railshosting}/img/how3.png (100%)
rename railshosting/{templates => static/railshosting}/img/how4.png (100%)
rename railshosting/{templates => static/railshosting}/img/intro-bg.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/ipad.png (100%)
rename railshosting/{templates => static/railshosting}/img/logo_black.svg (100%)
rename railshosting/{templates => static/railshosting}/img/logo_white.svg (100%)
rename railshosting/{templates => static/railshosting}/img/phones.png (100%)
rename railshosting/{templates => static/railshosting}/img/presidentialroom.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/standardroom.jpg (100%)
rename railshosting/{templates => static/railshosting}/img/ubuntu.png (100%)
rename railshosting/{templates => static/railshosting}/js/bootstrap.js (100%)
rename railshosting/{templates => static/railshosting}/js/bootstrap.min.js (100%)
rename railshosting/{templates => static/railshosting}/js/jquery.js (100%)
rename railshosting/templates/{ => railshosting}/LICENSE (100%)
rename railshosting/templates/{ => railshosting}/README.md (100%)
rename railshosting/templates/{ => railshosting}/beta.html (70%)
rename railshosting/templates/{ => railshosting}/checkout.html (100%)
rename railshosting/templates/{ => railshosting}/index.html (87%)
rename railshosting/templates/{ => railshosting}/login.html (100%)
rename railshosting/templates/{ => railshosting}/logo_black.svg (100%)
rename railshosting/templates/{ => railshosting}/signup.html (100%)
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/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/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/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 %}
+
<!DOCTYPE html>
<html lang="en">
@@ -12,15 +14,15 @@
<title>Rails Hosting.ch - Ruby on Rails as easy as possible</title>
<!-- Bootstrap Core CSS -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
+ <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
- <link href="css/landing-page.css" rel="stylesheet">
+ <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
<!-- Custom Fonts -->
- <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+ <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
- <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
+ <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -44,25 +46,25 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand topnav" href="#"><img src="img/logo_black.svg"></a>
+ <a class="navbar-brand topnav" href="#"><img src="{% static 'railshosting/img/logo_black.svg' %}"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
- <a href="#how">How it works</a>
+ <a href="{% url 'railshosting:index' %}#how">How it works</a>
</li>
<li>
- <a href="#your">Your infrastructure</a>
+ <a href="{% url 'railshosting:index' %}#your">Your infrastructure</a>
</li>
<li>
- <a href="#our">Our inftrastructure</a>
+ <a href="{% url 'railshosting:index' %}#our">Our inftrastructure</a>
</li>
<li>
- <a href="#price">Pricing</a>
+ <a href="{% url 'railshosting:index' %}#price">Pricing</a>
</li>
<li>
- <a href="#contact">Contact</a>
+ <a href="{% url 'railshosting:index' %}#contact">Contact</a>
</li>
</ul>
</div>
@@ -78,7 +80,7 @@
<div class="container">
<div class=".col-md-6">
- <div class="intro-message"><img src="img/checkmark.png" class="responsive">
+ <div class="intro-message"><img src="{% static 'railshosting/img/checkmark.png' %}" class="responsive">
<p>Thank you for your interest in joining Rails-Hosting Beta.<br>
We will come back to you shortly to give you access to our infrastructure.
</p>
@@ -103,24 +105,24 @@
<div class="col-lg-12">
<ul class="list-inline">
<li>
- <a href="#">Home</a>
+ <a href="{% url 'railshosting:index' %}">Home</a>
</li>
<li class="footer-menu-divider">⋅</li>
<li>
- <a href="#about">How it works</a></li>
+ <a href="{% url 'railshosting:index' %}#how">How it works</a></li>
<li class="footer-menu-divider">⋅</li>
<li>
- <a href="#about">Your infrastructure</a></li>
+ <a href="{% url 'railshosting:index' %}#your">Your infrastructure</a></li>
<li>⋅</li>
<li>
- <a href="#about">Our infrastructure</a></li>
+ <a href="{% url 'railshosting:index' %}#our">Our infrastructure</a></li>
<li class="footer-menu-divider">⋅</li>
<li>
- <a href="#services">Pricing</a>
+ <a href="{% url 'railshosting:index' %}#price">Pricing</a>
</li>
<li class="footer-menu-divider">⋅</li>
<li>
- <a href="#contact">Contact</a>
+ <a href="{% url 'railshosting:index' %}#contact">Contact</a>
</li>
</ul>
<p class="copyright text-muted small">Copyright © ungleich GmbH 2015. All Rights Reserved</p>
@@ -130,10 +132,10 @@
</footer>
<!-- jQuery -->
- <script src="js/jquery.js"></script>
+ <script src="{% static 'railshosting/js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript -->
- <script src="js/bootstrap.min.js"></script>
+ <script src="{% static 'railshosting/js/bootstrap.min.js' %}"></script>
</body>
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 %}
+
<!DOCTYPE html>
<html lang="en">
@@ -12,15 +14,15 @@
<title>Rails Hosting.ch - Ruby on Rails as easy as possible</title>
<!-- Bootstrap Core CSS -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
+ <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
- <link href="css/landing-page.css" rel="stylesheet">
+ <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
<!-- Custom Fonts -->
- <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+ <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
- <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
+ <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -44,7 +46,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand topnav" href="#"><img src="img/logo_black.svg"></a>
+ <a class="navbar-brand topnav" href="#"><img src="{% static 'railshosting/img/logo_black.svg' %}"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -81,7 +83,7 @@
<div class="col-lg-12">
<div class="intro-message">
- <img class="responsive" src="img/Beta.png">
+ <img class="responsive" src="{% static 'railshosting/img/Beta.png' %}">
<h1>Rails-Hosting.ch</h1>
<h3>Ruby on Rails as easy as possible</h3>
<hr class="intro-divider">
@@ -124,7 +126,7 @@
</li></ul>
</div>
<div class="col-lg-5 col-sm-pull-6 col-sm-6">
- <img class="img-responsive" src="img/how3.png" alt="">
+ <img class="img-responsive" src="{% static 'railshosting/img/how3.png' %}" alt="">
</div>
</div>
@@ -143,7 +145,7 @@
<p class="lead">We configure your own infrastructure for Ruby on Rails. Keep the comfort and safety of being at your home, while we set things up for you.</p>
</div>
<div class="col-lg-5 col-lg-offset-2 col-sm-6">
- <img class="img-responsive" src="img/home.png" alt="">
+ <img class="img-responsive" src="{% static 'railshosting/img/home.png' %}" alt="">
</div>
</div>
@@ -166,7 +168,7 @@
<p class="lead">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.</p>
</div>
<div class="col-lg-5 col-sm-pull-6 col-sm-6">
- <img class="img-responsive" src="img/dog.png" alt="">
+ <img class="img-responsive" src="{% static 'railshosting/img/dog.png' %}" alt="">
</div>
</div>
@@ -199,7 +201,7 @@
<div class="col-md-3 col-sm-6 hero-feature">
<div class="thumbnail">
- <img class="relsonsive" src="img/economy.jpg" alt="">
+ <img class="relsonsive" src="{% static 'railshosting/img/economy.jpg' %}" alt="">
<div class="caption">
<h3>Economy </h3>
<p>Suited for smaller applications </p>
@@ -214,7 +216,7 @@
<div class="col-md-3 col-sm-6 hero-feature">
<div class="thumbnail">
- <img class="relsonsive" src="img/standardroom.jpg" alt="">
+ <img class="relsonsive" src="{% static 'railshosting/img/standardroom.jpg' %}" alt="">
<div class="caption">
<h3>Standard</h3>
<p>Suited for standard Ruby on Rails applications</p>
@@ -230,7 +232,7 @@
<div class="col-md-3 col-sm-6 hero-feature">
<div class="thumbnail">
- <img class="reponsive" src="img/deluxeroom.jpg" alt="">
+ <img class="reponsive" src="{% static 'railshosting/img/deluxeroom.jpg' %}" alt="">
<div class="caption">
<h3>Deluxe</h3>
<p>Suited for performance critical project</p>
@@ -245,7 +247,7 @@
<div class="col-md-3 col-sm-6 hero-feature">
<div class="thumbnail">
- <img class="responsive" src="img/presidentialroom.jpg" alt="">
+ <img class="responsive" src="{% static 'railshosting/img/presidentialroom.jpg' %}" alt="">
<div class="caption">
<h3>Presidential Premium</h3>
<p> Suited for performance critical & </p>
@@ -279,10 +281,14 @@
<h1>Let me try!</h1>
<p> </p>
<p> </p>
- <form class="form-inline">
+ {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+ {{ form.non_field_errors }}
+ {{ form.email.errors }}
+ <form action="{% url 'railshosting:index' %}" method="post" role="form" class="form-inline">
+ {% csrf_token %}
<div class="form-group">
- <label class="sr-only" for="exampleInputEmail3">Email address</label>
- <input type="email" class="form-control" id="exampleInputEmail3" placeholder="Enter email">
+ <label class="sr-only" for="email">Email address</label>
+ <input type="email" name="email" class="form-control" id="id_email" placeholder="Enter email">
</div>
<button type="submit" class="btn btn-default">Request Beta Access</button>
</form>
@@ -363,10 +369,10 @@
</footer>
<!-- jQuery -->
- <script src="js/jquery.js"></script>
+ <script src="{% static 'railshosting/js/jquery.js' }"></script>
<!-- Bootstrap Core JavaScript -->
- <script src="js/bootstrap.min.js"></script>
+ <script src="{% static 'railshosting/js/bootstrap.min.js' %}"></script>
</body>
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')