From 56792893299cb24b965a67496a879197b9885704 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 12 Apr 2018 22:24:50 +0530 Subject: [PATCH] replaced cms_menu with static menu --- .../blog.ungleich.ch/css/clean-blog.css | 2 +- dynamicweb/urls.py | 33 +++++++---------- ungleich/templates/cms/ungleichch/_menu.html | 35 +++++++++++-------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css index 3c8f4e29..66e4c54d 100755 --- a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css +++ b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css @@ -70,7 +70,7 @@ hr.small { } .navbar-custom .navbar-brand { color: white; - padding: 20px; + padding: 5px 20px; } .navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:focus { diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index ec43d1a5..c3d15c04 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -18,8 +18,8 @@ import debug_toolbar urlpatterns = [ url(r'^index.html$', LandingView.as_view()), - url(r'^open_api/', include('opennebula_api.urls', - namespace='opennebula_api')), + url(r'^open_api/', + include('opennebula_api.urls', namespace='opennebula_api')), url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"), url(r'^nodehosting/', NodeJSHostingView.as_view(), @@ -28,8 +28,7 @@ urlpatterns = [ name="django.hosting"), url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), - url(r'^jsi18n/(?P\S+?)/$', - i18n.javascript_catalog), + url(r'^jsi18n/(?P\S+?)/$', i18n.javascript_catalog), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += i18n_patterns( @@ -45,28 +44,22 @@ urlpatterns += i18n_patterns( url(r'^admin/', include(admin.site.urls)), url(r'^datacenterlight/', include('datacenterlight.urls', namespace="datacenterlight")), - url(r'^hosting/', RedirectView.as_view( - url=reverse_lazy('hosting:login')), name='redirect_hosting_login'), + url(r'^hosting/', RedirectView.as_view(url=reverse_lazy('hosting:login')), + name='redirect_hosting_login'), url(r'^alplora/', include('alplora.urls', namespace="alplora")), url(r'^membership/', include(membership_urls)), - url(r'^digitalglarus/', include('digitalglarus.urls', - namespace="digitalglarus")), - url(r'^cms/blog/', - include('ungleich.urls', namespace='ungleich')), - url( - r'^blog/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', + url(r'^digitalglarus/', + include('digitalglarus.urls', namespace="digitalglarus")), + url(r'^cms/blog/', include('ungleich.urls', namespace='ungleich')), + url(r'^blog/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\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'^blog/$', + RedirectView.as_view(url=reverse_lazy('ungleich:post-list')), name='blog_list_view'), url(r'^cms/', include('cms.urls')), + url(r'^blog/', include('djangocms_blog.urls', namespace='djangocms_blog')), 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'), + url(r'^', include('ungleich_page.urls', namespace='ungleich_page')), ) urlpatterns += [ diff --git a/ungleich/templates/cms/ungleichch/_menu.html b/ungleich/templates/cms/ungleichch/_menu.html index e17e90d6..6ccb043b 100644 --- a/ungleich/templates/cms/ungleichch/_menu.html +++ b/ungleich/templates/cms/ungleichch/_menu.html @@ -5,29 +5,34 @@
- +