diff --git a/dynamicweb/settings-test/__init__.py b/dynamicweb/settings-test/__init__.py index a3dbbb0f..752b949e 100644 --- a/dynamicweb/settings-test/__init__.py +++ b/dynamicweb/settings-test/__init__.py @@ -175,8 +175,13 @@ USE_L10N = True USE_TZ = True LANGUAGES = ( +<<<<<<< HEAD:dynamicweb/settings-test/__init__.py ('en-us', _('English')), ('de', _('Deutsch')), +======= + ('en-us', _('US English')), + ('de', _('German')), +>>>>>>> remotes/origin/feature/digital.glarus.german:dynamicweb/settings.py ) LANGUAGE_CODE = 'en-us' diff --git a/requirements.txt b/requirements.txt index 8559857a..e70df3fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,18 @@ Django==1.9.4 aldryn-newsblog wheel +======= +# lib +psycopg2>=2.6 +Pillow>=2 +html5lib==0.999 +six==1.3.0 #compat +python-memcached + +# django +django==1.7.10 + +#django-assets django-bootstrap3 django-cms django-compressor @@ -44,6 +56,40 @@ Pillow>=2 django-filer cmsplugin-filer django-reversion +======= + +# django-cms-plugins +djangocms-admin-style==0.2.5 +djangocms-text-ckeditor>=2.4 +django-select2>=4.3.1 +djangocms-blog>=0.4.0 + +djangocms-flash +djangocms-googlemap +djangocms-inherit +djangocms-teaser + +djangocms-link +djangocms-snippet +djangocms-style +djangocms-column +djangocms-grid +djangocms-oembed +djangocms-table + +cmsplugin-filer==0.10.1 + +# production +# circus-web +# chaussette +# meinheld + +# python3 support +gevent>=1.1a2 + +# djangocms-page-meta +djangocms-page-meta +# memcache pylibmc django_extensions django-debug-toolbar 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/ungleichch/__init__.py b/templates/cms/ungleichch/__init__.py new file mode 100644 index 00000000..403fbcc0 --- /dev/null +++ b/templates/cms/ungleichch/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from django.utils.translation import ugettext_lazy as _ +TEMPLATES = { + 'blog.html': _('Blog'), + 'page.html': _('Page'), +} diff --git a/templates/cms/ungleichch/_footer.html b/templates/cms/ungleichch/_footer.html new file mode 100644 index 00000000..f03fc2b7 --- /dev/null +++ b/templates/cms/ungleichch/_footer.html @@ -0,0 +1,40 @@ +{% load cms_tags %} +
+ + diff --git a/templates/cms/ungleichch/_header_base.html b/templates/cms/ungleichch/_header_base.html new file mode 100644 index 00000000..43e535f6 --- /dev/null +++ b/templates/cms/ungleichch/_header_base.html @@ -0,0 +1,23 @@ +{% load cms_tags staticfiles %} + + +
+ +
+
+
+
+

{% page_attribute 'page_title' %}

+
+ {% page_attribute 'meta_description' %} +
+
+
+
+
diff --git a/templates/cms/ungleichch/_menu.html b/templates/cms/ungleichch/_menu.html new file mode 100644 index 00000000..05acc787 --- /dev/null +++ b/templates/cms/ungleichch/_menu.html @@ -0,0 +1,36 @@ +{% load menu_tags staticfiles cms_tags %} + + diff --git a/templates/cms/ungleichch/base.html b/templates/cms/ungleichch/base.html new file mode 100644 index 00000000..9897c4f8 --- /dev/null +++ b/templates/cms/ungleichch/base.html @@ -0,0 +1,78 @@ +{% load cms_tags menu_tags sekizai_tags staticfiles bootstrap3 %} + + + + + {% block title %} + {% page_attribute "page_title" %} + {% endblock %} + + {% addtoblock "external-css" %} + {% bootstrap_css %} + + + + + + + + + {% endaddtoblock %} + + {% addtoblock "css" %} + + {% endaddtoblock %} + {% block meta %} + + + {% include 'meta.html' %} + {% endblock %} + {% render_block "external-css" %} + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + + + {% cms_toolbar %} + {% show_menu 0 1 100 100 "cms/ungleichch/_menu.html" %} + + + {% block base_header %} + {% include "cms/ungleichch/_header_base.html" %} + {% endblock %} +
+
+
+ {% block base_content %} + {% placeholder "default" %} + {% endblock %} +
+
+
+ + {% include "cms/ungleichch/_footer.html" %} + {% addtoblock "external-js" %} + {% bootstrap_javascript %} + {% endaddtoblock %} + {% addtoblock "js" %} + + +