Merge branch 'release/digital.glarus.german'

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')

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'

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<packages>\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<path>.*)$',

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
-circus-web
+# chaussette
-chaussette
+# meinheld
-meinheld
 
 # python3 support
 gevent>=1.1a2

templates/cms/__init__.py

@@ -0,0 +1,10 @@
+# -*- 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'),
+    'ungleichch/blog.html': _('Blog'),
+    'ungleichch/page.html': _('Page'),
+}

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'),
+}

templates/cms/digitalglarus/about.html

@@ -0,0 +1,57 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load staticfiles cms_tags %}
+{% block title %}About{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">{% placeholder 'digitalglarus_why_us' %}</h2>
+      <hr>
+    </div>
+    <div class="col-md-6">
+      <img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
+    </div>
+    <div class="col-md-6">
+      <p>
+	{% placeholder 'digitalglarus_why_us_content' %}
+      </p>
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digitalglarus_why_glarus' %}
+      </h2>
+      <hr>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
+      <h3>
+	{% placeholder 'digitalglarus_why_glarus_beautiful_landscape' %}
+      </h3>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
+	{% placeholder 'digitalglarus_why_glarus_affordable_price' %}
+      </h3>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
+      {% placeholder 'digitalglarus_why_glarus_direct_connection_zurich' %}
+      </h3>
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+</div>
+<!-- /.container -->
+
+{% endblock %}

templates/cms/digitalglarus/base.html

@@ -0,0 +1,128 @@
+{% load staticfiles cms_tags menu_tags sekizai_tags  menu_tags %}
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>
+      {% page_attribute "page_title" %}
+    </title>
+
+
+    <!-- Favicon -->
+    <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
+
+    <!-- Bootstrap Core CSS -->
+    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
+    <!-- Fonts -->
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
+    <link href="//fonts.googleapis.com/css?family=Josefin+Slab:100,300,400,600,700,100italic,300italic,400italic,600italic,700italic" rel="stylesheet" type="text/css">
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+	<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+	<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+	<![endif]-->
+    {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
+    {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-62285904-2', 'auto');
+  ga('send', 'pageview');
+
+</script>
+</head>
+
+<body>
+  {% cms_toolbar %}
+  {% language_chooser "menu/language_chooser.html" %}
+    <div class="brand">Digital Glarus</div>
+    <div class="address-bar">
+      {% placeholder 'digital_glarus_legend' %}
+    </div>
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default" role="navigation">
+	<div class="container">
+	    <!-- Brand and toggle get grouped for better mobile display -->
+	    <div class="navbar-header">
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+		    <span class="sr-only">Toggle navigation</span>
+		    <span class="icon-bar"></span>
+		    <span class="icon-bar"></span>
+		    <span class="icon-bar"></span>
+		</button>
+		<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
+		<a class="navbar-brand" href="index.html">Digital Glarus</a>
+	    </div>
+	    <!-- Collect the nav links, forms, and other content for toggling -->
+	    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+		<ul class="nav navbar-nav">
+		    <li>
+		      <a href="{% url 'digitalglarus:letscowork' %}">Crowdfunding</a>
+		    </li>
+		    <li>
+			<a href="{% url 'digitalglarus:home' %}">Home</a>
+		    </li>
+		    <li>
+		      <a href="{% url 'digitalglarus:contact' %}">Contact</a>
+		    </li>
+		    <li>
+			<a href="{% url 'digitalglarus:about' %}">About</a>
+		    </li>
+		    <li>
+			<a href="{% url 'digitalglarus:blog' %}">Blog</a>
+		    </li>
+		</ul>
+	    </div>
+	    <!-- /.navbar-collapse -->
+	</div>
+	<!-- /.container -->
+    </nav>
+
+    <div class="container">
+    {% block content %} {% endblock %}
+    </div>
+    <!-- /.container -->
+
+    <footer>
+	<div class="container">
+	    <div class="row">
+		<div class="col-lg-12 text-center">
+		  <p class="text-center">Copyright &copy; <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
+		</div>
+	    </div>
+	</div>
+    </footer>
+
+    <!-- jQuery -->
+    <script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="{% static 'digitalglarus/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'digitalglarus/js/digital.glarus.js' %}"></script>
+
+    <!-- Script to Activate the Carousel -->
+    <script>
+    $('.carousel').carousel({
+	interval: 5000 //changes the speed
+    })
+    </script>
+
+</body>
+
+</html>

templates/cms/digitalglarus/contact.html

@@ -0,0 +1,65 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load cms_tags %}
+{% block title %}Contact{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_contact' %}
+      </h2>
+      <hr>
+    </div>
+    <div class="col-md-8">
+      {% placeholder 'digital_glarus_contact_content'  %}
+    </div>
+    <div class="col-md-4">
+      {% placeholder 'digital_glarus_contact_information' %}
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">Contact
+	<strong>form</strong>
+      </h2>
+      <hr>
+      <p>If you want further information on Digital Glarus, please send us a message using the form below.</p>
+      <form action="{% url 'digitalglarus:contact' %}" method="post" role="form">
+	{% csrf_token %}
+	<div class="row">
+	  <div class="form-group col-lg-4">
+	    <label>Name</label>
+	    <input type="text" class="form-control" name="name">
+	  </div>
+	  <div class="form-group col-lg-4">
+	    <label>Email Address</label>
+	    <input type="email" class="form-control" name="email">
+	  </div>
+	  <div class="form-group col-lg-4">
+	    <label>Phone Number</label>
+	    <input type="tel" class="form-control" name="phone_number">
+	  </div>
+	  <div class="clearfix"></div>
+	  <div class="form-group col-lg-12">
+	    <label>Message</label>
+	    <textarea class="form-control" rows="6" name="message"></textarea>
+	  </div>
+	  <div class="form-group col-lg-12">
+	    <input type="hidden" name="save" value="contact">
+	    <button type="submit" class="btn btn-default">Submit</button>
+	  </div>
+	</div>
+      </form>
+    </div>
+  </div>
+</div>
+</div>
+<!-- /.container -->
+{% endblock %}

templates/cms/digitalglarus/detail.html

@@ -0,0 +1,11 @@
+<h1>{{ message }}</h1>
+
+<ul>
+    <li>{{ message.name }}
+    <li>{{ message.email }}
+    <li>{{ message.phone_number }}
+    <li>{{ message.message }}
+    <li>{{ message.received_date }}
+</ul>
+
+<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>

templates/cms/digitalglarus/index.html

@@ -0,0 +1,99 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load staticfiles cms_tags %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12 text-center">
+      <div id="carousel-example-generic" class="carousel slide">
+	<!-- Indicators --><!-- Wrapper for slides -->
+	<div class="carousel-inner">
+	  <div class="item active">
+	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
+	  </div>
+	  <div class="item">
+	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
+	  </div>
+	  <div class="item">
+	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
+	  </div>
+	</div>
+
+	<!-- Controls -->
+	<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
+	  <span class="icon-prev"></span>
+	</a>
+	<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
+	  <span class="icon-next"></span>
+	</a>
+      </div>
+      <h2 class="brand-before">
+	<small>WELCOME TO</small>
+      </h2>
+      <h1 class="brand-name">Digital Glarus</h1>
+      <hr class="tagline-divider">
+      <h2>
+	<small>By
+	  <strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
+	</small>
+      </h2>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_build_a_tech_valley' %}
+      </h2>
+      <hr>
+      <img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
+      <hr class="visible-xs">
+      {% placeholder 'digital_glarus_build_a_tech_valley_content' %}
+      <p>&nbsp;</p>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_a_new_area' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_a_new_area_content' %}
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_why_be_interested' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_why_be_interested_content' %}
+    </div>
+  </div>
+</div>
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digital_glarus_where_we_are' %}
+      </h2>
+      <hr>
+      {% placeholder 'digital_glarus_where_we_are_content'  %}
+      <p>&nbsp;</p>
+    </div>
+  </div>
+</div>
+
+{% endblock %}

templates/cms/digitalglarus/letscowork.html

@@ -0,0 +1,53 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load staticfiles cms_tags %}
+{% block title %}crowdfunding{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12 text-center">
+      <h1> <span id="date-quantity">99</span> days to go! </h1>
+    </div>
+  </div>
+  <div class="clearfix"></div>
+</div>
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <iframe width="980" height="600" src="//www.100-days.net/de/projekt-iframe/start-digital-glarus" frameborder="0" scrolling="auto" class="center-block"></iframe>
+    </div>
+  </div>
+</div>
+
+
+<div class="row">
+  <div class="box">
+    <div class="col-lg-12">
+      <hr>
+      <h2 class="intro-text text-center">
+	{% placeholder 'digitalglarus_why_glarus' %}
+      </h2>
+      <hr>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
+      <h3>
+	{% placeholder 'digitalglarus_why_glarus_beautiful_landscape' %}
+      </h3>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/price_1.jpg' %}" alt="">
+	{% placeholder 'digitalglarus_why_glarus_affordable_price' %}
+      </h3>
+    </div>
+    <div class="col-sm-4 text-center">
+      <img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
+      {% placeholder 'digitalglarus_why_glarus_direct_connection_zurich' %}
+      </h3>
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+<!-- /.container -->
+{% endblock %}

templates/cms/ungleich.ch/index.html

@@ -1,3 +0,0 @@
-{% extends "cms/ungleich.ch/base.html" %}
-{% block base_content %}
-{% endblock %}

templates/cms/ungleichch/base.html

@@ -37,11 +37,11 @@
   </head>
   <body>
     {% cms_toolbar %}
-    {% show_menu 0 1 100 100 "cms/ungleich.ch/_menu.html" %}
+    {% show_menu 0 1 100 100 "cms/ungleichch/_menu.html" %}
     <!-- body -->
     <!-- Main Content -->
     {% block base_header %}
-    {% include "cms/ungleich.ch/_header_base.html"  %}
+    {% include "cms/ungleichch/_header_base.html"  %}
     {% endblock %}
     <div class="container">
       <div class="row">
@@ -53,7 +53,7 @@
       </div>
     </div>
     <!-- end body -->
-    {% include "cms/ungleich.ch/_footer.html" %}
+    {% include "cms/ungleichch/_footer.html" %}
     {% addtoblock "external-js" %}
     {% bootstrap_javascript %}
     {% endaddtoblock %}

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 %}

templates/cms/ungleichch/index.html

@@ -0,0 +1,3 @@
+{% extends "cms/ungleichch/base.html" %}
+{% block base_content %}
+{% endblock %}

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" %}