From b338ba60921c1f5f0fc8fcb6227b1d425d560783 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 15:13:13 -0600 Subject: [PATCH 1/7] digitalglarus: cms navigation. Signed-off-by: rscnt --- templates/cms/digitalglarus/base.html | 38 +------------------ .../cms/digitalglarus/partials/menu.html | 37 ++++++++++++++++++ 2 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 templates/cms/digitalglarus/partials/menu.html diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html index d5d50456..64af3186 100644 --- a/templates/cms/digitalglarus/base.html +++ b/templates/cms/digitalglarus/base.html @@ -56,43 +56,7 @@ - + {% include "templates/cms/digitalglarus/partials/menu.html" %}
{% block content %} {% endblock %} diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html new file mode 100644 index 00000000..8fbbb6ab --- /dev/null +++ b/templates/cms/digitalglarus/partials/menu.html @@ -0,0 +1,37 @@ +{% load menu_tags staticfiles cms_tags %} + + From 0827c6f2ffd9e9a47155b3c2d91504f45284e15b Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 15:20:39 -0600 Subject: [PATCH 2/7] digitalglarus: moving digital glarus static url. Signed-off-by: rscnt --- dynamicweb/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index b624498d..71ddc68f 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -8,7 +8,7 @@ from dynamicweb import settings from hosting.views import railshosting urlpatterns = [ - url(r'^digitalglarus/', include('digitalglarus.urls', + url(r'^digitalglarus_old/', include('digitalglarus.urls', namespace="digitalglarus")), url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^railshosting/', railshosting, name="rails.hosting"), From 50e0cb9a7130717bd44e30ac82ca264f2f9dae3f Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 15:26:05 -0600 Subject: [PATCH 3/7] digitalglarus: fixed typo on menu call Signed-off-by: rscnt --- templates/cms/digitalglarus/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html index 64af3186..221c44c5 100644 --- a/templates/cms/digitalglarus/base.html +++ b/templates/cms/digitalglarus/base.html @@ -56,7 +56,7 @@
- {% include "templates/cms/digitalglarus/partials/menu.html" %} + {% include "cms/digitalglarus/partials/menu.html" %}
{% block content %} {% endblock %} From 1b17e2aac11d548718fabf6ba511913aa2d5c095 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 15:38:53 -0600 Subject: [PATCH 4/7] digitalglarus: fix urls for blog. Signed-off-by: rscnt --- digitalglarus/urls.py | 8 ++++---- dynamicweb/urls.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index c3a14372..412ad051 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -4,10 +4,10 @@ from . import views urlpatterns = [ url(r'^$', views.index, name='index'), - url(r'about$', views.about, name='about'), - url(r'contact$', views.contact, name='contact'), - url(r'letscowork$', views.letscowork, name='letscowork'), - url(r'home$', views.home, name='home'), + url(r'_about$', views.about, name='about'), + url(r'_contact$', views.contact, name='contact'), + url(r'_letscowork$', views.letscowork, name='letscowork'), + url(r'_home$', views.home, name='home'), url(r'blog/$', views.blog, name='blog'), url(r'^blog/(?P\w[-\w]*)/$', views.blog_detail, name='blog-detail'), ] diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 71ddc68f..b624498d 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -8,7 +8,7 @@ from dynamicweb import settings from hosting.views import railshosting urlpatterns = [ - url(r'^digitalglarus_old/', include('digitalglarus.urls', + url(r'^digitalglarus/', include('digitalglarus.urls', namespace="digitalglarus")), url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^railshosting/', railshosting, name="rails.hosting"), From a4c3c341a30bdf57877fcf978a856926544a8267 Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 16:48:33 -0600 Subject: [PATCH 5/7] digitalglarus: changes on urls --- digitalglarus/urls.py | 10 +++++----- dynamicweb/urls.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 412ad051..44d881e0 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -3,11 +3,11 @@ from django.conf.urls import url from . import views urlpatterns = [ - url(r'^$', views.index, name='index'), - url(r'_about$', views.about, name='about'), - url(r'_contact$', views.contact, name='contact'), - url(r'_letscowork$', views.letscowork, name='letscowork'), - url(r'_home$', views.home, name='home'), + url(r'old^$', views.index, name='index'), + url(r'old_about$', views.about, name='about'), + url(r'old_contact$', views.contact, name='contact'), + url(r'old_letscowork$', views.letscowork, name='letscowork'), + url(r'old_home$', views.home, name='home'), url(r'blog/$', views.blog, name='blog'), url(r'^blog/(?P\w[-\w]*)/$', views.blog_detail, name='blog-detail'), ] diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index b624498d..10291fac 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -8,8 +8,6 @@ from dynamicweb import settings from hosting.views import railshosting urlpatterns = [ - url(r'^digitalglarus/', include('digitalglarus.urls', - namespace="digitalglarus")), url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^railshosting/', railshosting, name="rails.hosting"), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), @@ -20,6 +18,8 @@ urlpatterns = [ # note the django CMS URLs included via i18n_patterns urlpatterns += i18n_patterns('', url(r'^admin/', include(admin.site.urls)), + url(r'^digitalglarus/', include('digitalglarus.urls', + namespace="digitalglarus")), url(r'^', include('cms.urls')), ) From 8a90caf7da0153a5bcc4cf8a2b38b2ca85f41b2f Mon Sep 17 00:00:00 2001 From: rscnt Date: Sun, 4 Oct 2015 16:57:50 -0600 Subject: [PATCH 6/7] digitalglarus: submenu for digitalglarus --- templates/cms/digitalglarus/partials/menu.html | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html index 8fbbb6ab..f145daff 100644 --- a/templates/cms/digitalglarus/partials/menu.html +++ b/templates/cms/digitalglarus/partials/menu.html @@ -16,16 +16,7 @@