From ab75b12ffa7fff75d6b36f1b700516c17d762f21 Mon Sep 17 00:00:00 2001 From: Levi Date: Fri, 15 Apr 2016 20:18:29 -0500 Subject: [PATCH] Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page --- .../templates/digitalglarus/about.html | 57 ++++ .../templates/digitalglarus/contact.html | 79 ++++++ .../templates/digitalglarus/index.html | 99 +++++++ digitalglarus/views.py | 8 +- ungleich_page/locale/de/LC_MESSAGES/django.po | 246 +++++++++++++++++- .../static/ungleich_page/css/agency.css | 2 + .../ungleich_page/includes/_about.html | 24 +- .../ungleich_page/includes/_contact_us.html | 56 +++- .../ungleich_page/includes/_footer.html | 6 +- .../ungleich_page/includes/_header.html | 5 +- .../ungleich_page/includes/_portfolio.html | 17 +- .../ungleich_page/includes/_services.html | 19 +- .../ungleich_page/includes/_team.html | 15 +- .../templates/ungleich_page/landing.html | 185 +------------ ungleich_page/urls.py | 2 +- ungleich_page/views.py | 15 +- 16 files changed, 590 insertions(+), 245 deletions(-) create mode 100755 digitalglarus/templates/digitalglarus/about.html create mode 100755 digitalglarus/templates/digitalglarus/contact.html create mode 100644 digitalglarus/templates/digitalglarus/index.html diff --git a/digitalglarus/templates/digitalglarus/about.html b/digitalglarus/templates/digitalglarus/about.html new file mode 100755 index 00000000..a63a58ac --- /dev/null +++ b/digitalglarus/templates/digitalglarus/about.html @@ -0,0 +1,57 @@ +{% extends "base_glarus.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 %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/contact.html b/digitalglarus/templates/digitalglarus/contact.html new file mode 100755 index 00000000..ba12c5ae --- /dev/null +++ b/digitalglarus/templates/digitalglarus/contact.html @@ -0,0 +1,79 @@ +{% extends "base_glarus.html" %} +{% load cms_tags %} +{% block title %}Contact{% endblock %} + +{% block content %} +
+
+
+ {% for message in messages %} + + {% endfor %} +
+

+ {% static_placeholder "digital_glarus_contact_title" %} +

+
+
+
+

+ {% static_placeholder "digital_glarus_contact_location" %} +

+
+
+ {% static_placeholder "digital_glarus_contact_information" %} +
 
+
+
+
+
+ +
+
+
+
+

+ {% static_placeholder "digital_glarus_contact_form_title" %} +

+
+

{% static_placeholder "digital_glarus_contact_form_text" %}

+
+ {% csrf_token %} +
+
+ {{ form.name.label_tag }} + {{ form.name }} + {{ form.name.errors|striptags}} +
+
+ {{ form.email.label_tag }} + {{ form.email }} + {{ form.email.errors|striptags}} +
+
+ {{ form.phone_number.label_tag }} + {{ form.phone_number }} + {{ form.phone_number.errors|striptags}} +
+
+
+ {{ form.message.label_tag }} + {{ form.message }} + {{ form.message.errors|striptags}} +
+ {{ form.non_field_errors }} +
+ + +
+
+
+ +
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html new file mode 100644 index 00000000..d7894fb2 --- /dev/null +++ b/digitalglarus/templates/digitalglarus/index.html @@ -0,0 +1,99 @@ +{% extends "base_glarus.html" %} +{% load staticfiles cms_tags %} + +{% 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 %} \ No newline at end of file diff --git a/digitalglarus/views.py b/digitalglarus/views.py index b1ad3e6d..1002ba3d 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -30,11 +30,11 @@ class ContactView(FormView): class IndexView(TemplateView): - template_name = "index.html" + template_name = "digitalglarus/index.html" class AboutView(TemplateView): - template_name = "about.html" + template_name = "digitalglarus/about.html" def detail(request, message_id): p = get_object_or_404(Message, pk=message_id) @@ -53,8 +53,8 @@ def about(request): #def letscowork(request): # return render(request, 'digitalglarus/letscowork.html') -def index(request): - return home(request) +# def index(request): +# return home(request) def home(request): return render(request, 'index.html') diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 2d6e21aa..3d564b18 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-11 21:02-0500\n" +"POT-Creation-Date: 2016-04-15 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,18 +18,248 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: templates/ungleich_page/includes/_about.html:8 +msgid "ABOUT" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:9 +msgid "The timeline of ungleich" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:24 +msgid "The first incarnation of ungleich" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:25 +msgid "in Germany" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:37 +msgid "ungleich founded" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:38 +msgid "in Switzerland" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:51 +msgid "ungleich present at various conferences" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:65 +msgid "ungleich introduces HA-Hosting" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:66 +msgid "and introduces affordable 24X7 support." +msgstr "" + +#: templates/ungleich_page/includes/_about.html:67 +msgid "ungleich launches" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:68 +msgid "Digital Glarus project" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:74 +msgid "and" +msgstr "" + +#: templates/ungleich_page/includes/_about.html:74 +msgid "the story continues!" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:14 +#: templates/ungleich_page/includes/_contact_us.html:21 views.py:35 +msgid "Contact Us" +msgstr "Kontaktiere Uns" + +#: templates/ungleich_page/includes/_contact_us.html:16 +msgid "Join us at" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:16 +msgid "Digital Glarus" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:17 +msgid "a great co-working space in the middle of Alps!" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:17 +msgid "You can contact us at" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:20 +msgid "or" +msgstr "" + +#: templates/ungleich_page/includes/_contact_us.html:50 +msgid "Submit" +msgstr "" + +#: templates/ungleich_page/includes/_footer.html:8 +msgid "Copyright © ungleich GmbH " +msgstr "" + +#: templates/ungleich_page/includes/_footer.html:22 +msgid "ungleich Home" +msgstr "" + +#: templates/ungleich_page/includes/_header.html:11 +msgid "We Design, Configure & Maintain
Your Linux Infrastructure " +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:8 +#: templates/ungleich_page/includes/_portfolio.html:9 +msgid "Hosting Products " +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:16 +msgid "HA Hosting" +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:18 +msgid "" +"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." +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:24 +msgid "Rails Hosting" +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:26 +msgid "" +"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." +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:32 +msgid " Configuration as a Service" +msgstr "" + +#: templates/ungleich_page/includes/_portfolio.html:34 +msgid "" +"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." +msgstr "" + +#: templates/ungleich_page/includes/_services.html:8 +msgid "our services" +msgstr "" + +#: templates/ungleich_page/includes/_services.html:18 +msgid "Hosting" +msgstr "" + +#: templates/ungleich_page/includes/_services.html:20 +msgid "" +"Ruby on Rails. Java hosting, Django hosting, we make it everything run " +"smooth and safe." +msgstr "" + +#: templates/ungleich_page/includes/_services.html:28 +msgid "Configuration as a Service" +msgstr "" + +#: templates/ungleich_page/includes/_services.html:30 +msgid "" +"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." +msgstr "" + +#: templates/ungleich_page/includes/_services.html:38 +msgid "Linux System Engineering" +msgstr "" + +#: templates/ungleich_page/includes/_services.html:41 +msgid "" +"Let your developers develop! We take care of your system administration. " +"Gentoo, Archlinux, Debian, Ubuntu, and many more." +msgstr "" + +#: templates/ungleich_page/includes/_team.html:8 +msgid "Why ungleich?*" +msgstr "" + +#: templates/ungleich_page/includes/_team.html:9 +msgid "What our customers say" +msgstr "" + +#: templates/ungleich_page/includes/_team.html:29 +msgid "" +"\n" +"\t\t\t \"ungleich helped us getting started with our internal\n" +"\t\t\t infrastructure, hosted on physical servers in a\n" +"\t\t\t co-location data centre in Zurich. From planning the\n" +"\t\t\t network layout and virtualisation setup,\n" +"\t\t\t inviting offers and securing a great deal from a\n" +"\t\t\t hardware vendor, all the way to the installation of\n" +"\t\t\t basic services like DNS, VPN and firewalls using the\n" +"\t\t\t configuration management software cdist, we could\n" +"\t\t\t count on the support of ungleich. At the end, we got\n" +"\t\t\t a high availability infrastructure setup enabling our\n" +"\t\t\t engineers to work more efficiently and comfortable\n" +"\t\t\t than before.\"\n" +"\t\t\t " +msgstr "" + +#: templates/ungleich_page/includes/_team.html:51 +msgid "" +"\n" +"\t\t\t \"Thanks to ungleich team, who has designed and\n" +"\t\t\t configured our company's Linux infrastructure, our\n" +"\t\t\t systems are very easy to maintain. Their innovative\n" +"\t\t\t configuration management system cdist helped us\n" +"\t\t\t significantly not only in cost but also in time\n" +"\t\t\t saving, which is crucial for IT companies like ours.\"\n" +"\t\t\t \t" +msgstr "" + +#: templates/ungleich_page/includes/_team.html:67 +msgid "" +"\n" +"\t\t\t \"ungleich provided an excellent service in designing\n" +"\t\t\t our system architecture and created secure and stable\n" +"\t\t\t appliance. For us it is important to have an enduring\n" +"\t\t\t stability in our system, and ungleich's configuration\n" +"\t\t\t management system cdist is easy to adapt for our\n" +"\t\t\t system administrators. We had a successful\n" +"\t\t\t collaboration with ungleich in the time of very\n" +"\t\t\t high workload, and their project leading was\n" +"\t\t\t high-skilled and very reliable. I would definitely\n" +"\t\t\t recommend them to any companies with high demand in\n" +"\t\t\t solid infrastructures.\"\n" +"\t\t\t " +msgstr "" + +#: templates/ungleich_page/includes/_team.html:82 +msgid "" +"\n" +"\t\t\t - Sebastian Plattner,\n" +"\t\t\t Teamleader Development Cyber Security Products at RUAG\n" +"\t\t\t " +msgstr "" + +#: templates/ungleich_page/includes/_team.html:95 +msgid "*ungleich means not equal to (≠) U+2260." +msgstr "" + #: urls.py:7 msgid "contact/?$" msgstr "" -#: views.py:13 +#: views.py:25 msgid "Message Successfully Sent" msgstr "" -#: views.py:23 -msgid "Contact Us" -msgstr "Kontaktiere Uns" - -#: views.py:24 +#: views.py:36 msgid "If you have any question, just send us an email." -msgstr "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail." +msgstr "" +"Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail." diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 966dcf05..45a682b0 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -680,7 +680,9 @@ section#contact .section-heading { } section#contact .form-group { + color:white; margin-bottom: 25px; + text-align: left; } section#contact .form-group input, diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 75ae0539..ebcbbdcb 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -1,11 +1,12 @@ {% load static %} +{% load i18n %}
-

ABOUT

-

The timeline of ungleich

+

{% trans "ABOUT" %}

+

{% trans "The timeline of ungleich" %}

@@ -20,8 +21,8 @@

2000

-

The first incarnation of ungleich

-

in Germany

+

{% trans "The first incarnation of ungleich" %}

+

{% trans "in Germany" %}

  • @@ -33,8 +34,8 @@

    2013

    -

    ungleich founded

    -

    in Switzerland

    +

    {% trans "ungleich founded" %}

    +

    {% trans "in Switzerland" %}

    • @@ -47,7 +48,7 @@

    2014

    -

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

    {% trans "ungleich present at various conferences" %}:
    Linuxtag, UCMS, Linux Erfa, ETH Zurich

    @@ -61,15 +62,16 @@

    2015

    -

    ungleich introduces HA-Hosting

    -

    and introduces affordable 24X7 support.

    -

    ungleich launches Digital Glarus project

    +

    {% trans "ungleich introduces HA-Hosting" %}

    +

    {% trans "and introduces affordable 24X7 support." %}

    +

    {% trans "ungleich launches" %} + {% trans "Digital Glarus project" %}

  • -

    and
    the story continues!

    +

    {% trans "and" %}
    {% trans "the story continues!" %}

     

    • diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index c14e6bd9..7d206cad 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -1,22 +1,56 @@ {% load static %} +{% load i18n %}
    -

    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

    -

    -

    -

    + {% for message in messages %} + + {% endfor %} +

    {% trans "Contact Us" %}


    +

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, + {% trans "a great co-working space in the middle of Alps!" %}

    {% trans "You can contact us at" %}

    +

    info@ungleich.ch

    (044) 534-66-22

    -
    -

     

    +

    {% trans "or" %}

    +

    {% trans "Contact Us" %}

    + +
    + {% csrf_token %} +
    +
    + {{ form.name.label_tag }} + {{ form.name }} + {{ form.name.errors|striptags}} +
    +
    + {{ form.email.label_tag }} + {{ form.email }} + {{ form.email.errors|striptags}} +
    +
    + {{ form.phone_number.label_tag }} + {{ form.phone_number }} + {{ form.phone_number.errors|striptags}} +
    +
    +
    + {{ form.message.label_tag }} + {{ form.message }} + {{ form.message.errors|striptags}} +
    + {{ form.non_field_errors }} +
    + + +
    +
    +

     

    diff --git a/ungleich_page/templates/ungleich_page/includes/_footer.html b/ungleich_page/templates/ungleich_page/includes/_footer.html index 238a6dcc..1b0eb595 100644 --- a/ungleich_page/templates/ungleich_page/includes/_footer.html +++ b/ungleich_page/templates/ungleich_page/includes/_footer.html @@ -1,9 +1,11 @@ {% load static %} +{% load i18n %} +