diff --git a/digitalglarus/models.py b/digitalglarus/models.py index a3b9dd9c..ae91db47 100644 --- a/digitalglarus/models.py +++ b/digitalglarus/models.py @@ -91,7 +91,8 @@ class Membership(models.Model): @classmethod def activate_or_crete(cls, data, user): membership = cls.get_by_user(user) - obj, created = cls.objects.update_or_create(id=membership.id, defaults=data) + membership_id = membership.id if membership else None + obj, created = cls.objects.update_or_create(id=membership_id, defaults=data) return obj @classmethod diff --git a/digitalglarus/static/digitalglarus/css/history.css b/digitalglarus/static/digitalglarus/css/history.css index 0f0cdc9d..7d40d226 100644 --- a/digitalglarus/static/digitalglarus/css/history.css +++ b/digitalglarus/static/digitalglarus/css/history.css @@ -254,7 +254,7 @@ header { .supporter-black { padding: 15px 5px 15px; - color: #f5f5f5; + color: #000000; font-size:18px; font-weight: 200; font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; diff --git a/digitalglarus/templates/digitalglarus/history.html b/digitalglarus/templates/digitalglarus/history.html index f3e96e7f..67a0489a 100755 --- a/digitalglarus/templates/digitalglarus/history.html +++ b/digitalglarus/templates/digitalglarus/history.html @@ -102,7 +102,7 @@
{% endfor %}
- Become a supporter + Become a supporter


diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html index 973b99c5..176f5e6b 100644 --- a/digitalglarus/templates/digitalglarus/supportus.html +++ b/digitalglarus/templates/digitalglarus/supportus.html @@ -1,6 +1,34 @@ {% extends "new_base_glarus.html" %} {% load staticfiles cms_tags %} +{% block extra_css %} + +{% endblock %} + + {% block content %} @@ -38,9 +66,9 @@
- + - + @@ -57,9 +85,9 @@
- - - + + + @@ -80,9 +108,9 @@
- + - +