-
+
{% if request.resolver_match.url_name == "index" %}
-
@@ -45,7 +45,7 @@
{% endif %}
-
+
Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved
diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py
index a08bacdb..a3aed7a6 100644
--- a/datacenterlight/urls.py
+++ b/datacenterlight/urls.py
@@ -5,13 +5,13 @@ from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessVie
urlpatterns = [
- url(r'^/?$', IndexView.as_view(), name='index'),
- url(r'^/whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'),
- url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'),
- url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'),
- url(r'^/pricing/?$', PricingView.as_view(), name='pricing'),
- url(r'^/payment/?$', PaymentOrderView.as_view(), name='payment'),
- url(r'^/order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'),
- url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'),
- url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'),
+ url(r'^$', IndexView.as_view(), name='index'),
+ url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'),
+ url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'),
+ url(r'^landing/?$', LandingProgramView.as_view(), name='landing'),
+ url(r'^pricing/?$', PricingView.as_view(), name='pricing'),
+ url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'),
+ url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'),
+ url(r'^order-success/?$', SuccessView.as_view(), name='order_success'),
+ url(r'^beta_access?$', BetaAccessView.as_view(), name='beta_access'),
]
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index eba9896e..92cd8e11 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -1,5 +1,6 @@
from django.conf.urls import url
from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth import views as auth_views
from . import views
from .views import ContactView, IndexView, HistoryView, LoginView, SignupView,\
@@ -20,7 +21,7 @@ urlpatterns = [
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'login/?$'), LoginView.as_view(), name='login'),
url(_(r'signup/?$'), SignupView.as_view(), name='signup'),
- url(r'^logout/?$', 'django.contrib.auth.views.logout',
+ url(r'^logout/?$', auth_views.logout,
{'next_page': '/digitalglarus/login?logged_out=true'}, name='logout'),
url(r'reset-password/?$', PasswordResetView.as_view(), name='reset_password'),
url(r'reset-password-confirm/(?P
[0-9A-Za-z]+)-(?P.+)/$',
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index bd6e30e3..278d08fc 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -199,13 +199,11 @@ DATABASES = {
}
}
-
AUTHENTICATION_BACKENDS = (
'guardian.backends.ObjectPermissionBackend',
'django.contrib.auth.backends.ModelBackend',
)
-
# Internationalization
# https://docs.djangoproject.com/en/1.7/topics/i18n/
@@ -464,7 +462,6 @@ META_USE_SITES = True
PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)}
AUTH_USER_MODEL = 'membership.CustomUser'
-
# PAYMENT
STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"
@@ -481,7 +478,6 @@ STRIPE_API_PUBLIC_KEY = env('STRIPE_API_PUBLIC_KEY')
ANONYMOUS_USER_NAME = 'anonymous@ungleich.ch'
GUARDIAN_GET_INIT_ANONYMOUS_USER = 'membership.models.get_anonymous_user_instance'
-
#############################################
# configurations for opennebula-integration #
#############################################
@@ -508,7 +504,6 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT')
# default value is /RPC2
OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT')
-
# dcl email configurations
DCL_TEXT = env('DCL_TEXT')
DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')
@@ -526,9 +521,31 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'dynamicweb-staging.ungleich.ch': 'staging'
}
+ENABLE_DEBUG_LOGGING = bool_env('ENABLE_DEBUG_LOGGING')
+
+if ENABLE_DEBUG_LOGGING:
+ LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'handlers': {
+ 'file': {
+ 'level': 'DEBUG',
+ 'class': 'logging.FileHandler',
+ 'filename': "{PROJECT_DIR}/debug.log".format(PROJECT_DIR=PROJECT_DIR),
+ },
+ },
+ 'loggers': {
+ 'django': {
+ 'handlers': ['file'],
+ 'level': 'DEBUG',
+ 'propagate': True,
+ },
+ },
+ }
+
DEBUG = bool_env('DEBUG')
if DEBUG:
- from .local import * # flake8: noqa
+ from .local import * # flake8: noqa
else:
- from .prod import * # flake8: noqa
+ from .prod import * # flake8: noqa
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 66bf74df..b5cccff3 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.contrib import admin
-# deprecated in version 1.8
from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
+from django.views import i18n, static as static_view
from django.conf import settings
from hosting.views import RailsHostingView, DjangoHostingView, NodeJSHostingView
@@ -22,17 +22,17 @@ urlpatterns = [url(r'^index.html$', LandingView.as_view()),
url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P\S+?)/$',
- 'django.views.i18n.javascript_catalog'),
+ i18n.javascript_catalog),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# note the django CMS URLs included via i18n_patterns
-urlpatterns += i18n_patterns('',
- url(r'^/?$', LandingView.as_view()),
+urlpatterns += i18n_patterns(
+ url(r'^$', LandingView.as_view()),
url(r'^admin/', include(admin.site.urls)),
- url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")),
+ 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'^alplora', include('alplora.urls', namespace="alplora")),
+ url(r'^alplora/', include('alplora.urls', namespace="alplora")),
url(r'^membership/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),
@@ -43,11 +43,11 @@ urlpatterns += i18n_patterns('',
url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
url(r'^', include('cms.urls'))
)
-urlpatterns += patterns('',
+urlpatterns += [
url(r'^media/(?P.*)$',
- 'django.views.static.serve', {
+ static_view.serve, {
'document_root': settings.MEDIA_ROOT,
}),
- )
+ ]
if settings.DEBUG:
- urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)))
+ urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 63a2f54a..a7d69094 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -714,3 +714,8 @@ a.unlink:hover {
width: 100% !important;
}
}
+
+
+.footer-light a:hover, .footer-light a:focus, .footer-light a:active {
+ color: #ddd;
+}
\ No newline at end of file
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 21aa93db..5cce6533 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -118,7 +118,9 @@
{% else %}
- {% include "datacenterlight/includes/_footer.html" %}
+
{% endif %}
diff --git a/hosting/urls.py b/hosting/urls.py
index 495ac312..c243f29b 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -1,4 +1,5 @@
from django.conf.urls import url
+from django.contrib.auth import views as auth_views
from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\
NodeJSHostingView, LoginView, SignupView, SignupValidateView, SignupValidatedView, IndexView, \
@@ -39,7 +40,7 @@ urlpatterns = [
url(r'reset-password/?$', PasswordResetView.as_view(), name='reset_password'),
url(r'reset-password-confirm/(?P