Ep19/adjustments for cms (#871)

* added cms toolbar

* replace homegrown bootstrap forms lib with crispy bootstrap4 pack

* more homepage improvements with placeholder data

* added news and further updates to homepage

* added commented out version of a logo

* Remove custom skin for CK Editor

* some footer improvements including cms menu

* small cms adjustment

* Fix the initial fixture placeholder name.

* readded cookie consent from ep18

* improved registration form; added dev_settings and test_settings; fixed email handling during registration; added fontawesome

* fixed requirements

* handle password reset with new templates

* fixed tests

* added password change views to user panel

* removed old registration templates

* removed some old, now unused, mostly assopy code related to account management

* more updates for 2019, cleaned up some settings

* reorganize CMS seed, fix db path in redo_db in Makefile

Author: artcz

.gitignore

@@ -1,3 +1,5 @@
+.vimrc
+tags
 *.pyc
 *.swp
 settings_locale.py

Makefile

@@ -37,6 +37,12 @@ db:
 	python manage.py migrate
 	python manage.py create_initial_data_for_dev
 
+
+drop_db:
+	rm -f data/site/epcon.db
+
+redo_db: drop_db db
+
 test:
 	pytest -n auto
 
@@ -46,8 +52,8 @@ test-no-warnings:
 test-no-django-20-warnings:
 	pytest -c pytest_no_django_20_warnings.ini
 
-server:
-	DEBUG=True ./manage.py runserver 0:37266
+server-dev:
+	DJANGO_SETTINGS_MODULE="pycon.dev_settings" DEBUG=True ./manage.py runserver 0:37266
 
 shell:
 	DEBUG=True ./manage.py shell_plus

assets/css/ep19-customisations.css

@@ -3,17 +3,27 @@
 /* secondary: d87a00 */
 /* secondary-light: f8c48f */
 
+.text-primary-light { color: #76bdc4; }
+.text-secondary-light { color: #f8c48f; }
+
 #background_image {
     background: url('/static/img/ep19-basel-dark.jpg');
     background-size: cover;
     color: white;
     min-height: 90px
 }
 .jumbotron { height: 800px; background: transparent; color: white; }
+.text-underline { text-decoration: underline; }
 
+.page { min-height: 500px; padding-bottom: 10em; }
 #footer { background: #007d8a; padding: 1em 0; color: #f8c48f}
-#footer a { color: white; border-bottom: 1px solid #eee; }
-#homepage_venue { background: #d87a00; padding: 1em 0; margin: 1em 0}
+#footer a { color: white; border-bottom: 1px solid rgba(255, 255, 255, 0.2); }
+#footer ul { list-style-type: none; padding-left: 0}
+#footer ul li { margin: .5em 0; }
+#homepage_news { background: #007d8a; padding: 2em 0; margin 0:}
+.news-card { height: 300px; }
+
+#homepage_venue { background: #d87a00; padding: 1em 0; margin: 0}
 #homepage_schedule_overview { margin: 2em 0; }
 
 #tickets-link-header { color: #fff; border-bottom: 2px solid #fff; margin-right: 2px }
@@ -28,16 +38,26 @@
     color: white;
     border-bottom: 2px solid white;
 }
+a.navbar-brand:hover{
+    color: white;
+}
 
 #content_page {
     min-height: 500px;
     margin: 40px 0;
 }
+#sidebar ul {
+    padding-left: 0;
+}
 
-ul.cms_menu { margin-left: 0px; padding-left: 15px; margin-bottom: 30px}
-li.cms_menu { margin-top: .7em; list-style-type: none}
-li.cms_menu.ancestor { background: #eee; padding: .5em; border-radius: 5px}
-li.cms_menu.selected { font-weight: bold; }
+#sidebar li ul {
+    padding-left: 20px;
+}
+
+#sidebar ul.cms_menu { margin-left: 0px; padding-left: 15px; margin-bottom: 30px}
+#sidebar li.cms_menu { margin-top: .7em; list-style-type: none}
+#sidebar li.cms_menu.ancestor { background: #f6f6f6; padding: .5em; }
+#sidebar li.cms_menu.selected { font-weight: bold; }
 
 
 #user_panel {
@@ -49,3 +69,9 @@ li.cms_menu.selected { font-weight: bold; }
     padding-bottom: 10em;
     min-height: 500px;
 }
+
+.news {
+    margin: 2em 0;
+    padding: 1em 0;
+    border-bottom: 1px dashed #eee;
+}

assets/img/conference_venue.png

@@ -1,7 +1,4 @@
-
-
 from django import forms
-from django.contrib import auth
 from django.conf import settings as dsettings
 from django.utils.translation import ugettext as _
 
@@ -13,6 +10,7 @@
 
 log = logging.getLogger('assopy.forms')
 
+
 # autostrip - http://djangosnippets.org/snippets/956/
 # il motivo per questo abominio?
 # http://code.djangoproject.com/ticket/6362
@@ -36,44 +34,6 @@ def get_clean_func(original_clean):
 """.strip()
 
 
-class LoginForm(auth.forms.AuthenticationForm):
-    email = forms.EmailField()
-    i_accept_privacy_policy = forms.BooleanField(
-        label=PRIVACY_POLICY_CHECKBOX
-    )
-
-    def __init__(self, *args, **kwargs):
-        super(LoginForm, self).__init__(*args, **kwargs)
-        del self.fields['username']
-
-    def clean(self):
-        data = self.cleaned_data
-        if not data.get('i_accept_privacy_policy'):
-            raise forms.ValidationError(PRIVACY_POLICY_ERROR)
-
-        if data.get('email') and data.get('password'):
-            user = auth.authenticate(email=data['email'],
-                                     password=data['password'])
-            self.user_cache = user
-            if user is None:
-                raise forms.ValidationError('Invalid credentials')
-            elif not user.is_active:
-                raise forms.ValidationError('This account is inactive.')
-        return data
-
-
-class SetPasswordForm(auth.forms.SetPasswordForm):
-    def save(self, *args, **kwargs):
-        user = super(SetPasswordForm, self).save(*args, **kwargs)
-#        u = self.user.assopy_user
-        # non voglio riabilitare un utente con is_active=False, voglio tenermi
-        # questo flag come uno strumento di amministrazione per impedire
-        # l'accesso al sito
-#        if not u.verified:
-#            log.info('password reset for "%s" completed; now he\' a verified user', user.email)
-#            u.verified = True
-#            u.save()
-        return user
 
 class Profile(forms.ModelForm):
     first_name = forms.CharField(
@@ -137,72 +97,6 @@ def clean_card_name(self):
 BillingData = autostrip(BillingData)
 
 
-class NewAccountForm(forms.Form):
-
-    first_name = forms.CharField(max_length=32)
-    last_name = forms.CharField(max_length=32)
-    email = forms.EmailField()
-    password1 = forms.CharField(label="Password",
-                                widget=forms.PasswordInput)
-    password2 = forms.CharField(label="Confirm password",
-                                widget=forms.PasswordInput)
-
-    # Additional captcha field with simple python questions
-    # https://github.com/EuroPython/epcon/issues/703
-    captcha_question = forms.CharField(widget=forms.HiddenInput)
-    captcha_answer = forms.CharField()
-
-    # Keep this in sync with LoginForm.i_accept_privacy_policy
-    i_accept_privacy_policy = forms.BooleanField(
-        label=PRIVACY_POLICY_CHECKBOX
-    )
-
-    def __init__(self, *args, **kwargs):
-        super(NewAccountForm, self).__init__(*args, **kwargs)
-        random_question = self.get_random_captcha_question()
-        if random_question:
-            self.fields['captcha_question'].initial = random_question.question
-            self.fields['captcha_answer'].label     = random_question.question
-        else:
-            del self.fields['captcha_question']
-            del self.fields['captcha_answer']
-
-    def get_random_captcha_question(self):
-        try:
-            return cmodels.CaptchaQuestion.objects.get_random_question()
-        except cmodels.CaptchaQuestion.NoQuestionsAvailable:
-            return None
-
-    def clean_captcha_answer(self):
-        question = self.cleaned_data['captcha_question']
-        cq = cmodels.CaptchaQuestion.objects.get(question=question)
-        if cq.answer.strip() != self.cleaned_data['captcha_answer'].strip():
-            raise forms.ValidationError("Sorry, that's a wrong answer")
-        return self.cleaned_data['captcha_question']
-
-    def clean_email(self):
-        email = self.cleaned_data['email']
-        if auth.models.User.objects.filter(email__iexact=email).count() > 0:
-            raise forms.ValidationError('Email already in use')
-
-        return email.lower()
-
-    def clean(self):
-        if not self.cleaned_data.get('i_accept_privacy_policy'):
-            raise forms.ValidationError(PRIVACY_POLICY_ERROR)
-
-        if not self.is_valid():
-            return super(NewAccountForm, self).clean()
-
-        data = self.cleaned_data
-        if data['password1'] != data['password2']:
-            raise forms.ValidationError('password mismatch')
-        return data
-
-
-NewAccountForm = autostrip(NewAccountForm)
-
-
 class FormTickets(forms.Form):
     payment = forms.ChoiceField(choices=(('paypal', 'PayPal'),('bank', 'Bank')))
     order_type = forms.ChoiceField(