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

Merge branch 'master' into task/3530/upgrade_to_django_1.11

Browse source
This commit is contained in:
PCoder 2018-01-20 01:36:18 +01:00
commit 34383c85e0
9 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -1,3 +1,7 @@
1.3.2: 2018-01-16
* #4000: [all] Replace all ungleich.com with ungleich.ch
* #4067: [ungleich] mobile navbar toggle fix
* #4103: [dcl] Add "Terms of Service" item to the footer
1.3.1: 2017-12-31
* feature: [all] Load email configurations host, port and use_tls from env
* bugfix: [all] Use ungleich's smtp as relayhost for sending emails

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

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-12-22 01:00+0530\n"
"POT-Creation-Date: 2018-01-15 23:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -199,6 +199,9 @@ msgstr "VM bestellen"
msgid "Contact"
msgstr "Kontakt"
msgid "Terms of Service"
msgstr "Nutzungsbedingungen"
msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten"

6
datacenterlight/templates/datacenterlight/includes/_footer.html
View file

@ -32,6 +32,12 @@
<li>
<a class="url-init" href="{% url 'datacenterlight:index' %}#contact">{% trans "Contact" %}</a>
</li>
{% if request.resolver_match.url_name != "index" %}
<li class="footer-menu-divider">&sdot;</li>
{% endif %}
<li>
<a class="url-init" href="/cms/terms-of-service">{% trans "Terms of Service" %}</a>
</li>
</ul>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>

2
digitalglarus/test_views.py
View file

@ -224,7 +224,7 @@ class SignupViewTest(TestCase):
self.view = SignupView
self.signup_data = {
'name': 'ungleich',
'email': 'test@ungleich.com',
'email': 'test@ungleich.ch',
'password': 'fake_password',
'confirm_password': 'fake_password',
}

2
hosting/test_forms.py
View file

@ -30,7 +30,7 @@ class HostingUserSignupFormTest(TestCase):
def setUp(self):
self.completed_data = {
'name': 'test name',
'email': 'test@ungleich.com',
'email': 'test@ungleich.ch',
'password': 'test_password',
'confirm_password': 'test_password'
}

2
hosting/test_views.py
View file

@ -505,7 +505,7 @@ class SignupViewTest(TestCase):
self.view = SignupView
self.signup_data = {
'name': 'ungleich',
'email': 'test@ungleich.com',
'email': 'test@ungleich.ch',
'password': 'fake_password',
'confirm_password': 'fake_password',
}

2
nosystemd/templates/nosystemd/landing.html
View file

@ -96,7 +96,7 @@
</div>
<div class="col-lg-4 text-center">
<i class="fa fa-envelope-o fa-3x sr-contact"></i>
<p><a href="mailto:your-email@your-domain.com">info@ungleich.com</a></p>
<p><a href="mailto:your-email@your-domain.com">info@ungleich.ch</a></p>
</div>
</div>
</div>

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

@ -15,3 +15,30 @@ function toggleImage(e) {
$this.fadeIn(300);
});
};
/*!
* Start Bootstrap - Agnecy Bootstrap Theme (http://startbootstrap.com)
* Code licensed under the Apache License v2.0.
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/
// jQuery for page scrolling feature - requires jQuery Easing plugin
$(function() {
$('a.page-scroll').bind('click', function(event) {
var $anchor = $(this);
$('html, body').stop().animate({
scrollTop: $($anchor.attr('href')).offset().top
}, 1500, 'easeInOutExpo');
event.preventDefault();
});
});
// Highlight the top nav as scrolling occurs
$('body').scrollspy({
target: '.navbar-fixed-top'
})
// Closes the Responsive Menu on Menu Item Click
$('.navbar-collapse ul li a').click(function() {
$('.navbar-toggle:visible').click();
});

2
utils/mailer.py
View file

@ -25,7 +25,7 @@ class BaseEmail(object):
self.email.from_email = kwargs.get('from_address')
else:
self.email.from_email = '(ungleich) ungleich Support <info@ungleich.ch>'
self.email.to = [kwargs.get('to', 'info@ungleich.com')]
self.email.to = [kwargs.get('to', 'info@ungleich.ch')]
def send(self):
self.email.send()