Merge branch 'develop'

This commit is contained in:
Tom 2016-05-08 18:14:51 +00:00
commit 5c544e6a8d
49 changed files with 197 additions and 161 deletions

View file

@ -106,8 +106,7 @@ INSTALLED_APPS = (
# 'ungleich_page', # 'ungleich_page',
'hosting', 'hosting',
'digitalglarus', 'digitalglarus',
'django_extensions',
'debug_toolbar'
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (

View file

@ -14,3 +14,8 @@ CACHES = {
} }
MIDDLEWARE_CLASSES+=("debug_toolbar.middleware.DebugToolbarMiddleware",) MIDDLEWARE_CLASSES+=("debug_toolbar.middleware.DebugToolbarMiddleware",)
INSTALLED_APPS+=(
'django_extensions',
'debug_toolbar'
)

View file

@ -7,6 +7,7 @@ from django.conf.urls.static import static
from django.conf import settings from django.conf import settings
from hosting.views import RailsHostingView, DjangoHostingView, NodeJSHostingView from hosting.views import RailsHostingView, DjangoHostingView, NodeJSHostingView
from membership import urls as membership_urls from membership import urls as membership_urls
import debug_toolbar
urlpatterns = [ urlpatterns = [
url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^hosting/', include('hosting.urls', namespace="hosting")),
@ -28,7 +29,7 @@ urlpatterns += i18n_patterns('',
url(r'^ungleich_page/', url(r'^ungleich_page/',
include('ungleich_page.urls', namespace='ungleich_page'), include('ungleich_page.urls', namespace='ungleich_page'),
name='ungleich_page'), name='ungleich_page'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')), url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
url(r'^', include('cms.urls')) url(r'^', include('cms.urls'))
) )
@ -39,3 +40,4 @@ if settings.DEBUG:
'document_root': settings.MEDIA_ROOT, 'document_root': settings.MEDIA_ROOT,
}), }),
) )
urlpatterns += patterns('',url(r'^__debug__/', include(debug_toolbar.urls)))

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 KiB

View file

@ -1,63 +1,73 @@
{% load static meta cms_tags%} {% load static meta cms_tags %}
{% load i18n %} {% load i18n %}
<section id="contact"> <section id="contact">
<div class="container"> <div class="container">
<div class="row" class="wow fadeInDown"> <div class="row" class="wow fadeInDown">
<div class="col-lg-12 text-center wow fadeInDown"> <div class="col-lg-12 text-center wow fadeInDown">
{% for message in messages %} {% for message in messages %}
<div class="alert alert-success alert-dismissible" role="alert"> <div class="alert alert-success alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close" autofocus><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"
<strong>{{ message }}</strong> autofocus><span aria-hidden="true">&times;</span></button>
</div> <strong>{{ message }}</strong>
{% endfor %} </div>
<h2 class="section-heading">{% trans "Contact Us" %}</h2> {% endfor %}
<br> <h2 class="section-heading">{% trans "Contact Us" %}</h2>
<h3 class="intro-smallcap">{% trans "Join us at" %} <a href="{% page_url 'digital-glarus-page' %}">{% trans "Digital Glarus" %}</a>, <br>
{% trans "a great co-working space in the middle of Alps!" %} <p></p> {% trans "You can contact us at" %} </h3>
<h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch" ><i class="fa fa-envelope">info@ungleich.ch</i></a></h3>
<h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>
<h3 class="intro-smallcap">{% trans "or" %}</h3>
<h3 class="intro-smallcap">{% trans "Contact Us" %}</h3>
<form action="{% url 'ungleich_page:contact' %}" method="post" > <h3 class="intro-smallcap">{% trans "Join us at" %} <a
{% csrf_token %} href="{% page_url 'digital-glarus-page' %}">{% trans "Digital Glarus" %}</a>,
<div class="row"> {% trans "a great co-working space in the middle of Alps!" %}
<div autofocus class="form-group col-lg-4 {% if form.name.errors %}has-error text-danger{% endif %}"> <p></p> {% trans "You can contact us at" %} </h3>
{{ form.name.label_tag }} <h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch"><i class="fa fa-envelope">info@ungleich.ch</i></a>
{{ form.name }} </h3>
{{ form.name.errors|striptags}}
</div>
<div class="form-group col-lg-4 {% if form.email.errors %}has-error text-danger {% endif %}">
{{ form.email.label_tag }}
{{ form.email }}
{{ form.email.errors|striptags}}
</div>
<div class="form-group col-lg-4 {% if form.phone_number.errors %}has-error text-danger {% endif %}">
{{ form.phone_number.label_tag }}
{{ form.phone_number }}
{{ form.phone_number.errors|striptags}}
</div>
<div class="clearfix"></div>
<div class="form-group col-lg-12 {% if form.message.errors %}has-error text-danger {% endif %}">
{{ form.message.label_tag }}
{{ form.message }}
{{ form.message.errors|striptags}}
</div>
{{ form.non_field_errors }}
<div class="form-group col-lg-12">
<input type="hidden" name="save" value="contact">
<button type="submit" class="btn btn-default" {% if form.name.errors %} autofocus {% endif %}>{% trans "Submit" %}</button>
</div>
</div>
</form>
</div>
<p>&nbsp;</p>
</div>
<div class="row">
<div class="col-lg-12">
</div> <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>
</div> <h3 class="intro-smallcap">{% trans "or" %}</h3>
</div>
<h3 class="intro-smallcap">{% trans "Contact Us" %}</h3>
<form action="{% url 'ungleich_page:contact' %}" method="post">
{% csrf_token %}
<div class="row">
<div autofocus
class="form-group col-lg-4 {% if form.name.errors %}has-error text-danger{% endif %}">
{{ form.name.label_tag }}
{{ form.name }}
{{ form.name.errors|striptags }}
</div>
<div class="form-group col-lg-4 {% if form.email.errors %}has-error text-danger {% endif %}">
{{ form.email.label_tag }}
{{ form.email }}
{{ form.email.errors|striptags }}
</div>
<div class="form-group col-lg-4 {% if form.phone_number.errors %}has-error text-danger {% endif %}">
{{ form.phone_number.label_tag }}
{{ form.phone_number }}
{{ form.phone_number.errors|striptags }}
</div>
<div class="clearfix"></div>
<div class="form-group col-lg-12 {% if form.message.errors %}has-error text-danger {% endif %}">
{{ form.message.label_tag }}
{{ form.message }}
{{ form.message.errors|striptags }}
</div>
{{ form.non_field_errors }}
<div class="form-group col-lg-12">
<input type="hidden" name="save" value="contact">
<button type="submit" class="btn btn-default" {% if form.name.errors %}
autofocus {% endif %}>{% trans "Submit" %}</button>
</div>
</div>
</form>
</div>
<p>&nbsp;</p>
</div>
<div class="row">
<div class="col-lg-12">
</div>
</div>
</div>
</section> </section>

View file

@ -6,8 +6,8 @@
<div class="row"> <div class="row">
<div class="col-lg-12 text-center wow fadeInDown"> <div class="col-lg-12 text-center wow fadeInDown">
<h2 class="section-heading">{% trans "our services" %}</h2> <h2 class="section-heading">{% trans "our services" %}</h2>
<h3 class="section-subheading text-muted">{% trans "We support our clients in all areas of Unix infrastructure.<p></p> <h3 class="section-subheading text-muted">We support our clients in all areas of Unix infrastructure.<p></p>
Our top notch configuration management is refreshingly simple and reliable." %}</h3> Our top notch configuration management is refreshingly simple and reliable."</h3>
</div> </div>
</div> </div>
<div class="row text-center"> <div class="row text-center">
@ -44,4 +44,4 @@
</div> </div>
</div> </div>
</div> </div>
</section> </section>

View file

@ -2,7 +2,7 @@
{% load bootstrap3 %} {% load bootstrap3 %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -14,12 +14,12 @@
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'ungleich_page/css/bootstrap.min.css'%}" rel="stylesheet"> <link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'ungleich_page/css/lib/animate.min.css'%}" rel="stylesheet"> <link href="{% static 'ungleich_page/css/lib/animate.min.css' %}" rel="stylesheet">
<!-- Custom CSS --> <!-- Custom CSS -->
<link href="{% static 'ungleich_page/css/agency.css'%}" rel="stylesheet"> <link href="{% static 'ungleich_page/css/agency.css' %}" rel="stylesheet">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- 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:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -28,130 +28,147 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
<link href="{% static 'ungleich_page/css/ungleich.css'%}" rel="stylesheet"> <link href="{% static 'ungleich_page/css/ungleich.css' %}" rel="stylesheet">
<!-- Google tracking --> <!-- Google tracking -->
<script src="//www.google-analytics.com/analytics.js" async></script><script> <script src="//www.google-analytics.com/analytics.js" async></script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ <script>
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (function (i, s, o, g, r, a, m) {
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) i['GoogleAnalyticsObject'] = r;
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); 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-1', 'auto'); ga('create', 'UA-62285904-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
<style id="igtranslator-color" type="text/css"></style></head> <style id="igtranslator-color" type="text/css"></style>
</head>
<body id="page-top" class="index"> <body id="page-top" class="index">
<!-- Navigation --> <!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container"> <div class="container">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll"> <div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle" data-toggle="collapse"
<span class="sr-only">Toggle navigation</span> data-target="#bs-example-navbar-collapse-1">
<span class="icon-bar"></span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<p><a class="navbar-brand page-scroll" href="#page-top"><img src="{% static 'ungleich_page/img/logo_white.svg'%}"></a></p> </button>
<p>&nbsp;</p> <p><a class="navbar-brand page-scroll" href="#page-top"><img
</div> src="{% static 'ungleich_page/img/logo_white.svg' %}"></a></p>
<!-- Collect the nav links, forms, and other content for toggling --> <p>&nbsp;</p>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> </div>
<ul class="nav navbar-nav navbar-right">
<li class="hidden active">
<a href="#page-top"></a>
</li>
<li>
<a class="page-scroll" href="#services">services</a></li>
<li></li>
<li></li>
<li> </li>
<li>
<a class="page-scroll" href="#portfolio">products</a></li>
<li> </li>
<li>
<a class="page-scroll" href="#about">About</a>
</li>
<li>
<a class="page-scroll" href="#team">WHY UNGLEICH?</a>
</li>
<li>
<a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
</li>
<li>
<a class="page-scroll" href="#contact">Contact</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
<!-- Header --> <!-- Collect the nav links, forms, and other content for toggling -->
{% include "ungleich_page/includes/_header.html" %} <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="hidden active">
<a href="#page-top"></a>
</li>
<li>
<a class="page-scroll" href="#services">services</a></li>
<li></li>
<li></li>
<li></li>
<li>
<a class="page-scroll" href="#portfolio">products</a></li>
<li></li>
<li>
<a class="page-scroll" href="#about">About</a>
</li>
<li>
<a class="page-scroll" href="#team">WHY UNGLEICH?</a>
</li>
<li>
<a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
</li>
<li>
<a class="page-scroll" href="#contact">Contact</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
<!-- Header -->
{% include "ungleich_page/includes/_header.html" %}
<!-- Services Section --> <!-- Services Section -->
{% include "ungleich_page/includes/_services.html" %} {% include "ungleich_page/includes/_services.html" %}
<!-- Portfolio Grid Section --> <!-- Portfolio Grid Section -->
{% include "ungleich_page/includes/_portfolio.html" %} {% include "ungleich_page/includes/_portfolio.html" %}
<!-- About Section --> <!-- About Section -->
{% include "ungleich_page/includes/_about.html" %}$ {% include "ungleich_page/includes/_about.html" %}$
<!-- Team Section --> <!-- Team Section -->
{% include "ungleich_page/includes/_team.html" %} {% include "ungleich_page/includes/_team.html" %}
<!-- Software We Use Section --> <!-- Software We Use Section -->
{% include "ungleich_page/includes/_softwares.html" %} {% include "ungleich_page/includes/_softwares.html" %}
<!-- Contact Us Section --> <!-- Contact Us Section -->
{% include "ungleich_page/includes/_contact_us.html" %} {% include "ungleich_page/includes/_contact_us.html" %}
<!-- Footer --> <!-- Footer -->
{% include "ungleich_page/includes/_footer.html" %} {% include "ungleich_page/includes/_footer.html" %}
<!-- Portfolio Modals --> <!-- Portfolio Modals -->
<!-- Use the modals below to showcase details about your portfolio projects! --> <!-- Use the modals below to showcase details about your portfolio projects! -->
<!-- Portfolio Modal 1 --> <!-- Portfolio Modal 1 -->
<!-- Portfolio Modal 2 --> <!-- Portfolio Modal 2 -->
<!-- Portfolio Modal 3 --> <!-- Portfolio Modal 3 -->
<!-- Portfolio Modal 4 --> <!-- Portfolio Modal 4 -->
<!-- Portfolio Modal 6 --> <!-- Portfolio Modal 6 -->
</div> </div>
</div> </div>
<!-- jQuery --> <!-- jQuery -->
<script src="{% static 'ungleich_page/js/jquery.js' %}" type="text/javascript" ></script> <script src="{% static 'ungleich_page/js/jquery.js' %}" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function () {
if ($(".has-error").length != 0) {
window.location = window.location.pathname + "#contact"
}
});
</script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="{% static 'ungleich_page/js/bootstrap.min.js' %}" type="text/javascript" ></script> <script src="{% static 'ungleich_page/js/bootstrap.min.js' %}" type="text/javascript"></script>
<!-- Plugin JavaScript --> <!-- Plugin JavaScript -->
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script> <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"
type="text/javascript"></script>
<script src="{% static 'ungleich_page/js/classie.js' %}" type="text/javascript"></script> <script src="{% static 'ungleich_page/js/classie.js' %}" type="text/javascript"></script>
<script src="{% static 'ungleich_page/js/cbpAnimatedHeader.js' %}" type="text/javascript"></script> <script src="{% static 'ungleich_page/js/cbpAnimatedHeader.js' %}" type="text/javascript"></script>
<!-- Contact Form JavaScript --> <!-- Contact Form JavaScript -->
<script src="{% static 'ungleich_page/js/jqBootstrapValidation.js' %}" type="text/javascript"></script> <script src="{% static 'ungleich_page/js/jqBootstrapValidation.js' %}" type="text/javascript"></script>
<!-- <script src="{% static 'ungleich_page/js/contact_me.js' %}" type="text/javascript"></script> --> <!-- <script src="{% static 'ungleich_page/js/contact_me.js' %}" type="text/javascript"></script> -->
@ -161,11 +178,13 @@
<script src="{% static 'ungleich_page/js/ungleich.js' %}" type="text/javascript"></script> <script src="{% static 'ungleich_page/js/ungleich.js' %}" type="text/javascript"></script>
<!-- Custom Fonts --> <!-- Custom Fonts -->
<link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
<link href="{% static 'ungleich_page/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css"> <link href="{% static 'ungleich_page/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet"
<link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"> type="text/css">
<link href="//fonts.googleapis.com/css?family=Kaushan+Script" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Kaushan+Script" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic" rel="stylesheet"
type="text/css">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
</html> </html>

View file

@ -2,9 +2,10 @@ from django.contrib import messages
from django.views.generic.edit import FormView from django.views.generic.edit import FormView
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy,reverse
from django.views.generic import View from django.views.generic import View
from django.shortcuts import render from django.shortcuts import render,redirect,render_to_response
from django.http import HttpResponseRedirect
from utils.forms import ContactUsForm from utils.forms import ContactUsForm