server push

digitalglarus/urls.py

@@ -1,4 +1,5 @@
-from django.conf.urls import url
+from django.conf.urls import url,include
+from djangocms_blog.urls import urlpatterns as blog_patterns
 
 from . import views
 
@@ -9,6 +10,6 @@ urlpatterns = [
     url(r'old_letscowork$', views.letscowork, name='letscowork'),
     url(r'old_home$', views.home, name='home'),
     url(r'supporters/$', views.supporters, name='supporters'),
-    url(r'blog/$', views.blog, name='blog'),
+    url(r'blog/',views.blog, name='blog'),
     url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
 ]

dynamicweb/settings/base.py

@@ -48,6 +48,13 @@ SECRET_KEY = env('DJANGO_SECRET_KEY')
 INSTALLED_APPS = (
     #1st migrate
     'membership',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.sites',
     'easy_thumbnails',
     'mptt',
     'parler',
@@ -61,35 +68,31 @@ INSTALLED_APPS = (
     'filer',
     'djangocms_blog',
     'cms',  # django CMS itself
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.sites',
     'treebeard',  # utilities for implementing a tree
     'sekizai',  # for javascript and css management
     'menus',  # helper for model independent hierarchical website navigation
     'cmsplugin_filer_image',
+
     #2nd migrate
     # django-cms plugins
-    'djangocms_file',
+#    'djangocms_file',
-    'djangocms_picture',
+#    'djangocms_picture',
-    'djangocms_video',
+#    'djangocms_video',
-    'djangocms_flash',
+#    'djangocms_flash',
-    'djangocms_googlemap',
+#    'djangocms_googlemap',
-    'djangocms_inherit',
+#    'djangocms_inherit',
-    'djangocms_link',
+#    'djangocms_link',
-    'djangocms_teaser',
+#    'djangocms_teaser',
-    'djangocms_page_meta',
+#    'djangocms_page_meta',
-    'djangocms_text_ckeditor',
+#    'djangocms_text_ckeditor',
-    'djangocms_admin_style',
+#    'djangocms_admin_style',
-    'cmsplugin_filer_file',
+#    'cmsplugin_filer_file',
-    'cmsplugin_filer_folder',
+#    'cmsplugin_filer_folder',
-    'cmsplugin_filer_link',
+#    'cmsplugin_filer_link',
-    'cmsplugin_filer_teaser',
+#    'cmsplugin_filer_teaser',
-    'cmsplugin_filer_video',
+#    'cmsplugin_filer_video',
+
+    #blog
     # versioning
     'reversion',
     # ungleich
@@ -301,9 +304,9 @@ STATICFILES_FINDERS = (
     'compressor.finders.CompressorFinder',
 )
 
-COMPRESS_PRECOMPILERS = (
+#COMPRESS_PRECOMPILERS = (
-    ('text/less', 'lesscpy {infile}'),
+#    ('text/less', 'lesscpy {infile}'),
-)
+#)
 
 THUMBNAIL_PROCESSORS = (
     'easy_thumbnails.processors.colorspace',

membership/models.py

@@ -22,9 +22,9 @@ class MyUserManager(BaseUserManager):
         user = self.model(
             email=self.normalize_email(email),
             name=name,
-            password=password,
             validation_slug=make_password(None)
         )
+        user.set_password(password)
         user.save(using=self._db)
         return user
 
@@ -32,11 +32,9 @@ class MyUserManager(BaseUserManager):
         """
         Creates and saves a superuser with the given email, name and password.
         """
-        import ipdb;ipdb.set_trace()
         user = self.create_user(email,
                                 password=password,
                                 name=name,
-                                validation_slug=make_password(None)
                                 )
         user.is_admin = True
         user.save(using=self._db)

requirements.txt

@@ -1,4 +1,5 @@
 Django==1.9.4
+aldryn-newsblog
 wheel
 django-bootstrap3
 django-cms
@@ -43,4 +44,4 @@ Pillow>=2
 django-filer
 cmsplugin-filer
 django-reversion
-
+pylibmc

templates/djangocms_blog/_header_post_detail.html

@@ -4,8 +4,6 @@
 <header class="intro-header"
 	{% if post.main_image_id  %}
 	style="background-image: url('{{ post.main_image.url }}');"
-	{% else %}
-	style="background-image: url('{% static 'blog.ungleich.ch/img/home-bg.jpg'  %}');"
 	{% endif %}
 	>
   <div class="container">

templates/djangocms_blog/includes/blog_item.html

@@ -1,5 +1,4 @@
 {% load i18n thumbnail cms_tags %}
-{% load url from future %}
 
 <div class="post-preview">
   <a href=" {{ post.get_absolute_url }} ">