diff --git a/addons/aldryn-google-analytics/addon.json b/addons/aldryn-google-analytics/addon.json deleted file mode 100644 index fb014a5..0000000 --- a/addons/aldryn-google-analytics/addon.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "installed-apps": [], - "package-name": "aldryn-google-analytics" -} \ No newline at end of file diff --git a/addons/aldryn-google-analytics/aldryn_config.py b/addons/aldryn-google-analytics/aldryn_config.py deleted file mode 100644 index ad24d91..0000000 --- a/addons/aldryn-google-analytics/aldryn_config.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -from aldryn_client import forms -import re - - -class GoogleAnalyticsIDField(forms.CharField): - - GOOGLE_ANALYTICS_ID_FORMAT = re.compile(r'^UA-\d+(-\d+)?$') - - def clean(self, value): - value = super(GoogleAnalyticsIDField, self).clean(value.strip()) - if not self.GOOGLE_ANALYTICS_ID_FORMAT.match(value): - raise forms.ValidationError('Invalid format. Google Analytics site tracking ID format is: UA-XXXXXX-YY.') - return value - - -class Form(forms.BaseForm): - google_analytics_id = GoogleAnalyticsIDField('Tracking ID', max_length=50) - # TODO: add description (not supported by forms yet): - # https://developers.google.com/analytics/devguides/collection/upgrade/guide#transfer - use_universal_analytics = forms.CheckboxField('Use Universal Analytics', required=False) - # https://developers.google.com/analytics/devguides/collection/analyticsjs/user-id?hl=en - track_individuals = forms.CheckboxField('Track individual logged in users (universal only)', required=False) - - def clean(self): - super(Form, self).clean() - if self.cleaned_data['track_individuals'] and not self.cleaned_data['use_universal_analytics']: - self.errors['track_individuals'] = "Individual user tracking only works in with Universal Analytics." - - def to_settings(self, data, settings): - settings['GOOGLE_ANALYTICS_ID'] = data['google_analytics_id'] - settings['GOOGLE_ANALYTICS_USE_UNIVERSAL'] = data['use_universal_analytics'] - settings['GOOGLE_ANALYTICS_TRACK_INDIVIDUALS'] = data['track_individuals'] - settings['INSTALLED_APPS'].append('aldryn_google_analytics') - - # aldryn-snake is configured by aldryn-django-cms - return settings diff --git a/addons/aldryn-google-analytics/settings.json b/addons/aldryn-google-analytics/settings.json deleted file mode 100644 index 0362db6..0000000 --- a/addons/aldryn-google-analytics/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "google_analytics_id": "UA-116863155-1", - "track_individuals": false, - "use_universal_analytics": true -} \ No newline at end of file diff --git a/requirements.in b/requirements.in index 76a1bda..ee931a7 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,6 @@ https://control.divio.com/api/v1/apps/serve/aldryn-django/1.11.15.1/f9e543d2-312 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.3.1/f6351558-64b2-4205-b407-cd49b6372463/aldryn-sso-1.3.1.tar.gz#egg=aldryn-sso==1.3.1 https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.2.2/88bf7991-90a3-4c98-acf5-42c3fa14e2a4/aldryn-django-cms-3.5.2.2.tar.gz#egg=aldryn-django-cms==3.5.2.2 https://control.divio.com/api/v1/apps/serve/aldryn-forms/3.0.4/7e972f96-36f6-484b-96c7-bce255b87aa9/aldryn-forms-3.0.4.tar.gz#egg=aldryn-forms==3.0.4 -https://control.divio.com/api/v1/apps/serve/aldryn-google-analytics/1.0.1/9fa37058-cd43-418c-9e06-b81c17b6bdfb/aldryn-google-analytics-1.0.1.tar.gz#egg=aldryn-google-analytics==1.0.1 https://control.divio.com/api/v1/apps/serve/aldryn-haystack/0.4/e44307e9-b2bd-43c2-8e1b-6b88d9b7e492/aldryn-haystack-0.4.tar.gz#egg=aldryn-haystack==0.4 https://control.divio.com/api/v1/apps/serve/djangocms-history/0.5.3/05803675-6e8d-4637-b14b-1bb8d18b24b3/djangocms-history-0.5.3.tar.gz#egg=djangocms-history==0.5.3 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2 diff --git a/settings.py b/settings.py index fc74f71..14b821a 100644 --- a/settings.py +++ b/settings.py @@ -9,7 +9,6 @@ INSTALLED_ADDONS = [ 'aldryn-sso', 'aldryn-django-cms', 'aldryn-forms', - 'aldryn-google-analytics', 'aldryn-haystack', 'djangocms-history', 'djangocms-link',