From 3035364d394a3ea418e39414a7d3dea46538d2ee Mon Sep 17 00:00:00 2001 From: Raul Ascencio Date: Thu, 1 Oct 2015 12:49:56 -0600 Subject: [PATCH 1/6] digitalglarus: index should display home. --- digitalglarus/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digitalglarus/views.py b/digitalglarus/views.py index 81e70b0f..12a42437 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -32,7 +32,7 @@ def about(request): # return render(request, 'digitalglarus/letscowork.html') def index(request): - return render(request, 'digitalglarus/letscowork.html') + return home(request) def home(request): return render(request, 'digitalglarus/index.html') From df9b0eacaa5854374cec1a84a5f12c125b55d45f Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 09:23:56 -0600 Subject: [PATCH 2/6] Merge branch 'feature/digital.glarus.german' into develop --- dynamicweb/settings.py | 3 +- requirements.txt | 9 +- templates/cms/__init__.py | 11 ++ templates/cms/digitalglarus/__init__.py | 9 ++ templates/cms/digitalglarus/about.html | 57 ++++++++ templates/cms/digitalglarus/base.html | 128 ++++++++++++++++++ templates/cms/digitalglarus/contact.html | 65 +++++++++ templates/cms/digitalglarus/detail.html | 11 ++ templates/cms/digitalglarus/index.html | 99 ++++++++++++++ templates/cms/digitalglarus/letscowork.html | 51 +++++++ templates/cms/ungleich.ch/index.html | 3 - .../{ungleich.ch => ungleichch}/__init__.py | 0 .../{ungleich.ch => ungleichch}/_footer.html | 0 .../_header_base.html | 0 .../{ungleich.ch => ungleichch}/_menu.html | 0 .../cms/{ungleich.ch => ungleichch}/base.html | 6 +- .../cms/{ungleich.ch => ungleichch}/blog.html | 2 +- templates/cms/ungleichch/index.html | 3 + .../cms/{ungleich.ch => ungleichch}/page.html | 2 +- 19 files changed, 445 insertions(+), 14 deletions(-) create mode 100644 templates/cms/__init__.py create mode 100644 templates/cms/digitalglarus/__init__.py create mode 100755 templates/cms/digitalglarus/about.html create mode 100644 templates/cms/digitalglarus/base.html create mode 100755 templates/cms/digitalglarus/contact.html create mode 100644 templates/cms/digitalglarus/detail.html create mode 100644 templates/cms/digitalglarus/index.html create mode 100644 templates/cms/digitalglarus/letscowork.html delete mode 100644 templates/cms/ungleich.ch/index.html rename templates/cms/{ungleich.ch => ungleichch}/__init__.py (100%) rename templates/cms/{ungleich.ch => ungleichch}/_footer.html (100%) rename templates/cms/{ungleich.ch => ungleichch}/_header_base.html (100%) rename templates/cms/{ungleich.ch => ungleichch}/_menu.html (100%) rename templates/cms/{ungleich.ch => ungleichch}/base.html (94%) rename templates/cms/{ungleich.ch => ungleichch}/blog.html (64%) create mode 100644 templates/cms/ungleichch/index.html rename templates/cms/{ungleich.ch => ungleichch}/page.html (68%) diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py index e133cca3..6bcc26c3 100644 --- a/dynamicweb/settings.py +++ b/dynamicweb/settings.py @@ -159,7 +159,7 @@ TEMPLATE_DIRS = ( ) CMS_TEMPLATES_DIR = { - 1: os.path.join(TEMPLATE_DIRS[0], 'cms/ungleich.ch/'), + 1: os.path.join(TEMPLATE_DIRS[0], 'cms/'), } @@ -187,6 +187,7 @@ USE_TZ = True LANGUAGES = ( ('en-us', _('US English')), + ('de', _('German')), ) LANGUAGE_CODE = 'en-us' diff --git a/requirements.txt b/requirements.txt index f43f1e69..342be9cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ six==1.3.0 #compat python-memcached # django -django==1.7.8 +django==1.7.10 #django-assets django-bootstrap3 @@ -45,10 +45,9 @@ djangocms-table cmsplugin-filer==0.10.1 # production --e git+git@github.com:circus-tent/circus.git#egg=circus -circus-web -chaussette -meinheld +# circus-web +# chaussette +# meinheld # python3 support gevent>=1.1a2 diff --git a/templates/cms/__init__.py b/templates/cms/__init__.py new file mode 100644 index 00000000..f27d72f5 --- /dev/null +++ b/templates/cms/__init__.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from django.utils.translation import ugettext_lazy as _ +TEMPLATES = { + 'digitalglarus/about.html': _('DG.About'), + 'digitalglarus/contact.html': _('DG.Contact'), + 'digitalglarus/index.html': _('DG.Home'), + 'digitalglarus/letscowork.html': _('DG.CoWork'), + 'digitalglarus/detail.html': _('DG.Detail'), + 'ungleichch/blog.html': _('Blog'), + 'ungleichch/page.html': _('Page'), +} diff --git a/templates/cms/digitalglarus/__init__.py b/templates/cms/digitalglarus/__init__.py new file mode 100644 index 00000000..7b16fec8 --- /dev/null +++ b/templates/cms/digitalglarus/__init__.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +from django.utils.translation import ugettext_lazy as _ +TEMPLATES = { + 'about.html': _('DG.About'), + 'contact.html': _('DG.Contact'), + 'index.html': _('DG.Home'), + 'letscowork.html': _('DG.CoWork'), + 'detail.html': _('DG.Detail'), +} diff --git a/templates/cms/digitalglarus/about.html b/templates/cms/digitalglarus/about.html new file mode 100755 index 00000000..6c12cbcb --- /dev/null +++ b/templates/cms/digitalglarus/about.html @@ -0,0 +1,57 @@ +{% extends "cms/digitalglarus/base.html" %} +{% load staticfiles cms_tags %} +{% block title %}About{% endblock %} + +{% block content %} +
+
+
+
+

{% placeholder 'digitalglarus_why_us' %}

+
+
+
+ +
+
+

+ {% placeholder 'digitalglarus_why_us_content' %} +

+
+
+
+
+ +
+
+
+
+

+ {% placeholder 'digitalglarus_why_glarus' %} +

+
+
+
+ +

+ {% placeholder 'digitalglarus_why_glarus_beautiful_landscape' %} +

+
+
+ + {% placeholder 'digitalglarus_why_glarus_affordable_price' %} + +
+
+ + {% placeholder 'digitalglarus_why_glarus_direct_connection_zurich' %} + +
+
+
+
+ + + + +{% endblock %} diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html new file mode 100644 index 00000000..6dd1bfc0 --- /dev/null +++ b/templates/cms/digitalglarus/base.html @@ -0,0 +1,128 @@ +{% load staticfiles cms_tags menu_tags sekizai_tags %} + + + + + + + + + + + + + + {% page_attribute "page_title" %} + + + + + + + + + + + + + + + + + + + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %} + + + + + {% cms_toolbar %} +
Digital Glarus
+
+ {% placeholder 'digital_glarus_legend' %} +
+ + + + +
+ {% block content %} {% endblock %} +
+ + + + + + + + + + + + + + + + + diff --git a/templates/cms/digitalglarus/contact.html b/templates/cms/digitalglarus/contact.html new file mode 100755 index 00000000..01a57109 --- /dev/null +++ b/templates/cms/digitalglarus/contact.html @@ -0,0 +1,65 @@ +{% extends "digitalglarus/base.html" %} +{% load cms_tags %} +{% block title %}Contact{% endblock %} + +{% block content %} +
+
+
+
+

+ {% placeholder 'digital_glarus_contact' %} +

+
+
+
+ {% placeholder 'digital_glarus_contact_content' %} +
+
+ {% placeholder 'digital_glarus_contact_information' %} +
+
+
+
+ +
+
+
+
+

Contact + form +

+
+

If you want further information on Digital Glarus, please send us a message using the form below.

+
+ {% csrf_token %} +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+
+
+
+ + +{% endblock %} diff --git a/templates/cms/digitalglarus/detail.html b/templates/cms/digitalglarus/detail.html new file mode 100644 index 00000000..412a6b91 --- /dev/null +++ b/templates/cms/digitalglarus/detail.html @@ -0,0 +1,11 @@ +

{{ message }}

+ + + +

Back to Main diff --git a/templates/cms/digitalglarus/index.html b/templates/cms/digitalglarus/index.html new file mode 100644 index 00000000..7e7eaff3 --- /dev/null +++ b/templates/cms/digitalglarus/index.html @@ -0,0 +1,99 @@ +{% extends "digitalglarus/base.html" %} +{% load staticfiles %} + +{% block content %} +

+
+
+ +

+ WELCOME TO +

+

Digital Glarus

+
+

+ By + ungleich gmbh + +

+
+
+
+ +
+
+
+
+

+ {% placeholder 'digital_glarus_build_a_tech_valley' %} +

+
+ +
+ {% placeholder 'digital_glarus_build_a_tech_valley_content' %} +

 

+
+
+
+ +
+
+
+
+

+ {% placeholder 'digital_glarus_a_new_area' %} +

+
+ {% placeholder 'digital_glarus_a_new_area_content' %} +
+
+
+ +
+
+
+
+

+ {% placeholder 'digital_glarus_why_be_interested' %} +

+
+ {% placeholder 'digital_glarus_why_be_interested_content' %} +
+
+
+
+
+
+
+

+ {% placeholder 'digital_glarus_where_we_are' %} +

+
+ {% placeholder 'digital_glarus_where_we_are_content' %} +

 

+
+
+
+ +{% endblock %} diff --git a/templates/cms/digitalglarus/letscowork.html b/templates/cms/digitalglarus/letscowork.html new file mode 100644 index 00000000..518e1224 --- /dev/null +++ b/templates/cms/digitalglarus/letscowork.html @@ -0,0 +1,51 @@ +{% extends "digitalglarus/base.html" %} +{% load staticfiles %} +{% block title %}crowdfunding{% endblock %} + +{% block content %} +
+
+
+

99 days to go!

+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+

why + glarus? +

+
+
+
+ +

BEAUTIFUL + landscape +

+
+
+ +

AFFORDABLE + price

+
+
+ +

direct + connection to zurich +

+
+
+
+
+ +{% endblock %} diff --git a/templates/cms/ungleich.ch/index.html b/templates/cms/ungleich.ch/index.html deleted file mode 100644 index 9e1c9503..00000000 --- a/templates/cms/ungleich.ch/index.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends "cms/ungleich.ch/base.html" %} -{% block base_content %} -{% endblock %} diff --git a/templates/cms/ungleich.ch/__init__.py b/templates/cms/ungleichch/__init__.py similarity index 100% rename from templates/cms/ungleich.ch/__init__.py rename to templates/cms/ungleichch/__init__.py diff --git a/templates/cms/ungleich.ch/_footer.html b/templates/cms/ungleichch/_footer.html similarity index 100% rename from templates/cms/ungleich.ch/_footer.html rename to templates/cms/ungleichch/_footer.html diff --git a/templates/cms/ungleich.ch/_header_base.html b/templates/cms/ungleichch/_header_base.html similarity index 100% rename from templates/cms/ungleich.ch/_header_base.html rename to templates/cms/ungleichch/_header_base.html diff --git a/templates/cms/ungleich.ch/_menu.html b/templates/cms/ungleichch/_menu.html similarity index 100% rename from templates/cms/ungleich.ch/_menu.html rename to templates/cms/ungleichch/_menu.html diff --git a/templates/cms/ungleich.ch/base.html b/templates/cms/ungleichch/base.html similarity index 94% rename from templates/cms/ungleich.ch/base.html rename to templates/cms/ungleichch/base.html index 339fe37c..9897c4f8 100644 --- a/templates/cms/ungleich.ch/base.html +++ b/templates/cms/ungleichch/base.html @@ -37,11 +37,11 @@ {% cms_toolbar %} - {% show_menu 0 1 100 100 "cms/ungleich.ch/_menu.html" %} + {% show_menu 0 1 100 100 "cms/ungleichch/_menu.html" %} {% block base_header %} - {% include "cms/ungleich.ch/_header_base.html" %} + {% include "cms/ungleichch/_header_base.html" %} {% endblock %}
@@ -53,7 +53,7 @@
- {% include "cms/ungleich.ch/_footer.html" %} + {% include "cms/ungleichch/_footer.html" %} {% addtoblock "external-js" %} {% bootstrap_javascript %} {% endaddtoblock %} diff --git a/templates/cms/ungleich.ch/blog.html b/templates/cms/ungleichch/blog.html similarity index 64% rename from templates/cms/ungleich.ch/blog.html rename to templates/cms/ungleichch/blog.html index bfc3aae7..5317a021 100644 --- a/templates/cms/ungleich.ch/blog.html +++ b/templates/cms/ungleichch/blog.html @@ -1,4 +1,4 @@ -{% extends "cms/ungleich.ch/base.html" %} +{% extends "cms/ungleichch/base.html" %} {% block base_content %} {% block content %} {% endblock %} diff --git a/templates/cms/ungleichch/index.html b/templates/cms/ungleichch/index.html new file mode 100644 index 00000000..f3fbca67 --- /dev/null +++ b/templates/cms/ungleichch/index.html @@ -0,0 +1,3 @@ +{% extends "cms/ungleichch/base.html" %} +{% block base_content %} +{% endblock %} diff --git a/templates/cms/ungleich.ch/page.html b/templates/cms/ungleichch/page.html similarity index 68% rename from templates/cms/ungleich.ch/page.html rename to templates/cms/ungleichch/page.html index 66f67def..81a4a027 100644 --- a/templates/cms/ungleich.ch/page.html +++ b/templates/cms/ungleichch/page.html @@ -1,4 +1,4 @@ -{% extends "cms/ungleich.ch/base.html" %} +{% extends "cms/ungleichch/base.html" %} {% load cms_tags %} {% block base_content %} {% placeholder "page_content" %} From 9d38d3aee6303319fd0e07dc632f1d501599f6b7 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 09:38:01 -0600 Subject: [PATCH 3/6] digitalglarus: i18n django-cms conf --- dynamicweb/urls.py | 9 +++++++-- templates/cms/digitalglarus/base.html | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index a69f2abe..b624498d 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import patterns, include, url from django.contrib import admin # deprecated in version 1.8 +from django.conf.urls.i18n import i18n_patterns from django.conf.urls.static import static from dynamicweb import settings @@ -11,13 +12,17 @@ urlpatterns = [ namespace="digitalglarus")), url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^railshosting/', railshosting, name="rails.hosting"), - url(r'^admin/', include(admin.site.urls)), - url(r'^', include('cms.urls')), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +# note the django CMS URLs included via i18n_patterns +urlpatterns += i18n_patterns('', + url(r'^admin/', include(admin.site.urls)), + url(r'^', include('cms.urls')), +) + if settings.DEBUG: urlpatterns += patterns('', url(r'^media/(?P.*)$', diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html index 6dd1bfc0..4ae66fa0 100644 --- a/templates/cms/digitalglarus/base.html +++ b/templates/cms/digitalglarus/base.html @@ -1,5 +1,4 @@ -{% load staticfiles cms_tags menu_tags sekizai_tags %} - +{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags %} @@ -49,7 +48,8 @@ - {% cms_toolbar %} + {% cms_toolbar %} + {% language_chooser "myapp/language_chooser.html" %}
Digital Glarus
{% placeholder 'digital_glarus_legend' %} From f9b3cfbf48e55a3d086b9fa4779577677b0a6ce3 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 10:44:25 -0600 Subject: [PATCH 4/6] templates: cms, removed DG.Detail from django-cms Signed-off-by: rscnt --- templates/cms/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/cms/__init__.py b/templates/cms/__init__.py index f27d72f5..5bd2656f 100644 --- a/templates/cms/__init__.py +++ b/templates/cms/__init__.py @@ -5,7 +5,6 @@ TEMPLATES = { 'digitalglarus/contact.html': _('DG.Contact'), 'digitalglarus/index.html': _('DG.Home'), 'digitalglarus/letscowork.html': _('DG.CoWork'), - 'digitalglarus/detail.html': _('DG.Detail'), 'ungleichch/blog.html': _('Blog'), 'ungleichch/page.html': _('Page'), } From 450ecc069b0b38042827162bf889e368ca59d2e9 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 10:44:43 -0600 Subject: [PATCH 5/6] digitalglarus: removed bad menu lang-chooser call Signed-off-by: rscnt --- templates/cms/digitalglarus/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html index 4ae66fa0..d5d50456 100644 --- a/templates/cms/digitalglarus/base.html +++ b/templates/cms/digitalglarus/base.html @@ -49,7 +49,7 @@ {% cms_toolbar %} - {% language_chooser "myapp/language_chooser.html" %} + {% language_chooser "menu/language_chooser.html" %}
Digital Glarus
{% placeholder 'digital_glarus_legend' %} From 5b6b8d14271724917bc99eaf2f49acd0809d3125 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 10:45:06 -0600 Subject: [PATCH 6/6] digital.glarus: cms templates don't have to call 'static' base. Signed-off-by: rscnt --- templates/cms/digitalglarus/contact.html | 2 +- templates/cms/digitalglarus/index.html | 4 ++-- templates/cms/digitalglarus/letscowork.html | 22 +++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/templates/cms/digitalglarus/contact.html b/templates/cms/digitalglarus/contact.html index 01a57109..3b5f5734 100755 --- a/templates/cms/digitalglarus/contact.html +++ b/templates/cms/digitalglarus/contact.html @@ -1,4 +1,4 @@ -{% extends "digitalglarus/base.html" %} +{% extends "cms/digitalglarus/base.html" %} {% load cms_tags %} {% block title %}Contact{% endblock %} diff --git a/templates/cms/digitalglarus/index.html b/templates/cms/digitalglarus/index.html index 7e7eaff3..6c5fb507 100644 --- a/templates/cms/digitalglarus/index.html +++ b/templates/cms/digitalglarus/index.html @@ -1,5 +1,5 @@ -{% extends "digitalglarus/base.html" %} -{% load staticfiles %} +{% extends "cms/digitalglarus/base.html" %} +{% load staticfiles cms_tags %} {% block content %}
diff --git a/templates/cms/digitalglarus/letscowork.html b/templates/cms/digitalglarus/letscowork.html index 518e1224..8bc8eda6 100644 --- a/templates/cms/digitalglarus/letscowork.html +++ b/templates/cms/digitalglarus/letscowork.html @@ -1,5 +1,5 @@ -{% extends "digitalglarus/base.html" %} -{% load staticfiles %} +{% extends "cms/digitalglarus/base.html" %} +{% load staticfiles cms_tags %} {% block title %}crowdfunding{% endblock %} {% block content %} @@ -18,34 +18,36 @@
+ +
-

why - glarus? +

+ {% placeholder 'digitalglarus_why_glarus' %}

-

BEAUTIFUL - landscape +

+ {% placeholder 'digitalglarus_why_glarus_beautiful_landscape' %}

-

AFFORDABLE - price

+ {% placeholder 'digitalglarus_why_glarus_affordable_price' %} +
-

direct - connection to zurich + {% placeholder 'digitalglarus_why_glarus_direct_connection_zurich' %}

+ {% endblock %}