diff --git a/src/mister_cobol_web/admin.py b/src/mister_cobol_web/admin.py
index 51cdb27..8876e16 100644
--- a/src/mister_cobol_web/admin.py
+++ b/src/mister_cobol_web/admin.py
@@ -1,5 +1,4 @@
from django.contrib import admin
-from django.contrib.contenttypes import generic
from solo.admin import SingletonModelAdmin
from .models import *
diff --git a/src/mister_cobol_web/migrations/0001_initial.py b/src/mister_cobol_web/migrations/0001_initial.py
index 2157c61..a82fbc9 100644
--- a/src/mister_cobol_web/migrations/0001_initial.py
+++ b/src/mister_cobol_web/migrations/0001_initial.py
@@ -85,7 +85,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='aboutus',
name='image',
- field=models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image'),
+ field=models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE),
preserve_default=True,
),
migrations.CreateModel(
@@ -94,7 +94,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, serialize=False, verbose_name='ID', primary_key=True)),
('name', models.CharField(max_length=100, verbose_name='Name')),
('description', models.TextField(verbose_name='Description')),
- ('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image')),
+ ('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE)),
],
options={
'verbose_name_plural': 'Members',
@@ -117,7 +117,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='home',
name='main_video',
- field=models.ForeignKey(to='mister_cobol_web.Video', verbose_name='Main video'),
+ field=models.ForeignKey(to='mister_cobol_web.Video', verbose_name='Main video', on_delete = models.CASCADE),
preserve_default=True,
),
]
diff --git a/src/mister_cobol_web/migrations/0003_auto_20140715_1532.py b/src/mister_cobol_web/migrations/0003_auto_20140715_1532.py
index b441717..3203ddd 100644
--- a/src/mister_cobol_web/migrations/0003_auto_20140715_1532.py
+++ b/src/mister_cobol_web/migrations/0003_auto_20140715_1532.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='image',
- field=models.ForeignKey(verbose_name='Image', to='mister_cobol_web.Image', default=''),
+ field=models.ForeignKey(verbose_name='Image', to='mister_cobol_web.Image', default='', on_delete = models.CASCADE),
preserve_default=False,
),
migrations.RemoveField(
diff --git a/src/mister_cobol_web/migrations/0006_tour.py b/src/mister_cobol_web/migrations/0006_tour.py
index a120963..f9c0027 100644
--- a/src/mister_cobol_web/migrations/0006_tour.py
+++ b/src/mister_cobol_web/migrations/0006_tour.py
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('title', models.CharField(max_length=50, verbose_name='Title')),
('description', models.TextField(verbose_name='Description')),
- ('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image')),
+ ('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE)),
],
options={
'verbose_name_plural': 'Tours',
diff --git a/src/mister_cobol_web/migrations/0011_auto_20140717_1235.py b/src/mister_cobol_web/migrations/0011_auto_20140717_1235.py
index 93b7e78..24cb7e5 100644
--- a/src/mister_cobol_web/migrations/0011_auto_20140717_1235.py
+++ b/src/mister_cobol_web/migrations/0011_auto_20140717_1235.py
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='tour',
name='image',
- field=models.ForeignKey(blank=True, verbose_name='Image', to='mister_cobol_web.Image', null=True),
+ field=models.ForeignKey(blank=True, verbose_name='Image', to='mister_cobol_web.Image', null=True, on_delete = models.CASCADE),
),
]
diff --git a/src/mister_cobol_web/models.py b/src/mister_cobol_web/models.py
index d81fa13..0e8d13f 100644
--- a/src/mister_cobol_web/models.py
+++ b/src/mister_cobol_web/models.py
@@ -51,6 +51,7 @@ class Member(models.Model):
)
image = models.ForeignKey('Image',
blank=False, null=False,
+ on_delete = models.CASCADE,
verbose_name=_(u'Image')
)
order = models.SmallIntegerField(
@@ -77,6 +78,7 @@ class Tour(SingletonModel):
)
image = models.ForeignKey('Image',
blank=True, null=True,
+ on_delete = models.CASCADE,
verbose_name=_(u'Image')
)
diff --git a/src/mister_cobol_web/settings/common.py b/src/mister_cobol_web/settings/common.py
index 036985b..e5de21d 100644
--- a/src/mister_cobol_web/settings/common.py
+++ b/src/mister_cobol_web/settings/common.py
@@ -49,12 +49,12 @@
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+ #'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
@@ -115,6 +115,29 @@
# Example: "http://example.com/static/", "http://static.example.com/"
STATIC_URL = '/static/'
+# Django-pug
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'DIRS': [os.path.join(BASE_DIR, 'templates')],
+ 'APP_DIRS': True,
+ 'OPTIONS': {
+ 'debug': DEBUG,
+ 'context_processors': [
+ 'django.contrib.auth.context_processors.auth',
+ 'django.template.context_processors.request',
+ 'django.template.context_processors.debug',
+ 'django.template.context_processors.i18n',
+ 'django.template.context_processors.media',
+ 'django.template.context_processors.static',
+ 'django.template.context_processors.tz',
+ 'django.contrib.messages.context_processors.messages',
+ ]
+ },
+ },
+]
+
+
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
CONTACT_EMAILS_DESTINATION = 'dummy@dummy.com'
diff --git a/src/mister_cobol_web/static/css/style.css b/src/mister_cobol_web/static/css/style.css
index 5e05f64..3011b82 100644
--- a/src/mister_cobol_web/static/css/style.css
+++ b/src/mister_cobol_web/static/css/style.css
@@ -563,7 +563,7 @@ body {
font-family: 'Gotham', sans-serif;
color: #efefef;
line-height: 1.5;
- background: url("../images/bg-res.jpg") 50% 0 fixed;
+ background-color: black;
background-position: center top;
background-repeat: repeat;
}
diff --git a/src/mister_cobol_web/static/images/bg-drops1.png b/src/mister_cobol_web/static/images/bg-drops1.png
deleted file mode 100644
index 61b5523..0000000
Binary files a/src/mister_cobol_web/static/images/bg-drops1.png and /dev/null differ
diff --git a/src/mister_cobol_web/static/images/bg-drops2.png b/src/mister_cobol_web/static/images/bg-drops2.png
deleted file mode 100644
index afc59ef..0000000
Binary files a/src/mister_cobol_web/static/images/bg-drops2.png and /dev/null differ
diff --git a/src/mister_cobol_web/static/images/bg-res.jpg b/src/mister_cobol_web/static/images/bg-res.jpg
deleted file mode 100644
index bc51505..0000000
Binary files a/src/mister_cobol_web/static/images/bg-res.jpg and /dev/null differ
diff --git a/src/mister_cobol_web/static/images/foto_i_pad.jpg b/src/mister_cobol_web/static/images/foto_i_pad.jpg
deleted file mode 100644
index 944abef..0000000
Binary files a/src/mister_cobol_web/static/images/foto_i_pad.jpg and /dev/null differ
diff --git a/src/mister_cobol_web/static/images/main-logo.png b/src/mister_cobol_web/static/images/main-logo.png
index 2c17201..1833e6b 100644
Binary files a/src/mister_cobol_web/static/images/main-logo.png and b/src/mister_cobol_web/static/images/main-logo.png differ
diff --git a/src/mister_cobol_web/templates/index.html b/src/mister_cobol_web/templates/index.html
index d39fe27..91a57f7 100644
--- a/src/mister_cobol_web/templates/index.html
+++ b/src/mister_cobol_web/templates/index.html
@@ -13,7 +13,6 @@
-
diff --git a/src/mister_cobol_web/urls.py b/src/mister_cobol_web/urls.py
index 3c60d24..58f78d3 100644
--- a/src/mister_cobol_web/urls.py
+++ b/src/mister_cobol_web/urls.py
@@ -1,18 +1,14 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.contrib import admin
from django.conf import settings
from .views import LandingView, ContactView
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'mister_cobol_web.views.home', name='home'),
- # url(r'^blog/', include('blog.urls')),
-
- url(r'^admin/', include(admin.site.urls)),
+urlpatterns = [
+ url(r'^admin/', admin.site.urls),
url(r'^$', LandingView.as_view(), name='landing'),
url(r'^contact/$', ContactView.as_view(), name='contact'),
-)
+]