From 2477fbc11bae47c3e69d5715594c3dae1e2aa539 Mon Sep 17 00:00:00 2001
From: Tomislav R <tmslav@gmail.com>
Date: Mon, 7 Mar 2016 19:19:25 +0100
Subject: [PATCH] update req file and update directory structure

---
 dynamicweb/settings/base.py                               | 4 ++++
 membership/models.py                                      | 8 +++++---
 requirements.txt                                          | 2 --
 templates/{ => cms}/digitalglarus/__init__.py             | 0
 templates/{ => cms}/digitalglarus/about.html              | 0
 templates/{ => cms}/digitalglarus/base.html               | 2 +-
 templates/{ => cms}/digitalglarus/contact.html            | 0
 templates/{ => cms}/digitalglarus/detail.html             | 0
 templates/{ => cms}/digitalglarus/index.html              | 0
 templates/{ => cms}/digitalglarus/letscowork.html         | 2 +-
 templates/{ => cms}/digitalglarus/one_column.html         | 0
 .../digitalglarus/partials/language-chooser.html          | 0
 templates/{ => cms}/digitalglarus/partials/menu.html      | 0
 templates/{ => cms}/digitalglarus/two_columns.html        | 0
 templates/{ => cms}/ungleichch/__init__.py                | 0
 templates/{ => cms}/ungleichch/_footer.html               | 0
 templates/{ => cms}/ungleichch/_header_base.html          | 0
 templates/{ => cms}/ungleichch/_menu.html                 | 0
 templates/{ => cms}/ungleichch/base.html                  | 0
 templates/{ => cms}/ungleichch/blog.html                  | 0
 templates/{ => cms}/ungleichch/index.html                 | 0
 templates/{ => cms}/ungleichch/page.html                  | 0
 22 files changed, 11 insertions(+), 7 deletions(-)
 rename templates/{ => cms}/digitalglarus/__init__.py (100%)
 rename templates/{ => cms}/digitalglarus/about.html (100%)
 rename templates/{ => cms}/digitalglarus/base.html (98%)
 rename templates/{ => cms}/digitalglarus/contact.html (100%)
 rename templates/{ => cms}/digitalglarus/detail.html (100%)
 rename templates/{ => cms}/digitalglarus/index.html (100%)
 rename templates/{ => cms}/digitalglarus/letscowork.html (96%)
 rename templates/{ => cms}/digitalglarus/one_column.html (100%)
 rename templates/{ => cms}/digitalglarus/partials/language-chooser.html (100%)
 rename templates/{ => cms}/digitalglarus/partials/menu.html (100%)
 rename templates/{ => cms}/digitalglarus/two_columns.html (100%)
 rename templates/{ => cms}/ungleichch/__init__.py (100%)
 rename templates/{ => cms}/ungleichch/_footer.html (100%)
 rename templates/{ => cms}/ungleichch/_header_base.html (100%)
 rename templates/{ => cms}/ungleichch/_menu.html (100%)
 rename templates/{ => cms}/ungleichch/base.html (100%)
 rename templates/{ => cms}/ungleichch/blog.html (100%)
 rename templates/{ => cms}/ungleichch/index.html (100%)
 rename templates/{ => cms}/ungleichch/page.html (100%)

diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index f57c9794..5d9af85a 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -120,6 +120,10 @@ TEMPLATES = [
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
             os.path.join(PROJECT_DIR, 'membership/'),  # membership template
+            os.path.join(PROJECT_DIR,'templates/'),
+            os.path.join(PROJECT_DIR,'templates/digitalglarus/partials'),
+            os.path.join(PROJECT_DIR,'templates/cms'),
+            os.path.join(PROJECT_DIR,'templates/digitalglarus'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
diff --git a/membership/models.py b/membership/models.py
index a761be7b..273b764b 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -51,7 +51,7 @@ class CustomUser(AbstractBaseUser):
     objects = MyUserManager()
 
     USERNAME_FIELD = "email"
-    REQUIRED_FIELDS = ['name','password']
+    REQUIRED_FIELDS = ['name', 'password']
 
     @classmethod
     def register(cls, name, password, email):
@@ -60,7 +60,8 @@ class CustomUser(AbstractBaseUser):
             user = cls.objects.create_user(username=name, email=email, password=password)
             if user:
                 user.validation_slug = make_password(None)
-                send_mail(REGISTRATION_MESSAGE['subject'], REGISTRATION_MESSAGE['message'].format(user.validation_slug),
+                send_mail(REGISTRATION_MESSAGE['subject'],
+                          REGISTRATION_MESSAGE['message'].format(user.validation_slug),
                           REGISTRATION_MESSAGE['from'], [user.email], fail_silently=False)
                 return user
             else:
@@ -75,8 +76,10 @@ class CustomUser(AbstractBaseUser):
             user.validated = 1
             return True
         return False
+
     def is_superuser(self):
         return True
+
     def is_admin(self):
         return True
 
@@ -107,7 +110,6 @@ class CustomUser(AbstractBaseUser):
         # Simplest possible answer: All admins are staff
         return self.is_admin
 
-
 # class CreditCards(models.Model):
 #     id = models.IntegerField(primary_key=True)
 #     user_id = models.ForeignKey(User, on_delete=models.CASCADE)
diff --git a/requirements.txt b/requirements.txt
index c779cefb..8b8a558d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -92,7 +92,6 @@ pyzmq==14.7.0
 requests==2.7.0
 simplejson==3.8.0
 six==1.10.0
-South==1.0.2
 sqlparse==0.1.15
 stripe==1.22.3
 tomako==0.1.0
@@ -100,5 +99,4 @@ TornadIO2==0.0.3
 tornado==4.2.1
 Unidecode==0.4.19
 URLObject==2.4.0
-wheel==0.29.0
 YURL==0.13
diff --git a/templates/digitalglarus/__init__.py b/templates/cms/digitalglarus/__init__.py
similarity index 100%
rename from templates/digitalglarus/__init__.py
rename to templates/cms/digitalglarus/__init__.py
diff --git a/templates/digitalglarus/about.html b/templates/cms/digitalglarus/about.html
similarity index 100%
rename from templates/digitalglarus/about.html
rename to templates/cms/digitalglarus/about.html
diff --git a/templates/digitalglarus/base.html b/templates/cms/digitalglarus/base.html
similarity index 98%
rename from templates/digitalglarus/base.html
rename to templates/cms/digitalglarus/base.html
index 990bf7a7..684e92bb 100644
--- a/templates/digitalglarus/base.html
+++ b/templates/cms/digitalglarus/base.html
@@ -51,7 +51,7 @@
   {% cms_toolbar %}
     <div class="brand">Digital Glarus</div>
     <div class="address-bar">
-      {% placeholder 'digital_glarus_legend' %}
+{#      {% placeholder 'digital_glarus_legend' %}#}
     </div>
     <div class="center-block">
       <ul class="list-inline center-block language-chooser-list">
diff --git a/templates/digitalglarus/contact.html b/templates/cms/digitalglarus/contact.html
similarity index 100%
rename from templates/digitalglarus/contact.html
rename to templates/cms/digitalglarus/contact.html
diff --git a/templates/digitalglarus/detail.html b/templates/cms/digitalglarus/detail.html
similarity index 100%
rename from templates/digitalglarus/detail.html
rename to templates/cms/digitalglarus/detail.html
diff --git a/templates/digitalglarus/index.html b/templates/cms/digitalglarus/index.html
similarity index 100%
rename from templates/digitalglarus/index.html
rename to templates/cms/digitalglarus/index.html
diff --git a/templates/digitalglarus/letscowork.html b/templates/cms/digitalglarus/letscowork.html
similarity index 96%
rename from templates/digitalglarus/letscowork.html
rename to templates/cms/digitalglarus/letscowork.html
index bdfbec2b..71b0aae7 100644
--- a/templates/digitalglarus/letscowork.html
+++ b/templates/cms/digitalglarus/letscowork.html
@@ -1,4 +1,4 @@
-{% extends "cms/digitalglarus/base.html" %}
+{% extends "digitalglarus/base.html" %}
 {% load staticfiles cms_tags %}
 {% block title %}crowdfunding{% endblock %}
 
diff --git a/templates/digitalglarus/one_column.html b/templates/cms/digitalglarus/one_column.html
similarity index 100%
rename from templates/digitalglarus/one_column.html
rename to templates/cms/digitalglarus/one_column.html
diff --git a/templates/digitalglarus/partials/language-chooser.html b/templates/cms/digitalglarus/partials/language-chooser.html
similarity index 100%
rename from templates/digitalglarus/partials/language-chooser.html
rename to templates/cms/digitalglarus/partials/language-chooser.html
diff --git a/templates/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html
similarity index 100%
rename from templates/digitalglarus/partials/menu.html
rename to templates/cms/digitalglarus/partials/menu.html
diff --git a/templates/digitalglarus/two_columns.html b/templates/cms/digitalglarus/two_columns.html
similarity index 100%
rename from templates/digitalglarus/two_columns.html
rename to templates/cms/digitalglarus/two_columns.html
diff --git a/templates/ungleichch/__init__.py b/templates/cms/ungleichch/__init__.py
similarity index 100%
rename from templates/ungleichch/__init__.py
rename to templates/cms/ungleichch/__init__.py
diff --git a/templates/ungleichch/_footer.html b/templates/cms/ungleichch/_footer.html
similarity index 100%
rename from templates/ungleichch/_footer.html
rename to templates/cms/ungleichch/_footer.html
diff --git a/templates/ungleichch/_header_base.html b/templates/cms/ungleichch/_header_base.html
similarity index 100%
rename from templates/ungleichch/_header_base.html
rename to templates/cms/ungleichch/_header_base.html
diff --git a/templates/ungleichch/_menu.html b/templates/cms/ungleichch/_menu.html
similarity index 100%
rename from templates/ungleichch/_menu.html
rename to templates/cms/ungleichch/_menu.html
diff --git a/templates/ungleichch/base.html b/templates/cms/ungleichch/base.html
similarity index 100%
rename from templates/ungleichch/base.html
rename to templates/cms/ungleichch/base.html
diff --git a/templates/ungleichch/blog.html b/templates/cms/ungleichch/blog.html
similarity index 100%
rename from templates/ungleichch/blog.html
rename to templates/cms/ungleichch/blog.html
diff --git a/templates/ungleichch/index.html b/templates/cms/ungleichch/index.html
similarity index 100%
rename from templates/ungleichch/index.html
rename to templates/cms/ungleichch/index.html
diff --git a/templates/ungleichch/page.html b/templates/cms/ungleichch/page.html
similarity index 100%
rename from templates/ungleichch/page.html
rename to templates/cms/ungleichch/page.html