From fe81faf015ff520f4cd9582f290ba9580694d2f7 Mon Sep 17 00:00:00 2001 From: rscnt Date: Wed, 10 Jun 2015 09:53:23 -0600 Subject: [PATCH 1/8] stable_requirements --- README.rst | 2 +- stable_requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 31035103..6d052a56 100644 --- a/README.rst +++ b/README.rst @@ -1,2 +1,2 @@ -Ungleich +Ungleich ======== diff --git a/stable_requirements.txt b/stable_requirements.txt index 9b5ff470..694ef51e 100644 --- a/stable_requirements.txt +++ b/stable_requirements.txt @@ -44,10 +44,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 From c497ad24d5823e92165755fe1ef8eae2738e9e72 Mon Sep 17 00:00:00 2001 From: rscnt Date: Wed, 10 Jun 2015 21:18:19 -0600 Subject: [PATCH 2/8] changes on readme --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index 6d052a56..74318ac9 100644 --- a/README.rst +++ b/README.rst @@ -1,2 +1,7 @@ Ungleich ======== + +Website for Ungleich GMBH + +dynamicweb +---------- From 7083428824ac002ff4d041b14cfaf804b1fcb18a Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 09:36:03 -0600 Subject: [PATCH 3/8] gitignore: static folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c22532a0..2676d390 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ CACHE/ \#*# .\#* + +static/ From 181ca7cb59fda12ebbc7487f30d32d234b5ce3ec Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 13:47:45 -0600 Subject: [PATCH 4/8] settings: bootstrap3 and djangocms-blog + Now BLOG_USE_PLACEHOLDER is False, this should give us a HTML Text field for the article body. + The URLs for the bootstrap and jquery cnd location changed, now there should not be problem fetching them over https Signed-off-by: rscnt --- dynamicweb/settings.py | 77 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py index 9f127984..c689e791 100644 --- a/dynamicweb/settings.py +++ b/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: From f5337528e9f439c964bbec4db1951315326b2e16 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 13:59:37 -0600 Subject: [PATCH 5/8] templates: problem with modals size. see: https://github.com/divio/django-cms/issues/3465 Signed-off-by: rscnt --- templates/cms/ungleich.ch/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/cms/ungleich.ch/base.html b/templates/cms/ungleich.ch/base.html index 1299ba10..3077aa61 100644 --- a/templates/cms/ungleich.ch/base.html +++ b/templates/cms/ungleich.ch/base.html @@ -1,4 +1,5 @@ {% load cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %} + {% page_attribute "page_title" %} From da45722e9a71371c994835aac5b8c497809b09e8 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 16:49:15 -0600 Subject: [PATCH 6/8] templates: fixed cdn files to fetch from https Signed-off-by: rscnt --- templates/cms/ungleich.ch/base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/cms/ungleich.ch/base.html b/templates/cms/ungleich.ch/base.html index 3077aa61..021563f0 100644 --- a/templates/cms/ungleich.ch/base.html +++ b/templates/cms/ungleich.ch/base.html @@ -6,9 +6,9 @@ {% addtoblock "external-css" %} {% bootstrap_css %} - - - + + From 05ffcaf85ab4d4c04c1fe7404d7f5be37e764d7a Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 20:05:57 -0600 Subject: [PATCH 7/8] Makefile: changed target and rsync command. Signed-off-by: rscnt --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d50a3aec..e24572b5 100644 --- a/Makefile +++ b/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 From c8a616b7b520422f44180da546a96186c9534780 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sat, 13 Jun 2015 20:08:07 -0600 Subject: [PATCH 8/8] gitginore: added vim cache files. Signed-off-by: rscnt --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 72b7adb0..3f76f340 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,6 @@ static/ \#*# .\#* +*~ static/