From 0ac2d1ff3f75a64dc543c5bb9ecbe1f80aa93f78 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 23 Dec 2018 14:31:55 +0100 Subject: [PATCH 01/11] Update djangcocms-blog version (0.7.0 -> 0.9.0) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a14617a9..fe70299b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ django-templatetag-sugar==1.0 django-treebeard==4.0.1 djangocms-admin-style==1.1.1 djangocms-apphook-setup==0.1.2 -djangocms-blog==0.7.0 +djangocms-blog==0.9.0 djangocms-file==1.0 djangocms-flash==0.3.0 djangocms-googlemap==0.4.0 From c6d6def06a430ff552bae2133fc55081f230636f Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 23 Dec 2018 17:15:02 +0100 Subject: [PATCH 02/11] Update Changelog for 2.4.2 --- Changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index b85dd4ff..30222e00 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,6 @@ -Next: +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) 2.4.1: 2018-10-18 * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674) From c7acb59f0d1cd293e7866a3a171725a74efe621d Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 25 Dec 2018 13:44:52 +0100 Subject: [PATCH 03/11] Add viewport and other missing meta tags --- ungleich/templates/cms/ungleichch/base_ungleich.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html index ba314b25..664ea2ec 100644 --- a/ungleich/templates/cms/ungleichch/base_ungleich.html +++ b/ungleich/templates/cms/ungleichch/base_ungleich.html @@ -2,6 +2,11 @@ + + + + + {% block title %} {% page_attribute "page_title" %} From 260aba5a1351ea75616f99705de1fb371a3d1dad Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Tue, 25 Dec 2018 13:58:41 +0100 Subject: [PATCH 04/11] Update Changelog for 2.4.3 --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 30222e00..dce42fc4 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +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) From f2f549a4989e2d61a2970b3f6015b35d660fde52 Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Wed, 2 Jan 2019 20:19:38 +0100 Subject: [PATCH 05/11] [blog] Create blog config for ungleich.ch and change RSS URL accordingly --- Changelog | 2 ++ ungleich/templates/cms/ungleichch/_footer.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index dce42fc4..ba02675c 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +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 diff --git a/ungleich/templates/cms/ungleichch/_footer.html b/ungleich/templates/cms/ungleichch/_footer.html index 21c96b54..41bc95dc 100644 --- a/ungleich/templates/cms/ungleichch/_footer.html +++ b/ungleich/templates/cms/ungleichch/_footer.html @@ -31,7 +31,7 @@ </a> </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"> <i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i> From 087e03315d12d3dd7f6e454c6c56d0fd8a3006a9 Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Thu, 3 Jan 2019 08:14:50 +0100 Subject: [PATCH 06/11] Use correct blog config for RSS url ungleich-blog -> blog app created for ungleich.ch blog -> blog app created for blog.ungleich.ch --- ungleich/templates/cms/ungleichch/_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich/templates/cms/ungleichch/_footer.html b/ungleich/templates/cms/ungleichch/_footer.html index 41bc95dc..b7ff2d1c 100644 --- a/ungleich/templates/cms/ungleichch/_footer.html +++ b/ungleich/templates/cms/ungleichch/_footer.html @@ -31,7 +31,7 @@ </a> </li> <li> - <a href="https://ungleich.ch/en-us/cms/blog/feed/"> + <a href="https://ungleich.ch/en-us/cms/ungleich-blog/feed/"> <span class="fa-stack fa-lg"> <i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i> From d80b6cf490c935fe2edda6dac562843ab5e44cbd Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Mon, 7 Jan 2019 22:30:52 +0100 Subject: [PATCH 07/11] Introduce UNGLEICH_BLOG_SITE_ID - It should be initialized with the SITE_ID of the site that hosts the blog - Without this, django_parler is unhappy to show EN/DE options when creating blog articles See redmine issue #4465 --- dynamicweb/settings/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 7d62ceb5..23e17bca 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -56,7 +56,9 @@ dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR)) 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 = "/" APPEND_SLASH = True From 27f58e4296c376408165e974a0062ba5c0856626 Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Mon, 7 Jan 2019 22:33:03 +0100 Subject: [PATCH 08/11] Revert back blog feed url --- ungleich/templates/cms/ungleichch/_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich/templates/cms/ungleichch/_footer.html b/ungleich/templates/cms/ungleichch/_footer.html index b7ff2d1c..41bc95dc 100644 --- a/ungleich/templates/cms/ungleichch/_footer.html +++ b/ungleich/templates/cms/ungleichch/_footer.html @@ -31,7 +31,7 @@ </a> </li> <li> - <a href="https://ungleich.ch/en-us/cms/ungleich-blog/feed/"> + <a href="https://ungleich.ch/en-us/cms/blog/feed/"> <span class="fa-stack fa-lg"> <i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i> From 6cd1e53ea2e9c77a7e35728dde89e1c09a635dd7 Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Mon, 7 Jan 2019 22:42:44 +0100 Subject: [PATCH 09/11] Update Changelog for 2.4.5 --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index ba02675c..0bf1ae11 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +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 From b027093efdc356a9fef009e4822324e3f2d871fe Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Wed, 9 Jan 2019 21:31:39 +0100 Subject: [PATCH 10/11] Add mobile black logo --- .../blog.ungleich.ch/css/clean-blog.css | 20 ++++++++ .../blog.ungleich.ch/img/logo_black.svg | 50 +++++++++++++++++++ ungleich/templates/cms/ungleichch/_menu.html | 5 +- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 digitalglarus/static/blog.ungleich.ch/img/logo_black.svg diff --git a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css index 66e4c54d..c0c5f38a 100755 --- a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css +++ b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css @@ -402,4 +402,24 @@ body { .blog-content img { width: 100%; +} + +#logoBlack { + display: none; +} +#logoWhite { + display: block; +} +@media (max-width: 767px) { + #logoBlack { + display: block; + } + + #logoWhite { + display: none; + } +} + +.custom-black-logo { + padding: 8px 15px; } \ No newline at end of file diff --git a/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg b/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg new file mode 100644 index 00000000..2035ab8b --- /dev/null +++ b/digitalglarus/static/blog.ungleich.ch/img/logo_black.svg @@ -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> diff --git a/ungleich/templates/cms/ungleichch/_menu.html b/ungleich/templates/cms/ungleichch/_menu.html index 6ccb043b..ea217351 100644 --- a/ungleich/templates/cms/ungleichch/_menu.html +++ b/ungleich/templates/cms/ungleichch/_menu.html @@ -10,9 +10,8 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="https://www.ungleich.ch"> - <img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" /> - </a> + <a href="/" id="logoBlack" class="navbar-brand custom-black-logo"><img src="{% static "blog.ungleich.ch/img/logo_black.svg" %}"></a> + <a href="/" id="logoWhite" class="navbar-brand"><img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}"></a> </div> <!-- Collect the nav links, forms, and other content for toggling --> From ef0e3b76fadd785f97b5ab15fbf64bc5685a51a4 Mon Sep 17 00:00:00 2001 From: PCoder <purple.coder@yahoo.co.uk> Date: Wed, 9 Jan 2019 22:32:15 +0100 Subject: [PATCH 11/11] Update Changelog for 2.4.6 --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 0bf1ae11..c366dde2 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +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