From c09fc89197f0c6e09c037b497ad5d2478e919b07 Mon Sep 17 00:00:00 2001 From: Levi Date: Wed, 13 Apr 2016 00:31:19 -0500 Subject: [PATCH] Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls --- digitalglarus/urls.py | 4 +- digitalglarus/views.py | 11 +- dynamicweb/urls.py | 8 +- .../ungleich_page/includes/_about.html | 80 ++++ .../ungleich_page/includes/_contact_us.html | 29 ++ .../ungleich_page/includes/_footer.html | 26 ++ .../ungleich_page/includes/_header.html | 16 + .../ungleich_page/includes/_portfolio.html | 38 ++ .../ungleich_page/includes/_services.html | 46 ++ .../ungleich_page/includes/_softwares.html | 117 +++++ .../ungleich_page/includes/_team.html | 88 ++++ .../templates/ungleich_page/landing.html | 436 +----------------- ungleich_page/urls.py | 2 +- 13 files changed, 469 insertions(+), 432 deletions(-) create mode 100644 ungleich_page/templates/ungleich_page/includes/_about.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_contact_us.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_footer.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_header.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_portfolio.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_services.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_softwares.html create mode 100644 ungleich_page/templates/ungleich_page/includes/_team.html diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index dc06b6b4..eeeccf81 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -2,9 +2,11 @@ from django.conf.urls import url from django.utils.translation import ugettext_lazy as _ from . import views -from .views import ContactView +from .views import ContactView, IndexView, AboutView urlpatterns = [ + url(_(r'index/?$'), IndexView.as_view(), name='index'), + url(_(r'about/?$'), AboutView.as_view(), name='about'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'supporters/?$'), views.supporters, name='supporters'), url(_(r'support-us/?$'), views.support, name='support'), diff --git a/digitalglarus/views.py b/digitalglarus/views.py index 05437941..b1ad3e6d 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -5,7 +5,7 @@ from django.forms import ModelForm from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse_lazy from django.utils.translation import ugettext_lazy as _ - +from django.views.generic import TemplateView from django.utils.translation import get_language from djangocms_blog.models import Post from django.contrib import messages @@ -29,6 +29,13 @@ class ContactView(FormView): return super(ContactView, self).form_valid(form) +class IndexView(TemplateView): + template_name = "index.html" + + +class AboutView(TemplateView): + template_name = "about.html" + def detail(request, message_id): p = get_object_or_404(Message, pk=message_id) @@ -38,6 +45,8 @@ def detail(request, message_id): def about(request): return render(request, 'digitalglarus/about.html') + + #def index(request): # return render(request, 'digitalglarus/index.html') # diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 0b1bad0b..7df39009 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -19,12 +19,12 @@ urlpatterns = [ # note the django CMS URLs included via i18n_patterns urlpatterns += i18n_patterns('', # url(r'^$',include('ungleich.urls')), - url(r'^blog/',include('ungleich.urls',namespace='ungleich')), - url(r'^',include('ungleich_page.urls',namespace='ungleich_page')), - url(r'^login/',include(membership_urls)), - url(r'^admin/', include(admin.site.urls)), url(r'^digitalglarus/', include('digitalglarus.urls', namespace="digitalglarus"),name='digitalglarus'), + url(r'^blog/',include('ungleich.urls',namespace='ungleich')), + url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"), + url(r'^login/',include(membership_urls)), + url(r'^admin/', include(admin.site.urls)), url(r'^', include('cms.urls')), ) diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html new file mode 100644 index 00000000..75ae0539 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -0,0 +1,80 @@ +{% load static %} + +
+
+
+
+

ABOUT

+

The timeline of ungleich

+
+
+
+
+
    +
  • +
    + +
    +
    +
    +

    2000

    +
    +
    +

    The first incarnation of ungleich

    +

    in Germany

    +
    +
    • +
  • +
    + +
    +
    +
    +

    2013

    +
    +
    +

    ungleich founded

    +

    in Switzerland

    +
    +
    +
    • +
  • +
    + +
    +
    +
    +

    2014

    +
    +
    +

    ungleich present at various conferences :
    Linuxtag, UCMS, Linux Erfa, ETH Zurich
    +

    +
    +
    +
    • +
  • +
    + +
    +
    +
    +

    2015

    +
    +
    +

    ungleich introduces HA-Hosting

    +

    and introduces affordable 24X7 support.

    +

    ungleich launches Digital Glarus project

    +
    +
    +
    • +
  • +
    +

    and
    the story continues!

    +

     

    +
    +
    • +
+
+
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html new file mode 100644 index 00000000..c14e6bd9 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -0,0 +1,29 @@ +{% load static %} + +
+
+
+
+

Contact Us

+
+

Join us at Digital Glarus, + a great co-working space in the middle of Alps!

You can contact us at

+

info@ungleich.ch

+

Contact Us

+

+

+

+
+

(044) 534-66-22

+
+

 

+
+

 

+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_footer.html b/ungleich_page/templates/ungleich_page/includes/_footer.html new file mode 100644 index 00000000..238a6dcc --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_footer.html @@ -0,0 +1,26 @@ +{% load static %} + \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html new file mode 100644 index 00000000..e6fecfe9 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -0,0 +1,16 @@ +{% load static %} +
+
+
+ +


+
+ + We Design, Configure & Maintain
+ Your Linux Infrastructure + +
+ +
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html new file mode 100644 index 00000000..f0dd04f4 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -0,0 +1,38 @@ +{% load static %} + +
+
+
+
+

Hosting Products

+

Our Hosting Products:

+
+
+
+
+ +
+

HA Hosting

+

 

+

We offer high availablity hosting (HA) in Germany and in Switzerland. Our infrastructure is powered by Free and Open Source Software like OpenNebula, Qemu and GlusterFS.

+
+
+
+ +
+

Rails Hosting

+

 

+

Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails.

+
+
+
+ +
+

Configuration as a Service

+

 

+

You are in need for a configuration?
With ungleich you have found an experienced team that configure your systems to provide service like DNS, E-Mail, Databases or Webservers.

+
+
+
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html new file mode 100644 index 00000000..39f5c7cc --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -0,0 +1,46 @@ +{% load static %} + +
+
+
+
+

our services

+

We support our clients in all areas of Unix infrastructure.

+ Our top notch configuration management is refreshingly simple and reliable.

+
+
+
+
+
+ +
+

Hosting

+

 

+

Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe.

+
+
+
+
+
+ +
+

Configuration as a Service

+

 

+

Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.

+

 

+
+
+
+
+
+ +

Linux System Engineering

+

 

+
+

Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more.

+
+
+
+
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html new file mode 100644 index 00000000..b5ece4d8 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -0,0 +1,117 @@ +{% load static %} + + \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html new file mode 100644 index 00000000..5339793f --- /dev/null +++ b/ungleich_page/templates/ungleich_page/includes/_team.html @@ -0,0 +1,88 @@ +{% load static %} + +
+
+
+
+

Why ungleich?*

+

What our customers say

+
+
+ +
+
+ +
+ +
    +
  1. +
  2. +
  3. +
+ + +
+
+ +

+ "ungleich helped us getting started with our internal + infrastructure, hosted on physical servers in a + co-location data centre in Zurich. From planning the + network layout and virtualisation setup, + inviting offers and securing a great deal from a + hardware vendor, all the way to the installation of + basic services like DNS, VPN and firewalls using the + configuration management software cdist, we could + count on the support of ungleich. At the end, we got + a high availability infrastructure setup enabling our + engineers to work more efficiently and comfortable + than before." +

+

+ - Luciano Franceschina, CTO at Teralytics +

+
+
+ +

+ "Thanks to ungleich team, who has designed and + configured our company's Linux infrastructure, our + systems are very easy to maintain. Their innovative + configuration management system cdist helped us + significantly not only in cost but also in time + saving, which is crucial for IT companies like ours." +

+

+ - Beat Seeliger , CTO at Panter AG +

+
+
+ +

+ "ungleich provided an excellent service in designing + our system architecture and created secure and stable + appliance. For us it is important to have an enduring + stability in our system, and ungleich's configuration + management system cdist is easy to adapt for our + system administrators. We had a successful + collaboration with ungleich in the time of very + high workload, and their project leading was + high-skilled and very reliable. I would definitely + recommend them to any companies with high demand in + solid infrastructures." +

+

+ - Sebastian Plattner, + Teamleader Development Cyber Security Products at RUAG +

+
+
+
+ +
+
+
+
+

*ungleich means not equal to (≠) U+2260.

+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html index f689e861..f2578fc3 100644 --- a/ungleich_page/templates/ungleich_page/landing.html +++ b/ungleich_page/templates/ungleich_page/landing.html @@ -98,444 +98,30 @@ -
-
-
- -


-
- - We Design, Configure & Maintain
- Your Linux Infrastructure - -
+ {% include "ungleich_page/includes/_header.html" %} -
-
-
-
-
-
-
-

our services

-

We support our clients in all areas of Unix infrastructure.

- Our top notch configuration management is refreshingly simple and reliable.

-
-
-
-
-
- -
-

Hosting

-

 

-

Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe.

-
-
-
-
-
- -
-

Configuration as a Service

-

 

-

Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.

-

 

-
-
-
-
-
- -

Linux System Engineering

-

 

-
-

Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more.

-
-
-
-
-
+ {% include "ungleich_page/includes/_services.html" %} -
-
-
-
-

Hosting Products

-

Our Hosting Products:

-
-
-
-
- -
-

HA Hosting

-

 

-

We offer high availablity hosting (HA) in Germany and in Switzerland. Our infrastructure is powered by Free and Open Source Software like OpenNebula, Qemu and GlusterFS.

-
-
-
- -
-

Rails Hosting

-

 

-

Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails.

-
-
-
- -
-

Configuration as a Service

-

 

-

You are in need for a configuration?
With ungleich you have found an experienced team that configure your systems to provide service like DNS, E-Mail, Databases or Webservers.

-
-
-
-
+ {% include "ungleich_page/includes/_portfolio.html" %} -
-
-
-
-
-

ABOUT

-

The timeline of ungleich

-
-
-
-
-
    -
  • -
    - -
    -
    -
    -

    2000

    -
    -
    -

    The first incarnation of ungleich

    -

    in Germany

    -
    -
    • -
  • -
    - -
    -
    -
    -

    2013

    -
    -
    -

    ungleich founded

    -

    in Switzerland

    -
    -
    -
    • -
  • -
    - -
    -
    -
    -

    2014

    -
    -
    -

    ungleich present at various conferences :
    Linuxtag, UCMS, Linux Erfa, ETH Zurich
    -

    -
    -
    -
    • -
  • -
    - -
    -
    -
    -

    2015

    -
    -
    -

    ungleich introduces HA-Hosting

    -

    and introduces affordable 24X7 support.

    -

    ungleich launches Digital Glarus project

    -
    -
    -
    • -
  • -
    -

    and
    the story continues!

    -

     

    -
    -
    • -
-
-
-
-
- + {% include "ungleich_page/includes/_about.html" %} -
-
-
-
-

Why ungleich?*

-

What our customers say

-
-
+ {% include "ungleich_page/includes/_team.html" %} -
-
- -
- -
    -
  1. -
  2. -
  3. -
+ + {% include "ungleich_page/includes/_softwares.html" %} - -
-
- -

- "ungleich helped us getting started with our internal - infrastructure, hosted on physical servers in a - co-location data centre in Zurich. From planning the - network layout and virtualisation setup, - inviting offers and securing a great deal from a - hardware vendor, all the way to the installation of - basic services like DNS, VPN and firewalls using the - configuration management software cdist, we could - count on the support of ungleich. At the end, we got - a high availability infrastructure setup enabling our - engineers to work more efficiently and comfortable - than before." -

-

- - Luciano Franceschina, CTO at Teralytics -

-
-
- -

- "Thanks to ungleich team, who has designed and - configured our company's Linux infrastructure, our - systems are very easy to maintain. Their innovative - configuration management system cdist helped us - significantly not only in cost but also in time - saving, which is crucial for IT companies like ours." -

-

- - Beat Seeliger , CTO at Panter AG -

-
-
- -

- "ungleich provided an excellent service in designing - our system architecture and created secure and stable - appliance. For us it is important to have an enduring - stability in our system, and ungleich's configuration - management system cdist is easy to adapt for our - system administrators. We had a successful - collaboration with ungleich in the time of very - high workload, and their project leading was - high-skilled and very reliable. I would definitely - recommend them to any companies with high demand in - solid infrastructures." -

-

- - Sebastian Plattner, - Teamleader Development Cyber Security Products at RUAG -

-
-
-
- -
-
-
-
-

*ungleich means not equal to (≠) U+2260.

-
-
- - - -
-
-
-
-

Contact Us

-
-

Join us at Digital Glarus, - a great co-working space in the middle of Alps!

You can contact us at

-

info@ungleich.ch

-

-

-

-
-

(044) 534-66-22

-
-

 

-
-

 

-
-
-
- -
-
-
-
- - + + {% include "ungleich_page/includes/_footer.html" %} diff --git a/ungleich_page/urls.py b/ungleich_page/urls.py index c8215ab1..2176973d 100644 --- a/ungleich_page/urls.py +++ b/ungleich_page/urls.py @@ -5,5 +5,5 @@ from django.utils.translation import ugettext_lazy as _ urlpatterns = [ url(_(r'contact/?$'), ContactView.as_view(), name='contact'), - url(_(r'landing/?$'), LandingView.as_view(), name='landing'), + url(_(r''), LandingView.as_view(), name='landing'), ]