moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merged master

Browse source
This commit is contained in:
Arvind Tiwari 2017-11-19 03:35:27 +05:30
commit 7ed0715f0d
20 changed files with 161 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Changelog
View file

@ -1,3 +1,10 @@
1.2.9: 2017-11-13
* #3848: [ungleich] Optimize ungleich.ch landing page
* #3360: [ungleich] Ungleich.ch landing page animation fix
* #3421: [hosting] Signup form placeholder translations
* #3856: [ungleich] Glasfaser text modified
* bugfix: [blog] Redirect user to ungleich home on ungleich logo click
* #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..."
1.2.8: 2017-10-21 1.2.8: 2017-10-21
* Remove ALLOWED_HOST alplora.ch * Remove ALLOWED_HOST alplora.ch
* Add ALLOWED_HOST hack4glarus.ch * Add ALLOWED_HOST hack4glarus.ch
@ -19,7 +26,6 @@
* Bugfix: [hosting] card details input form alignment fix * Bugfix: [hosting] card details input form alignment fix
* #3823: [hosting] favicon link fixed * #3823: [hosting] favicon link fixed
* #3844: [dcl] Add Glasfaser page for advertisement * #3844: [dcl] Add Glasfaser page for advertisement
1.2.4: 2017-10-02 1.2.4: 2017-10-02
* #3780: [hosting] Store VM details locally * #3780: [hosting] Store VM details locally
* #3764: [hosting] Show cancelled VMs' invoices * #3764: [hosting] Show cancelled VMs' invoices

13
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-16 00:57+0530\n" "POT-Creation-Date: 2017-11-13 17:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -270,8 +270,12 @@ msgstr ""
"Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit "
"federleichten Preisen." "federleichten Preisen."
msgid "Affordable VM hosting based in Switzerland" msgid ""
msgstr "Bezahlbares VM Hosting in der Schweiz" "Ready in 30 seconds.<br/>Experience the unbeatable speed from Data Center "
"Light."
msgstr ""
"Fertig in 30 Sekunden.<br/>Erlebe die unschlagbare Geschwindigkeit von Data "
"Center Light."
msgid "Contact us" msgid "Contact us"
msgstr "Kontaktiere uns" msgstr "Kontaktiere uns"
@ -513,6 +517,9 @@ msgstr ""
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
"auf sie zugreifen kannst." "auf sie zugreifen kannst."
#~ msgid "Affordable VM hosting based in Switzerland"
#~ msgstr "Bezahlbares VM Hosting in der Schweiz"
#~ msgid "Processing..." #~ msgid "Processing..."
#~ msgstr "Abarbeitung..." #~ msgstr "Abarbeitung..."

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -130,7 +130,7 @@
<div class="row text-center"> <div class="row text-center">
<div class="col-xs-12 col-md-6 text"> <div class="col-xs-12 col-md-6 text">
<h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2> <h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
<p class="lead new-lead">{% trans "Affordable VM hosting based in Switzerland" %}</p> <p class="lead new-lead">{% blocktrans %}Ready in 30 seconds.<br/>Experience the unbeatable speed from Data Center Light.{% endblocktrans %}</p>
</div> </div>
<div class="col-xs-12 col-md-6 hero-feature"> <div class="col-xs-12 col-md-6 hero-feature">

5
digitalglarus/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-10 21:35+0530\n" "POT-Creation-Date: 2017-11-06 00:24+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,6 +95,9 @@ msgstr "Seite"
msgid "Data Center Light" msgid "Data Center Light"
msgstr "" msgstr ""
msgid "Glasfaser"
msgstr ""
msgid "English" msgid "English"
msgstr "" msgstr ""

10
hosting/forms.py
View file

@ -50,15 +50,17 @@ class HostingUserLoginForm(forms.Form):
class HostingUserSignupForm(forms.ModelForm): class HostingUserSignupForm(forms.ModelForm):
confirm_password = forms.CharField(widget=forms.PasswordInput()) confirm_password = forms.CharField(label=_("Confirm Password"),
password = forms.CharField(widget=forms.PasswordInput()) widget=forms.PasswordInput())
password = forms.CharField(label=_("Password"),
widget=forms.PasswordInput())
class Meta: class Meta:
model = CustomUser model = CustomUser
fields = ['name', 'email', 'password'] fields = ['name', 'email', 'password']
widgets = { widgets = {
'name': forms.TextInput( 'name': forms.TextInput(
attrs={'placeholder': 'Enter your name or company name'}), attrs={'placeholder': _('Enter your name or company name')}),
} }
def clean_confirm_password(self): def clean_confirm_password(self):
@ -106,7 +108,7 @@ class UserHostingKeyForm(forms.ModelForm):
public_key=openssh_pubkey_str).first().name public_key=openssh_pubkey_str).first().name
KEY_EXISTS_MESSAGE = _( KEY_EXISTS_MESSAGE = _(
"This key exists already with the name \"%(name)s\"") % { "This key exists already with the name \"%(name)s\"") % {
'name': key_name} 'name': key_name}
raise forms.ValidationError(KEY_EXISTS_MESSAGE) raise forms.ValidationError(KEY_EXISTS_MESSAGE)
with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file: with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file:

11
hosting/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-16 01:06+0530\n" "POT-Creation-Date: 2017-10-26 03:21+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -27,6 +27,15 @@ msgstr "Dein Account wurde noch nicht aktiviert."
msgid "User does not exist" msgid "User does not exist"
msgstr "Der Benutzer existiert nicht" msgstr "Der Benutzer existiert nicht"
msgid "Confirm Password"
msgstr "Passwort Bestätigung"
msgid "Password"
msgstr "Passwort"
msgid "Enter your name or company name"
msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein"
msgid "Paste here your public key" msgid "Paste here your public key"
msgstr "Füge Deinen Public Key ein" msgstr "Füge Deinen Public Key ein"

2
ungleich/templates/cms/ungleichch/_menu.html
View file

@ -10,7 +10,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="https://www.ungleich.ch">
<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" /> <img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" />
</a> </a>
</div> </div>

10
ungleich_page/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,11 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-10-26 03:32+0530\n" "POT-Creation-Date: 2017-10-26 03:32+0530\n"
=======
"POT-Creation-Date: 2017-11-06 00:24+0530\n"
>>>>>>> master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,6 +25,12 @@ msgstr ""
msgid "Glasfaser menu" msgid "Glasfaser menu"
msgstr "" msgstr ""
<<<<<<< HEAD
=======
msgid "\"Sorry, we could not find the page you are looking for!\""
msgstr ""
>>>>>>> master
msgid "Toggle navigation" msgid "Toggle navigation"
msgstr "Umschalten" msgstr "Umschalten"

3
ungleich_page/static/ungleich_page/css/agency.css
View file

@ -264,7 +264,8 @@ fieldset[disabled] .btn-xl.active {
} }
.navbar-default.navbar-shrink .navbar-brand { .navbar-default.navbar-shrink .navbar-brand {
font-size: 1.5em; font-size: 1.5em;
padding: 8px;
} }
} }

6
ungleich_page/static/ungleich_page/js/ungleich.js
View file

@ -2,16 +2,16 @@
$(function(){ $(function(){
new WOW().init(); new WOW().init();
$('.img-toggle').one('mouseover', toggleImage); $('.img-toggle').one('mouseenter', toggleImage);
}); });
function toggleImage(e) { function toggleImage(e) {
var $this = $(this), var $this = $(this),
toggle_img = $this.attr('data-replaced'), toggle_img = $this.attr('data-replaced'),
current_img = $this.attr('src'); current_img = $this.attr('src');
$this.fadeOut(600, function() { $this.fadeOut(200, function() {
$this.attr('src', toggle_img); $this.attr('src', toggle_img);
$this.attr('data-replaced', current_img); $this.attr('data-replaced', current_img);
$this.fadeIn(900); $this.fadeIn(300);
}); });
}; };

18
ungleich_page/templates/ungleich_page/404.html
View file

@ -1,4 +1,4 @@
{% load staticfiles%} {% load staticfiles i18n %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -11,7 +11,7 @@
<meta name="author" content=""> <meta name="author" content="">
<title> Page not found | ungleich </title> <title> Page not found | ungleich </title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'hosting/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/bootstrap.min.css' %}" rel="stylesheet">
@ -33,27 +33,21 @@
</head> </head>
<body> <body class="error404">
<body class="error404">
<div class="content-404"> <div class="content-404">
<div class="container"> <div class="container text-center">
<div class="text-center">
<h1>&nbsp;</h1> <h1>&nbsp;</h1>
<h1>404</h1> <h1>404</h1>
<p class="lead"> <p class="lead">
"Sorry, we could not find the page you are looking for!" {% trans '"Sorry, we could not find the page you are looking for!"' %}
</p> </p>
</div>
</div> </div>
</div>
<!-- Footer --><!-- jQuery --> <!-- Footer --><!-- jQuery -->
<script src="{% static 'hosting/js/jquery.js' %}"></script> <script src="{% static 'hosting/js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.min.js"></script> <script src="js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

10
ungleich_page/templates/ungleich_page/glasfaser.html
View file

@ -14,7 +14,7 @@
<title>ungleich GmbH</title> <title>ungleich GmbH</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/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">
<!-- 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 -->
@ -91,8 +91,8 @@
</div> </div>
<div class="split-description wow fadeInUp"> <div class="split-description wow fadeInUp">
<p class="lead"><strong>Surfen Sie mit 100 Mbit/s im Internet!</strong></p> <p class="lead"><strong>Surfen Sie mit 100 Mbit/s im Internet!</strong></p>
<p class="lead">Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit symmetrisch in beide Richtungen verfügbar. Damit kann ihr Firmennetzwerk auch Dienste bereitstellen.</p> <p class="lead">Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit ist symmetrisch in beide Richtungen verfügbar. Damit kann Ihr Firmennetzwerk auch Dienste bereitstellen.</p>
<p class="lead">Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot.</p> <p class="lead">Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot. Gerne stellen wir Ihnen eine persönliche Offerte zusammen.</p>
</div> </div>
</div> </div>
</div> </div>
@ -144,7 +144,7 @@
<img src="{% static 'ungleich_page/img/glasfaser/switch.svg' %}" class="img-responsive img-circle" alt=""> <img src="{% static 'ungleich_page/img/glasfaser/switch.svg' %}" class="img-responsive img-circle" alt="">
<div class="team-member-caption inline-block"> <div class="team-member-caption inline-block">
<h4 class="portfolio-caption">Einfach zu nutzen</h4> <h4 class="portfolio-caption">Einfach zu nutzen</h4>
<p class="text-muted">2 vorkonfigurierte Endgeräte (benötigt zwei Steckdosen auf Ihrer Seite)</p> <p class="text-muted">2 bereits für Sie konfigurierte Endgeräte (benötigt zwei Ihrer Steckdosen)</p>
<p class="text-muted">Einfach einstecken und los!</p> <p class="text-muted">Einfach einstecken und los!</p>
</div> </div>
</div> </div>
@ -199,7 +199,7 @@
</div> </div>
<div class="timeline-panel wow slideInDown"> <div class="timeline-panel wow slideInDown">
<div class="timeline-body"> <div class="timeline-body">
<p>Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie bllitzschnell im Internet!</p> <p>Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie blitzschnell im Internet!</p>
</div> </div>
</div> </div>
</li> </li>

5
ungleich_page/templates/ungleich_page/includes/_about.html
View file

@ -1,5 +1,4 @@
{% load static %} {% load static i18n %}
{% load i18n %}
<section id="about"> <section id="about">
<div class="container"> <div class="container">
@ -32,7 +31,7 @@
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans "ungleich founded" %} </p> <p>{% trans "ungleich founded" %} </p>
<p>{% trans "in Switzerland" %} </p> <p>{% trans "in Switzerland" %}</p>
</div> </div>
</div> </div>
</li> </li>

25
ungleich_page/templates/ungleich_page/includes/_contact_us.html
View file

@ -3,26 +3,27 @@
<section id="contact"> <section id="contact">
<div class="container"> <div class="container">
<div class="row" class="wow fadeInDown"> <div class="wow fadeInDown">
<div class="col-lg-12 text-center wow fadeInDown"> <div class="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" <button type="button" class="close" data-dismiss="alert" aria-label="Close"
autofocus><span aria-hidden="true">&times;</span></button> autofocus><span aria-hidden="true">&times;</span></button>
<strong>{{ message }}</strong> <strong>{{ message }}</strong>
</div> </div>
{% endfor %} {% endfor %}
<h2 class="section-heading">{% trans "Contact Us" %}</h2> <h2 class="section-heading">{% trans "Contact Us" %}</h2>
<br> <br>
<h3 class="intro-smallcap">{% trans "Join us at" %} <a <h3 class="intro-smallcap">
href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}</a>, {% trans "Join us at" %} <a href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}</a>, {% trans "a great co-working space in the middle of Alps!" %} <br>
{% trans "a great co-working space in the middle of Alps!" %} {% trans "You can contact us at" %}
<p></p> {% trans "You can contact us at" %} </h3> </h3>
<h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch"><i class="fa fa-envelope">info@ungleich.ch</i></a> <h3 class="intro-smallcap">
<a href="mailto:info@ungleich.ch"><i class="fa fa-envelope"></i> info@ungleich.ch</a>
</h3> </h3>
<h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3> <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22</h3>
<!-- <h3 class="intro-smallcap">{% trans "or" %}</h3> --> <!-- <h3 class="intro-smallcap">{% trans "or" %}</h3> -->
<!-- <h3 class="intro-smallcap">{% trans "Contact Us" %}</h3> --> <!-- <h3 class="intro-smallcap">{% trans "Contact Us" %}</h3> -->
@ -62,12 +63,6 @@
</div> </div>
</form> --> </form> -->
</div> </div>
<p>&nbsp;</p>
</div>
<div class="row">
<div class="col-lg-12">
</div>
</div> </div>
</div> </div>
</section> </section>

12
ungleich_page/templates/ungleich_page/includes/_footer.html
View file

@ -9,17 +9,21 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<ul class="list-inline social-buttons"> <ul class="list-inline social-buttons">
<li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a> <li>
<a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
</li> </li>
<li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a> <li>
<a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
</li> </li>
<li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a> <li>
<a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<ul class="list-inline quicklinks"> <ul class="list-inline quicklinks">
<li><a href="http://www.ungleich.ch/">{% trans "ungleich Home" %} </a> <li>
<a href="http://www.ungleich.ch/">{% trans "ungleich Home" %}</a>
</li> </li>
</ul> </ul>
</div> </div>

6
ungleich_page/templates/ungleich_page/includes/_portfolio.html
View file

@ -10,7 +10,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="0.5s"> <div class="col-md-4 col-sm-6 portfolio-item wow fadeInUp" data-wow-delay="0.25s">
<a href="{% url 'datacenterlight:index' %}"><img src="{% static 'ungleich_page/img/portfolio/datacenterlight.png' %}" class="img-responsive inline-block" alt=""></a> <a href="{% url 'datacenterlight:index' %}"><img src="{% static 'ungleich_page/img/portfolio/datacenterlight.png' %}" class="img-responsive inline-block" alt=""></a>
<div class="portfolio-caption inline-block"> <div class="portfolio-caption inline-block">
<h4>{% trans "Data Center Light" %}</h4> <h4>{% trans "Data Center Light" %}</h4>
@ -18,7 +18,7 @@
<p class="text-muted">{% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %} </p> <p class="text-muted">{% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %} </p>
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1s"> <div class="col-md-4 col-sm-6 portfolio-item wow fadeInUp" data-wow-delay="0.5s">
<a href="{% url 'rails.hosting' %}"><img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt=""></a> <a href="{% url 'rails.hosting' %}"><img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt=""></a>
<div class="portfolio-caption inline-block"> <div class="portfolio-caption inline-block">
<h4>{% trans "Rails Hosting" %} </h4> <h4>{% trans "Rails Hosting" %} </h4>
@ -26,7 +26,7 @@
<p class="text-muted">{% trans "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." %}</p> <p class="text-muted">{% trans "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." %}</p>
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1.5s"> <div class="col-md-4 col-sm-6 portfolio-item wow fadeInUp" data-wow-delay="0.75s">
<a href="{% url 'datacenterlight:glasfaser' %}"><img src="{% static 'ungleich_page/img/portfolio/glasfaser.png' %}" class="img-responsive inline-block" alt=""></a> <a href="{% url 'datacenterlight:glasfaser' %}"><img src="{% static 'ungleich_page/img/portfolio/glasfaser.png' %}" class="img-responsive inline-block" alt=""></a>
<div class="portfolio-caption inline-block"> <div class="portfolio-caption inline-block">
<h4>{% trans "High Speed Internet" %}</h4> <h4>{% trans "High Speed Internet" %}</h4>

45
ungleich_page/templates/ungleich_page/includes/_services.html
View file

@ -2,48 +2,45 @@
{% load i18n %} {% load i18n %}
<section id="services"> <section id="services">
<div class="container"> <div class="container">
<div class="row"> <div class="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">
<h3 class="section-subheading text-muted"> {% trans "We support our clients in all areas of Unix infrastructure." %}<br/>
{% trans "We support our clients in all areas of Unix infrastructure." %}<br/> {% trans "Our top notch configuration management is refreshingly simple and reliable." %}
{% trans "Our top notch configuration management is refreshingly simple and reliable." %} </h3>
</h3> </div>
</div>
</div>
<div class="row text-center"> <div class="row text-center">
<div class="col-sm-4"> <div class="col-sm-4">
<div class="team-member wow fadeInDown" data-wow-delay="0.5s"> <div class="team-member wow fadeInUp" data-wow-delay="0.25s">
<img src="{% static 'ungleich_page/img/team/5.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/hosting.png' %}" class="img-responsive img-circle img-toggle" alt=""> <img src="{% static 'ungleich_page/img/team/5.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/hosting.png' %}" class="img-responsive img-circle img-toggle" alt="">
<div class="team-member-caption inline-block"> <div class="team-member-caption inline-block">
<h4 class="portfolio-caption">{% trans "Hosting" %}</h4> <h4 class="portfolio-caption">{% trans "Hosting" %}</h4>
<p>&nbsp;</p> <p>&nbsp;</p>
<p><span class="text-muted">{% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}</span></p> <p><span class="text-muted">{% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}</span></p>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="team-member wow fadeInDown" data-wow-delay="1s"> <div class="team-member wow fadeInUp" data-wow-delay="0.5s">
<img src="{% static 'ungleich_page/img/team/4.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/configuration.png' %}" class="img-responsive img-circle img-toggle" alt=""> <img src="{% static 'ungleich_page/img/team/4.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/configuration.png' %}" class="img-responsive img-circle img-toggle" alt="">
<div class="team-member-caption inline-block"> <div class="team-member-caption inline-block">
<h4 class="portfolio-caption">{% trans "Configuration as a Service" %}</h4> <h4 class="portfolio-caption">{% trans "Configuration as a Service" %}</h4>
<p>&nbsp;</p> <p>&nbsp;</p>
<p><span class="text-muted">{% trans "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." %}</span></p> <p><span class="text-muted">{% trans "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." %}</span></p>
<p class="text-muted">&nbsp;</p>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="team-member wow fadeInDown" data-wow-delay="1.5s"> <div class="team-member wow fadeInUp" data-wow-delay="0.75s">
<img src="{% static 'ungleich_page/img/team/6.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/linux.png' %}" class="img-responsive img-circle img-toggle cursor-pointer" alt=""> <img src="{% static 'ungleich_page/img/team/6.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/linux.png' %}" class="img-responsive img-circle img-toggle cursor-pointer" alt="">
<h4 class="portfolio-caption">{% trans "Linux System Engineering" %}</h4>
<p class="text-muted">&nbsp;</p>
<div class="team-member-caption inline-block"> <div class="team-member-caption inline-block">
<p class="text-muted">{% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}</p> <h4 class="portfolio-caption">{% trans "Linux System Engineering" %}</h4>
<p>&nbsp;</p>
<p class="text-muted">{% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>

68
ungleich_page/templates/ungleich_page/includes/_team.html
View file

@ -3,29 +3,27 @@
<section id="team" class="bg-light-gray"> <section id="team" class="bg-light-gray">
<div class="container"> <div class="container">
<div class="row"> <div class="text-center wow fadeInDown">
<div class="col-sm-16 text-center center-block wow fadeInDown"> <h2 class="section-heading">{% trans "Why ungleich?*" %}</h2>
<h2 class="section-heading">{% trans "Why ungleich?*" %}</h2> <h3 class="text-muted">{% trans "What our customers say" %}</h3>
<h3 class="text-muted">{% trans "What our customers say" %}</h3> </div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-10 center-block wow fadeInDown"> <div class="col-sm-10 col-sm-offset-1 wow fadeInDown">
<!-- start:recommendationSlider --> <!-- start:recommendationSlider -->
<div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000"> <div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000">
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <ol class="carousel-indicators">
<li data-target="#carousel-recommendation-ungleich" data-slide-to="0" class="active"></li> <li data-target="#carousel-recommendation-ungleich" data-slide-to="0" class="active"></li>
<li data-target="#carousel-recommendation-ungleich" data-slide-to="1"></li> <li data-target="#carousel-recommendation-ungleich" data-slide-to="1"></li>
<li data-target="#carousel-recommendation-ungleich" data-slide-to="2"></li> <li data-target="#carousel-recommendation-ungleich" data-slide-to="2"></li>
</ol> </ol>
<!-- Wrapper for slides --> <!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item active"> <div class="item active">
<img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/teralytics.png' %}" /> <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/teralytics.png' %}" />
<p class="carousel-text text-muted text-center"> <p class="carousel-text text-muted text-center">
{% blocktrans %} {% blocktrans %}
"ungleich helped us getting started with our internal "ungleich helped us getting started with our internal
infrastructure, hosted on physical servers in a infrastructure, hosted on physical servers in a
@ -40,14 +38,14 @@
engineers to work more efficiently and comfortable engineers to work more efficiently and comfortable
than before." than before."
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p class="text-center"> <p class="text-center">
<strong>- Luciano Franceschina</strong>, CTO at Teralytics <strong>- Luciano Franceschina</strong>, CTO at Teralytics
</p> </p>
</div> </div>
<div class="item"> <div class="item">
<img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/panter.png' %}" /> <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/panter.png' %}" />
<p class="carousel-text text-muted text-center"> <p class="carousel-text text-muted text-center">
{% blocktrans %} {% blocktrans %}
"Thanks to ungleich team, who has designed and "Thanks to ungleich team, who has designed and
configured our company's Linux infrastructure, our configured our company's Linux infrastructure, our
@ -56,14 +54,14 @@
significantly not only in cost but also in time significantly not only in cost but also in time
saving, which is crucial for IT companies like ours." saving, which is crucial for IT companies like ours."
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p class="text-center"> <p class="text-center">
<strong> - Beat Seeliger </strong>, CTO at Panter AG <strong> - Beat Seeliger </strong>, CTO at Panter AG
</p> </p>
</div> </div>
<div class="item"> <div class="item">
<img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/logo_ruag.png' %}" /> <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/logo_ruag.png' %}" />
<p class="carousel-text text-muted text-center"> <p class="carousel-text text-muted text-center">
{% blocktrans %} {% blocktrans %}
"ungleich provided an excellent service in designing "ungleich provided an excellent service in designing
our system architecture and created secure and stable our system architecture and created secure and stable
@ -77,21 +75,21 @@
recommend them to any companies with high demand in recommend them to any companies with high demand in
solid infrastructures." solid infrastructures."
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p class="text-center"> <p class="text-center">
{% blocktrans %} {% blocktrans %}
<strong>- Sebastian Plattner,</strong> <strong>- Sebastian Plattner,</strong>
Teamleader Development Cyber Security Products at RUAG Teamleader Development Cyber Security Products at RUAG
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<!-- end:recommendationSlider --> <!-- end:recommendationSlider -->
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-16 text-center center-block"> <div class="text-center">
<h3 class="section-subheading text-muted">{% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}</h3> <h3 class="section-subheading text-muted">{% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}</h3>
</div> </div>
</section> </section>

63
ungleich_page/templates/ungleich_page/landing.html
View file

@ -1,6 +1,5 @@
{% load static %} {% load static i18n %}
{% load bootstrap3 %}
{% load i18n %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -13,10 +12,10 @@
<title>ungleich GmbH</title> <title>ungleich GmbH</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/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">
<link href="//fonts.googleapis.com/css?family=Raleway|Montserrat:400,700|Droid+Serif:400,700,400italic,700italic|Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
<!-- 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:// -->
@ -45,16 +44,15 @@
<!-- 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" <button type="button" class="navbar-toggle" data-toggle="collapse"
data-target="#bs-example-navbar-collapse-1"> data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</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>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<p><a class="navbar-brand page-scroll" href="#page-top"><img <a class="navbar-brand page-scroll" href="#page-top">
src="{% static 'ungleich_page/img/logo_white.svg' %}"></a></p> <img src="{% static 'ungleich_page/img/logo_white.svg' %}">
</a>
<p>&nbsp;</p>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
@ -64,13 +62,11 @@
<a href="#page-top"></a> <a href="#page-top"></a>
</li> </li>
<li> <li>
<a class="page-scroll" href="#services">{% trans "Services"%}</a></li> <a class="page-scroll" href="#services">{% trans "Services"%}</a>
<li></li> </li>
<li></li>
<li></li>
<li> <li>
<a class="page-scroll" href="#portfolio">{% trans "products"%}</a></li> <a class="page-scroll" href="#portfolio">{% trans "products"%}</a>
<li></li> </li>
<li> <li>
<a class="page-scroll" href="#about">{% trans "About"%}</a> <a class="page-scroll" href="#about">{% trans "About"%}</a>
</li> </li>
@ -78,7 +74,7 @@
<a class="page-scroll" href="#team">{% trans "WHY UNGLEICH?"%}</a> <a class="page-scroll" href="#team">{% trans "WHY UNGLEICH?"%}</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="http://blog.ungleich.ch">{% trans "BLOG"%}</a> <a class="page-scroll" href="https://blog.ungleich.ch">{% trans "BLOG"%}</a>
</li> </li>
<li> <li>
<a class="page-scroll" href="#contact">{% trans "CONTACT"%} </a> <a class="page-scroll" href="#contact">{% trans "CONTACT"%} </a>
@ -114,19 +110,6 @@
<!-- Footer --> <!-- Footer -->
{% include "ungleich_page/includes/_footer.html" %} {% include "ungleich_page/includes/_footer.html" %}
<!-- Portfolio Modals -->
<!-- Use the modals below to showcase details about your portfolio projects! -->
<!-- Portfolio Modal 1 -->
<!-- Portfolio Modal 2 -->
<!-- Portfolio Modal 3 -->
<!-- Portfolio Modal 4 -->
<!-- Portfolio Modal 6 -->
<!-- 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"> <script type="text/javascript">
@ -138,32 +121,22 @@
</script> </script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="{% static 'ungleich_page/js/bootstrap.min.js' %}" type="text/javascript"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/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" <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script>
type="text/javascript"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/classie/1.0.1/classie.min.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> -->
<script src="{% static 'ungleich_page/js/lib/wow.min.js' %}" type="text/javascript"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js" type="text/javascript"></script>
<!-- Custom Theme JavaScript --> <!-- Custom Theme JavaScript -->
<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="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.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"
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=Kaushan+Script" 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">
</body> </body>
</html> </html>

2
utils/locale/de/LC_MESSAGES/django.po
View file

@ -736,7 +736,7 @@ msgid "Unknown or unspecified country"
msgstr "" msgstr ""
msgid "Enter your name or company name" msgid "Enter your name or company name"
msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein"
msgid "Your username and/or password were incorrect." msgid "Your username and/or password were incorrect."
msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch."