From 56792893299cb24b965a67496a879197b9885704 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 12 Apr 2018 22:24:50 +0530 Subject: [PATCH 1/4] 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 @@
- +
From 2536f9405863b7e44cbf3d3fa035d7a1dbb42ac8 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Apr 2018 17:44:00 +0530 Subject: [PATCH 2/4] django parler config fix --- dynamicweb/settings/base.py | 2 +- ungleich_page/static/ungleich_page/css/agency.css | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 5db5a498..58c6b8e2 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -516,7 +516,7 @@ META_INCLUDE_KEYWORDS = ["ungleich", "hosting", "switzerland", "Schweiz", "Swiss", "cdist"] META_USE_SITES = True -PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)} +PARLER_LANGUAGES = {SITE_ID: ({'code': 'en-us'}, {'code': 'de'},)} AUTH_USER_MODEL = 'membership.CustomUser' # PAYMENT diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 2b40158a..a4d2f4d3 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -235,13 +235,14 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-nav>.active>a { border-radius: 0; color: #fff; - background-color: #fed136; + background-color: transparent; + border-bottom: 2px solid #fed136; } .navbar-default .navbar-nav>.active>a:hover, .navbar-default .navbar-nav>.active>a:focus { color: #fff; - background-color: #fec503; + background-color: transparent; } .navbar-default .navbar-brand { @@ -266,8 +267,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-nav>.active>a { - border-radius: 3px; - } + /* border-radius: 3px; */ + } .navbar-default.navbar-shrink { padding: 10px 0; From 5b8b40f9673b22bc7ad2beacb1819b0d90114f3d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 13 Apr 2018 17:49:27 +0530 Subject: [PATCH 3/4] restore ungleich style --- ungleich_page/static/ungleich_page/css/agency.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index a4d2f4d3..2b40158a 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -235,14 +235,13 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-nav>.active>a { border-radius: 0; color: #fff; - background-color: transparent; - border-bottom: 2px solid #fed136; + background-color: #fed136; } .navbar-default .navbar-nav>.active>a:hover, .navbar-default .navbar-nav>.active>a:focus { color: #fff; - background-color: transparent; + background-color: #fec503; } .navbar-default .navbar-brand { @@ -267,8 +266,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-nav>.active>a { - /* border-radius: 3px; */ - } + border-radius: 3px; + } .navbar-default.navbar-shrink { padding: 10px 0; From da13903ba2ebb1c83b784cf4fb14e5eb1b4170c0 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 20 Apr 2018 16:42:50 +0530 Subject: [PATCH 4/4] remove padding --- datacenterlight/static/datacenterlight/css/header-slider.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/datacenterlight/static/datacenterlight/css/header-slider.css b/datacenterlight/static/datacenterlight/css/header-slider.css index e21e2b49..d01f02a7 100644 --- a/datacenterlight/static/datacenterlight/css/header-slider.css +++ b/datacenterlight/static/datacenterlight/css/header-slider.css @@ -120,6 +120,11 @@ .header_slider .intro-cap { font-size: 3.25em; } + + .header_slider > .carousel .item .container { + padding-left: 0; + padding-right: 0; + } } .header_slider .intro_lead {