Merge branch 'release/1.4'

.gitignore

@@ -19,3 +19,6 @@ static/
 
 \#*#
 .\#*
+*~
+
+static/

Makefile

@@ -5,7 +5,7 @@ BASEDIR=$(CURDIR)
 SSH_HOST=dynamicweb-staging.ungleich.ch
 SSH_PORT=22
 SSH_USER=app
-SSH_TARGET_DIR=/home/$(SSH_USER)/django
+SSH_TARGET_DIR=/home/$(SSH_USER)/app
 
 help:
 	@echo 'Makefile for a dynamicweb website'
@@ -18,7 +18,7 @@ collectstatic:
 	$(PY?) $(BASEDIR)/manage.py collectstatic
 
 rsync_upload:
-	rsync -P -rvzc -e "ssh -p $(SSH_PORT)" --exclude dynamicweb/local/local_settings.py --exclude .git --exclude .ropeproject --exclude __pycache__ --exclude *.pyc --exclude *~ --exclude *.psd $(BASEDIR) $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+	rsync -P -rvzc -e "ssh -p $(SSH_PORT)" --exclude dynamicweb/local/local_settings.py --exclude .git --exclude .ropeproject --exclude __pycache__ --exclude *.pyc --exclude *~ --exclude *.psd $(BASEDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
 
 install_debian_packages:
 	apt-get update && cat $(BASEDIR)/requirements.debian.txt | xargs apt-get install -y --no-install-recommends

README.rst

@@ -1,2 +1,7 @@
-Ungleich 
+Ungleich
 ========
+
+Website for Ungleich GMBH
+
+dynamicweb
+----------

dynamicweb/settings.py

@@ -250,8 +250,6 @@ if LOGOUT_URL is None:
 if LOGIN_REDIRECT_URL is None:
     LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
 
-
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
@@ -319,6 +317,81 @@ TEXT_SAVE_IMAGE_FUNCTION='cmsplugin_filer_image.integrations.ckeditor.create_ima
 TEXT_ADDITIONAL_TAGS = ('iframe',)
 TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
 USE_X_FORWARDED_HOST = True
+
+# Django Bootstrap - Settings
+# Added Configuration for bootstrap static files to load over https.
+BOOTSTRAP3 = {
+
+    # The URL to the jQuery JavaScript file
+    'jquery_url': '//code.jquery.com/jquery.min.js',
+
+    # The Bootstrap base URL
+    'base_url': '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/',
+
+    # The complete URL to the Bootstrap CSS file (None means derive it from base_url)
+    'css_url': None,
+
+    # The complete URL to the Bootstrap CSS file (None means no theme)
+    'theme_url': None,
+
+    # The complete URL to the Bootstrap JavaScript file (None means derive it from base_url)
+    'javascript_url': None,
+
+    # Put JavaScript in the HEAD section of the HTML document (only relevant if you use bootstrap3.html)
+    'javascript_in_head': False,
+
+    # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
+    'include_jquery': False,
+
+    # Label class to use in horizontal forms
+    'horizontal_label_class': 'col-md-3',
+
+    # Field class to use in horizontal forms
+    'horizontal_field_class': 'col-md-9',
+
+    # Set HTML required attribute on required fields
+    'set_required': True,
+
+    # Set HTML disabled attribute on disabled fields
+    'set_disabled': False,
+
+    # Set placeholder attributes to label if no placeholder is provided
+    'set_placeholder': True,
+
+    # Class to indicate required (better to set this in your Django form)
+    'required_css_class': '',
+
+    # Class to indicate error (better to set this in your Django form)
+    'error_css_class': 'has-error',
+
+    # Class to indicate success, meaning the field has valid input (better to set this in your Django form)
+    'success_css_class': 'has-success',
+
+    # Renderers (only set these if you have studied the source and understand the inner workings)
+    'formset_renderers':{
+        'default': 'bootstrap3.renderers.FormsetRenderer',
+    },
+    'form_renderers': {
+        'default': 'bootstrap3.renderers.FormRenderer',
+    },
+    'field_renderers': {
+        'default': 'bootstrap3.renderers.FieldRenderer',
+        'inline': 'bootstrap3.renderers.InlineFieldRenderer',
+    },
+}
+
+# djangocms_blog config
+
+BLOG_ENABLE_COMMENTS = False
+BLOG_USE_PLACEHOLDER = False
+BLOG_IMAGE_THUMBNAIL_SIZE = {'size': '120x120', 'crop': True,'upscale': False}
+BLOG_IMAGE_FULL_SIZE = {'size': '640x120', 'crop': True,'upscale': False}
+BLOG_PAGINATION = 4
+BLOG_LATEST_POSTS = BLOG_PAGINATION
+BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
+BLOG_MULTISITE = True
+BLOG_AUTHOR_DEFAULT = True
+
 try:
     from .local.local_settings import *
 except ImportError as e:

stable_requirements.txt

@@ -45,10 +45,11 @@ djangocms-table==1.2
 cmsplugin-filer==0.10.1
 
 # production
-circus==0.11.1
+-e git+git@github.com:circus-tent/circus.git@dfdb72baf87fbd03941f730d1ef05f3d5b8e91e9#egg=circus-master
 circus-web==0.5
 chaussette==1.2
 meinheld==0.5.7
+gevent==1.0.2
 ## The following requirements were added by pip freeze:
 aldryn-blog==0.4.6
 aldryn-boilerplates==0.7

templates/cms/ungleich.ch/base.html

@@ -1,13 +1,14 @@
 {% load cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %}
+<!doctype html>
 <html>
   <head>
     <title>{% page_attribute "page_title" %}</title>
     {% addtoblock "external-css" %}
     {% bootstrap_css %}
 
-    <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href='http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
-    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
+    <link href='//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' rel="stylesheet" type="text/css">
+    <link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
 	  rel='stylesheet' type='text/css'>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->