From 8f6bae6bd61034ba7faabb06ae6be16ab3a210d5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 28 Mar 2018 08:53:49 +0200
Subject: [PATCH 01/11] Remove conflicting cms/ urlconf

---
 dynamicweb/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 884c95b4..6d4f838a 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -56,7 +56,7 @@ urlpatterns += i18n_patterns(
     url(
         r'^blog/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',
         RedirectView.as_view(pattern_name='ungleich:post-detail')),
-    url(r'^blog/|cms/$', RedirectView.as_view(
+    url(r'^blog/$', RedirectView.as_view(
         url=reverse_lazy('ungleich:post-list')), name='blog_list_view'),
     url(r'^cms/', include('cms.urls')),
 )

From 41d073da3b43d9d93a0101f1f86811befb96f32e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 28 Mar 2018 08:53:49 +0200
Subject: [PATCH 02/11] Remove conflicting cms/ urlconf

---
 dynamicweb/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 884c95b4..6d4f838a 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -56,7 +56,7 @@ urlpatterns += i18n_patterns(
     url(
         r'^blog/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',
         RedirectView.as_view(pattern_name='ungleich:post-detail')),
-    url(r'^blog/|cms/$', RedirectView.as_view(
+    url(r'^blog/$', RedirectView.as_view(
         url=reverse_lazy('ungleich:post-list')), name='blog_list_view'),
     url(r'^cms/', include('cms.urls')),
 )

From e0df641dbdefc9cb12702fb9b6b381b4601c77d1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 3 Apr 2018 22:50:00 +0200
Subject: [PATCH 03/11] Merge master into task/4362/fix_need_of_cms_dummy_page

---
 Changelog                                     |  5 ++--
 .../datacenterlight/includes/_footer.html     | 29 ++-----------------
 dynamicweb/urls.py                            | 21 +++++++++-----
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/Changelog b/Changelog
index b2492674..899849ff 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
-Next:
-    * bugfix: [dcl] Fix user activation email style; add/correct some DE text
+1.6.2: 2018-04-01:
+    * bgfix: [dcl] Fix user activation email style; add/correct some DE text
+    * #4373: [dcl] update footer menu for pw reset/login/signup/activation request pages
 1.6.1: 2018-03-28
     * bgfix: fix header slider interval issue
     * #4315: [cms] navbar consistency from cms page to static page
diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html
index 8643deda..7d27eaef 100644
--- a/datacenterlight/templates/datacenterlight/includes/_footer.html
+++ b/datacenterlight/templates/datacenterlight/includes/_footer.html
@@ -3,37 +3,14 @@
 <footer>
     <div class="container">
         <ul class="list-inline">
-            {% if request.resolver_match.url_name != "index" %}
-                <li>
-                   <a href="{% url 'datacenterlight:index' %}">{% trans "Home" %}</a>
-                </li>
-                <li class="footer-menu-divider">&sdot;</li>
-            {% endif %}
             <li>
-                <a class="url-init" href="{% url 'datacenterlight:index' %}#how">{% trans "Highlights" %}</a>
+               <a class="url-init" href="{% url 'datacenterlight:index' %}">{% trans "Home" %}</a>
             </li>
-            <li>
-                <a class="url-init" href="{% url 'datacenterlight:index' %}#your">{% trans "Scale out" %}</a>
-            </li>
-           <li>
-                <a class="url-init" href="{% url 'datacenterlight:index' %}#our">{% trans "Reliable and light" %}</a>
-            </li>
-            {% if request.resolver_match.url_name != "index" %}
-                <li>
-                    <a class="url-init" href="{% url 'datacenterlight:index' %}#price">{% trans "Pricing" %}</a>
-                </li>
-                <li class="footer-menu-divider">&sdot;</li>
-            {% else %}
-                <li>
-                    <a class="url-init" href="{% url 'datacenterlight:index' %}#price">{% trans "Order VM" %}</a>
-                </li>
-            {% endif %}
+            <li class="footer-menu-divider">&sdot;</li>
             <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 class="footer-menu-divider">&sdot;</li>
             <li>
                 <a class="url-init" href="/cms/terms-of-service">{% trans "Terms of Service" %}</a>
             </li>
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 6d4f838a..1a7821af 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -1,5 +1,7 @@
+from cms.models.pagemodel import Page
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.contrib.sites.models import Site
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from django.views import i18n, static as static_view
@@ -35,8 +37,11 @@ urlpatterns += i18n_patterns(
 )
 
 # note the django CMS URLs included via i18n_patterns
+REDIRECT_TO_CMS = False
+if Page.objects.filter(site_id=Site.objects.get_current().id).count():
+    REDIRECT_TO_CMS = True
+
 urlpatterns += i18n_patterns(
-    url(r'^$', LandingView.as_view()),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^datacenterlight/',
         include('datacenterlight.urls', namespace="datacenterlight")),
@@ -46,19 +51,19 @@ urlpatterns += i18n_patterns(
     url(r'^membership/', include(membership_urls)),
     url(r'^digitalglarus/', include('digitalglarus.urls',
                                     namespace="digitalglarus")),
-    # url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
-    url(r'^',
-        include('ungleich_page.urls',
-                namespace='ungleich_page'),
-        name='ungleich_page'),
     url(r'^cms/blog/',
         include('ungleich.urls', namespace='ungleich')),
     url(
         r'^blog/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',
         RedirectView.as_view(pattern_name='ungleich:post-detail')),
     url(r'^blog/$', RedirectView.as_view(
-        url=reverse_lazy('ungleich:post-list')), name='blog_list_view'),
-    url(r'^cms/', include('cms.urls')),
+                url=reverse_lazy('ungleich:post-list')
+            ), name='blog_list_view'
+        ),
+    url(r'^cms/', include('cms.urls'), name="cms"),
+    url(r'^$', RedirectView.as_view(url=reverse_lazy('dynamicweb:cms'))
+            if REDIRECT_TO_CMS else LandingView.as_view()
+        ),
 )
 
 urlpatterns += [

From 0ec29be4ecb5240fd3b53f115cb31d4375ec456b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 3 Apr 2018 23:28:47 +0200
Subject: [PATCH 04/11] Use /cms for redirection instead of incorrect
 namespaces

---
 dynamicweb/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 1a7821af..0d676ed3 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -61,8 +61,8 @@ urlpatterns += i18n_patterns(
             ), name='blog_list_view'
         ),
     url(r'^cms/', include('cms.urls'), name="cms"),
-    url(r'^$', RedirectView.as_view(url=reverse_lazy('dynamicweb:cms'))
-            if REDIRECT_TO_CMS else LandingView.as_view()
+    url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
+        else LandingView.as_view()
         ),
 )
 

From 9b45b758c49b78cdc6bbb540e82cbb9416c32907 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 4 Apr 2018 00:34:29 +0200
Subject: [PATCH 05/11] Add ungleich_page urlconf namespace again

---
 dynamicweb/urls.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 0d676ed3..1a46ab5b 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -51,6 +51,10 @@ urlpatterns += i18n_patterns(
     url(r'^membership/', include(membership_urls)),
     url(r'^digitalglarus/', include('digitalglarus.urls',
                                     namespace="digitalglarus")),
+    url(r'^',
+        include('ungleich_page.urls',
+                namespace='ungleich_page'),
+        name='ungleich_page'),
     url(r'^cms/blog/',
         include('ungleich.urls', namespace='ungleich')),
     url(

From ae4a83bdb8a386fa0f6368d2f79ce97cb1374685 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 4 Apr 2018 00:35:12 +0200
Subject: [PATCH 06/11] Remove name for cms.urls

---
 dynamicweb/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 1a46ab5b..ffb8abbc 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -64,7 +64,7 @@ urlpatterns += i18n_patterns(
                 url=reverse_lazy('ungleich:post-list')
             ), name='blog_list_view'
         ),
-    url(r'^cms/', include('cms.urls'), name="cms"),
+    url(r'^cms/', include('cms.urls')),
     url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
         else LandingView.as_view()
         ),

From 035f5c39ae8b137a12a61355e2a693cdd0af1506 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 4 Apr 2018 00:35:25 +0200
Subject: [PATCH 07/11] Format code

---
 dynamicweb/urls.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index ffb8abbc..e18f3e44 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -66,8 +66,7 @@ urlpatterns += i18n_patterns(
         ),
     url(r'^cms/', include('cms.urls')),
     url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
-        else LandingView.as_view()
-        ),
+        else LandingView.as_view()),
 )
 
 urlpatterns += [

From 1aa8319feb3ba26a41ca5595b7a42cef0f1a5a29 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 4 Apr 2018 01:05:05 +0200
Subject: [PATCH 08/11] Change order of ungleich_page namespace

---
 dynamicweb/urls.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index e18f3e44..ec43d1a5 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -51,10 +51,6 @@ urlpatterns += i18n_patterns(
     url(r'^membership/', include(membership_urls)),
     url(r'^digitalglarus/', include('digitalglarus.urls',
                                     namespace="digitalglarus")),
-    url(r'^',
-        include('ungleich_page.urls',
-                namespace='ungleich_page'),
-        name='ungleich_page'),
     url(r'^cms/blog/',
         include('ungleich.urls', namespace='ungleich')),
     url(
@@ -67,6 +63,10 @@ urlpatterns += i18n_patterns(
     url(r'^cms/', include('cms.urls')),
     url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
         else LandingView.as_view()),
+    url(r'^',
+        include('ungleich_page.urls',
+                namespace='ungleich_page'),
+        name='ungleich_page'),
 )
 
 urlpatterns += [

From 9fca25ec5a4c1e8c264888f029d19fe01e0b5eeb Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 6 Apr 2018 20:28:15 +0200
Subject: [PATCH 09/11] Update Changelog

---
 Changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog b/Changelog
index 811bc44c..d3991e4c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+Next:
+    * #4362: [cms] Fix the need of dummy home page for different CMS-based sites
 1.6.3: 2018-04-05
     * #4377: [cms] header btn external link fix
     * #4378: [dcl cms] update CMS Integration to have different content for different domains

From c167e1ca944d4c97828e48064d4d103bdbb48438 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 6 Apr 2018 22:31:39 +0200
Subject: [PATCH 10/11] Update Changelog for 1.6.4

---
 Changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index d3991e4c..49459422 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,4 @@
-Next:
+1.6.4: 2018-04-06
     * #4362: [cms] Fix the need of dummy home page for different CMS-based sites
 1.6.3: 2018-04-05
     * #4377: [cms] header btn external link fix

From 24a9b8ab78eff5e414c791bc9c659714857ab99c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 7 Apr 2018 00:13:24 +0200
Subject: [PATCH 11/11] Redirect multi-tenant urls to /cms also

---
 dynamicweb/urls_multi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dynamicweb/urls_multi.py b/dynamicweb/urls_multi.py
index 752c353e..ffe59db5 100644
--- a/dynamicweb/urls_multi.py
+++ b/dynamicweb/urls_multi.py
@@ -3,10 +3,12 @@ from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.views import static as static_view
+from django.views.generic import RedirectView
 
 urlpatterns = i18n_patterns(
     url(r'^admin/', include(admin.site.urls)),
     url(r'^cms/', include('cms.urls')),
+    url(r'^$', RedirectView.as_view(url='/cms')),
 )
 
 urlpatterns += [