diff --git a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java index ba45c489..23aca487 100644 --- a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java +++ b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java @@ -21,7 +21,6 @@ public class ApplicationSettings extends AbstractModel { private boolean allowRegistrations = false; private String googleAnalyticsTrackingCode; - private String googleAnalyticsDomainName; private String googleClientId; private String googleClientSecret; @@ -122,12 +121,4 @@ public class ApplicationSettings extends AbstractModel { this.googleAnalyticsTrackingCode = googleAnalyticsTrackingCode; } - public String getGoogleAnalyticsDomainName() { - return googleAnalyticsDomainName; - } - - public void setGoogleAnalyticsDomainName(String googleAnalyticsDomainName) { - this.googleAnalyticsDomainName = googleAnalyticsDomainName; - } - } diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.java b/src/main/java/com/commafeed/frontend/pages/BasePage.java index 5adaef25..20488663 100644 --- a/src/main/java/com/commafeed/frontend/pages/BasePage.java +++ b/src/main/java/com/commafeed/frontend/pages/BasePage.java @@ -68,7 +68,6 @@ public abstract class BasePage extends WebPage { if (StringUtils.isNotBlank(settings.getGoogleAnalyticsTrackingCode())) { Map vars = Maps.newHashMap(); vars.put("trackingCode", settings.getGoogleAnalyticsTrackingCode()); - vars.put("domainName", settings.getGoogleAnalyticsDomainName()); response.render(JavaScriptHeaderItem .forReference(new TextTemplateResourceReference( BasePage.class, "analytics.js", Model.ofMap(vars)))); diff --git a/src/main/java/com/commafeed/frontend/pages/analytics.js b/src/main/java/com/commafeed/frontend/pages/analytics.js index dd1e65f5..fff4996f 100644 --- a/src/main/java/com/commafeed/frontend/pages/analytics.js +++ b/src/main/java/com/commafeed/frontend/pages/analytics.js @@ -9,5 +9,5 @@ m.parentNode.insertBefore(a, m) })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); -ga('create', '${trackingCode}', '${domainName}'); +ga('create', '${trackingCode}'); ga('send', 'pageview'); diff --git a/src/main/webapp/templates/admin.settings.html b/src/main/webapp/templates/admin.settings.html index a7c107c4..df52f0e8 100644 --- a/src/main/webapp/templates/admin.settings.html +++ b/src/main/webapp/templates/admin.settings.html @@ -49,14 +49,6 @@ ng-model="settings.googleAnalyticsTrackingCode" /> -
- -
- -
-