diff --git a/Changelog b/Changelog index b85dd4ff..c366dde2 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,14 @@ -Next: +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) 2.4.1: 2018-10-18 * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674) 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 @@ + + + + + + + + + + + + + + + + + + + + + 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 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 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 @@
  • - + 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 @@ - - - + + 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" %}