ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'master' into 5151/gdpr_modal

Browse source
This commit is contained in:
PCoder 2019-01-30 21:05:34 +01:00
commit 16b5f1e5a4
12 changed files with 131 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Changelog
View file

@ -1,4 +1,16 @@
Next: 2.4.7: 2019-01-30
* #6213: [cms] Make ungleich product items equal heights and add option to animate or not animate the contents (MR!682 by Aatish)
2.4.6: 2019-01-09
* #6261: Add ungleich black logo to blog template for mobile view (MR!685)
2.4.5: 2019-01-07
* bugfix: [blog] Fix DE language option not being shown in the blog (MR!684) and revert back the RSS URL to the old one
2.4.4: 2019-01-02
* bugfix: [blog] Create blog config for ungleich.ch and change RSS URL accordingly
2.4.3: 2018-12-24
* #6260: Add viewport and other missing meta tags (MR!683)
2.4.2: 2018-12-23
* Update djangcocms-blog version (0.7.0 -> 0.9.0)
* #6038: Change datacenterlight.ch message form to send email to support@ungleich.ch (MR!679)
* bugfix: Use correct version of django-multisite (MR #676) * bugfix: Use correct version of django-multisite (MR #676)
2.4.1: 2018-10-18 2.4.1: 2018-10-18
* bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674) * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674)

2
datacenterlight/views.py
View file

@ -64,7 +64,7 @@ class ContactUsView(FormView):
sender=form.cleaned_data.get('email') sender=form.cleaned_data.get('email')
), ),
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': [from_emails.get(from_page, 'info@ungleich.ch')], 'to': [from_emails.get(from_page, 'support@ungleich.ch')],
'body': "\n".join( 'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
'reply_to': [form.cleaned_data.get('email')], 'reply_to': [form.cleaned_data.get('email')],

20
digitalglarus/static/blog.ungleich.ch/css/clean-blog.css
View file

@ -402,4 +402,24 @@ body {
.blog-content img { .blog-content img {
width: 100%; width: 100%;
}
#logoBlack {
display: none;
}
#logoWhite {
display: block;
}
@media (max-width: 767px) {
#logoBlack {
display: block;
}
#logoWhite {
display: none;
}
}
.custom-black-logo {
padding: 8px 15px;
} }

50
digitalglarus/static/blog.ungleich.ch/img/logo_black.svg Normal file
View file

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="130px" height="40px" viewBox="0 0 130 40" enable-background="new 0 0 130 40" xml:space="preserve">
<g>
<path d="M36.4,29.9c0-0.5,0.2-1,0.5-1.5c0.4-0.5,0.9-0.9,1.6-1.3V27c-0.4-0.2-0.7-0.5-0.9-0.8c-0.3-0.3-0.4-0.8-0.4-1.3
c0-0.4,0.1-0.9,0.4-1.3c0.3-0.4,0.7-0.8,1.2-1.2v-0.1c-0.5-0.3-0.9-0.8-1.2-1.4c-0.3-0.6-0.5-1.2-0.5-2c0-0.7,0.1-1.4,0.4-2
c0.3-0.6,0.7-1.1,1.1-1.5c0.5-0.4,1-0.7,1.7-0.9c0.6-0.2,1.3-0.3,2-0.3c0.7,0,1.4,0.1,2,0.3h5.3v2h-3.2c0.3,0.3,0.5,0.6,0.7,1.1
c0.2,0.4,0.3,0.9,0.3,1.4c0,0.7-0.1,1.3-0.4,1.9c-0.3,0.6-0.6,1-1.1,1.4c-0.5,0.4-1,0.7-1.6,0.9c-0.6,0.2-1.3,0.3-2,0.3
c-0.3,0-0.7,0-1-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6,0.4-0.9,0.8-0.9,1.4c0,0.5,0.2,0.8,0.7,1c0.4,0.2,1.1,0.3,1.9,0.3h2.8
c1.7,0,3,0.2,3.8,0.7c0.8,0.5,1.2,1.3,1.2,2.4c0,0.6-0.2,1.2-0.5,1.8c-0.3,0.6-0.8,1-1.5,1.4c-0.6,0.4-1.4,0.7-2.3,1
c-0.9,0.2-1.9,0.4-3,0.4c-1.8,0-3.3-0.3-4.4-0.9C36.9,31.9,36.4,31.1,36.4,29.9z M38.6,29.6c0,0.6,0.3,1.1,1,1.5
c0.7,0.4,1.7,0.6,3,0.6c0.7,0,1.3-0.1,1.9-0.2c0.6-0.1,1-0.3,1.4-0.5s0.7-0.5,0.9-0.8c0.2-0.3,0.3-0.6,0.3-0.9
c0-0.6-0.2-0.9-0.7-1.1c-0.5-0.2-1.2-0.3-2.1-0.3H42c-0.4,0-0.8,0-1.1,0c-0.3,0-0.6-0.1-0.9-0.2c-0.5,0.3-0.9,0.6-1.1,0.9
C38.7,28.9,38.6,29.2,38.6,29.6z M42.3,21.7c0.7,0,1.4-0.2,1.9-0.7c0.5-0.5,0.8-1.2,0.8-2.1c0-0.9-0.3-1.5-0.8-2.1
c-0.5-0.5-1.2-0.8-1.9-0.8s-1.4,0.3-1.9,0.8c-0.5,0.5-0.8,1.2-0.8,2.1c0,0.9,0.3,1.6,0.8,2.1C40.9,21.5,41.5,21.7,42.3,21.7z"/>
</g>
<path d="M16.4,27.9h-2.2l-0.2-2.2h-0.1c-0.7,0.8-1.4,1.4-2.2,1.9C10.9,28,10,28.3,9,28.3c-1.6,0-2.8-0.5-3.5-1.4
c-0.7-0.9-1.1-2.3-1.1-4.1V16L0.8,16l6.3-2.4l0,1.8v7.1c0,1.2,0.2,2.1,0.6,2.6c0.4,0.6,1.1,0.8,2.2,0.8c0.7,0,1.3-0.2,1.9-0.5
c0.6-0.3,1.2-0.9,1.9-1.7v-9.2h2.7L16.4,27.9L16.4,27.9z"/>
<path d="M20.9,14.5h2.2l0.2,2.2h0.1c0.7-0.7,1.4-1.3,2.2-1.8c0.8-0.5,1.7-0.7,2.8-0.7c1.6,0,2.7,0.5,3.5,1.4
c0.7,0.9,1.1,2.3,1.1,4.1v8.3h-2.7v-8c0-1.2-0.2-2-0.6-2.6c-0.4-0.6-1.1-0.8-2.2-0.8c-0.7,0-1.4,0.2-1.9,0.5
c-0.6,0.4-1.2,0.9-1.9,1.6v9.3h-2.7L20.9,14.5L20.9,14.5z"/>
<path d="M63.4,21.2c0-1.1,0.2-2.1,0.6-3c0.4-0.9,0.9-1.6,1.5-2.2c0.6-0.6,1.4-1.1,2.2-1.4c0.8-0.3,1.7-0.5,2.6-0.5
c1,0,1.9,0.2,2.6,0.5c0.8,0.3,1.4,0.7,1.9,1.3c0.5,0.6,0.9,1.2,1.2,2c0.3,0.8,0.4,1.6,0.4,2.6c0,0.3,0,0.5,0,0.8
c0,0.2-0.1,0.5-0.1,0.6H66.2c0.1,1.3,0.6,2.4,1.5,3.1c0.9,0.7,2,1.1,3.4,1.1c0.7,0,1.4-0.1,2.1-0.3s1.3-0.5,1.9-0.9l1,1.7
c-0.7,0.4-1.5,0.8-2.4,1.1c-0.9,0.3-1.8,0.5-2.9,0.5c-1,0-2-0.2-2.8-0.5s-1.7-0.8-2.3-1.4c-0.7-0.6-1.2-1.3-1.6-2.2
C63.6,23.3,63.4,22.3,63.4,21.2z M74,20c0-1.2-0.3-2.1-0.9-2.8s-1.5-1-2.7-1c-1,0-1.9,0.3-2.7,1c-0.8,0.6-1.3,1.6-1.5,2.8H74z"/>
<path d="M85.5,14l0,14.2h-2.7V17.9h-5.1L85.5,14z M83.9,11.3c-0.6,0-1.1-0.2-1.5-0.5c-0.4-0.4-0.6-0.8-0.6-1.4s0.2-1.1,0.6-1.4
c0.4-0.4,0.9-0.5,1.5-0.5c0.6,0,1.1,0.2,1.5,0.5c0.4,0.4,0.6,0.8,0.6,1.4c0,0.6-0.2,1.1-0.6,1.4C85,11.1,84.5,11.3,83.9,11.3z"/>
<path d="M89.3,21.5c0-1.1,0.2-2.1,0.6-3c0.4-0.9,1-1.6,1.7-2.2c0.7-0.6,1.5-1.1,2.4-1.4c0.9-0.3,1.9-0.5,2.9-0.5
c1.1,0,2.1,0.2,2.9,0.6c0.8,0.4,1.5,0.8,2.1,1.4l-1.3,1.7c-0.5-0.4-1.1-0.8-1.7-1c-0.6-0.2-1.2-0.4-1.8-0.4c-0.7,0-1.4,0.1-2,0.3
c-0.6,0.2-1.1,0.6-1.6,1c-0.4,0.4-0.8,0.9-1,1.5c-0.2,0.6-0.4,1.3-0.4,2c0,0.7,0.1,1.4,0.3,2c0.2,0.6,0.6,1.1,1,1.5
c0.4,0.4,0.9,0.7,1.5,1c0.6,0.2,1.2,0.3,2,0.3c0.8,0,1.6-0.2,2.2-0.5c0.7-0.3,1.3-0.7,1.8-1.1l1.2,1.8c-0.8,0.7-1.6,1.2-2.5,1.5
c-0.9,0.4-1.9,0.5-2.9,0.5c-1,0-2-0.2-2.9-0.5c-0.9-0.3-1.7-0.8-2.4-1.4c-0.7-0.6-1.2-1.3-1.6-2.2C89.5,23.6,89.3,22.6,89.3,21.5z"
/>
<path d="M102.2,8.8l5.7-2.8v7.9l-0.2,3c0.7-0.7,1.4-1.3,2.2-1.8c0.8-0.5,1.7-0.7,2.8-0.7c1.6,0,2.7,0.5,3.5,1.4
c0.7,0.9,1.1,2.3,1.1,4v8.3h-2.7v-8c0-1.2-0.2-2-0.6-2.6c-0.4-0.6-1.1-0.8-2.2-0.8c-0.7,0-1.4,0.2-1.9,0.5c-0.6,0.4-1.2,0.9-1.9,1.6
v9.3h-2.7l-0.1-19.6L102.2,8.8z"/>
<g>
<polygon points="117.8,2.7 116.9,4.6 128.3,4.6 129.2,2.7 "/>
<polygon points="116.9,6.9 115.9,8.9 127.4,8.9 128.3,6.9 "/>
<polygon points="119.1,11.2 124.4,0 126.4,0 121.2,11.2 "/>
</g>
<g>
<path d="M56.6,23.6c0,0.9,0.2,1.6,0.7,2c0.5,0.4,1,0.6,1.8,0.6c0.4,0,0.7,0,1.1-0.1c0.4-0.1,0.8-0.2,1.2-0.4l0.6,2
c-0.3,0.1-0.6,0.2-0.9,0.3c-0.3,0.1-0.6,0.2-0.8,0.2c-0.3,0.1-0.6,0.1-0.9,0.2c-0.3,0-0.7,0.1-1,0.1c-1.5,0-2.6-0.4-3.3-1.3
c-0.8-0.8-1.1-2-1.1-3.6V5.7h-4.3l6.9-4.9"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

4
dynamicweb/settings/base.py
View file

@ -56,7 +56,9 @@ dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR))
from multisite import SiteID from multisite import SiteID
SITE_ID = SiteID(default=1) UNGLEICH_BLOG_SITE_ID = int_env("UNGLEICH_BLOG_SITE_ID")
SITE_ID = SiteID(default=(UNGLEICH_BLOG_SITE_ID if
UNGLEICH_BLOG_SITE_ID > 0 else 1))
APP_ROOT_ENDPOINT = "/" APP_ROOT_ENDPOINT = "/"
APPEND_SLASH = True APPEND_SLASH = True

2
requirements.txt
View file

@ -50,7 +50,7 @@ django-templatetag-sugar==1.0
django-treebeard==4.0.1 django-treebeard==4.0.1
djangocms-admin-style==1.1.1 djangocms-admin-style==1.1.1
djangocms-apphook-setup==0.1.2 djangocms-apphook-setup==0.1.2
djangocms-blog==0.7.0 djangocms-blog==0.9.0
djangocms-file==1.0 djangocms-file==1.0
djangocms-flash==0.3.0 djangocms-flash==0.3.0
djangocms-googlemap==0.4.0 djangocms-googlemap==0.4.0

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

@ -31,7 +31,7 @@
</a> </a>
</li> </li>
<li> <li>
<a href="https://blog.ungleich.ch/en-us/cms/blog/feed/"> <a href="https://ungleich.ch/en-us/cms/blog/feed/">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i>

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

@ -10,9 +10,8 @@
<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="https://www.ungleich.ch"> <a href="/" id="logoBlack" class="navbar-brand custom-black-logo"><img src="{% static "blog.ungleich.ch/img/logo_black.svg" %}"></a>
<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" /> <a href="/" id="logoWhite" class="navbar-brand"><img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}"></a>
</a>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->

5
ungleich/templates/cms/ungleichch/base_ungleich.html
View file

@ -2,6 +2,11 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Affordable VM hosting in Glarus, Switzerland, operated by 100% hydropower. Devuan, debian, freebsd, ubuntu, centos. Our tech stack is fully open source.">
<meta name="author" content="ungleich glarus ag">
<title> <title>
{% block title %} {% block title %}
{% page_attribute "page_title" %} {% page_attribute "page_title" %}

20
ungleich_page/migrations/0021_ungleichproduct_animate.py Normal file
View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2018-12-09 15:06
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('ungleich_page', '0020_auto_20180320_0216'),
]
operations = [
migrations.AddField(
model_name='ungleichproduct',
name='animate',
field=models.BooleanField(default=True),
),
]

1
ungleich_page/models.py
View file

@ -144,6 +144,7 @@ class UngleichProductItem(ServiceItem):
class UngleichProduct(Service): class UngleichProduct(Service):
section_class = models.CharField(max_length=100, default="", blank=True) section_class = models.CharField(max_length=100, default="", blank=True)
animate = models.BooleanField(default=True)
class UngleichCustomer(Service): class UngleichCustomer(Service):

15
ungleich_page/templates/ungleich_page/ungleich/section_products.html
View file

@ -8,7 +8,7 @@
</div> </div>
<div class="row"> <div class="row">
{% for plugin in product_instance.child_plugin_instances %} {% for plugin in product_instance.child_plugin_instances %}
<div class="col-md-4 col-sm-6 portfolio-item wow fadeInUp" data-wow-delay="{{ forloop.counter|multiply:0.25 }}s" style="visibility: visible; animation-delay: {{ forloop.counter|multiply:0.25 }}s; animation-name: fadeInUp;"> <div class="col-md-4 col-sm-6 portfolio-item sameheight-{{product_instance.pk}} {% if product_instance.animate %}wow fadeInUp{%endif%}" data-wow-delay="{{ forloop.counter|multiply:0.25 }}s" style="visibility: visible; animation-delay: {{ forloop.counter|multiply:0.25 }}s; animation-name: fadeInUp;">
{% render_plugin plugin %} {% render_plugin plugin %}
</div> </div>
{% endfor %} {% endfor %}
@ -16,3 +16,16 @@
</div> </div>
</div> </div>
</section> </section>
<script>
$( document ).ready(function() {
var equalizer = ".sameheight-{{product_instance.pk}}"
var heights = $(equalizer).map(function() {
return $(this).height();
}).get(),
maxHeight = Math.max.apply(null, heights);
$(equalizer).height(maxHeight);
});
</script>