forked from Archives/Athou_commafeed
domain name not needed
This commit is contained in:
@@ -21,7 +21,6 @@ public class ApplicationSettings extends AbstractModel {
|
|||||||
private boolean allowRegistrations = false;
|
private boolean allowRegistrations = false;
|
||||||
|
|
||||||
private String googleAnalyticsTrackingCode;
|
private String googleAnalyticsTrackingCode;
|
||||||
private String googleAnalyticsDomainName;
|
|
||||||
|
|
||||||
private String googleClientId;
|
private String googleClientId;
|
||||||
private String googleClientSecret;
|
private String googleClientSecret;
|
||||||
@@ -122,12 +121,4 @@ public class ApplicationSettings extends AbstractModel {
|
|||||||
this.googleAnalyticsTrackingCode = googleAnalyticsTrackingCode;
|
this.googleAnalyticsTrackingCode = googleAnalyticsTrackingCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getGoogleAnalyticsDomainName() {
|
|
||||||
return googleAnalyticsDomainName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGoogleAnalyticsDomainName(String googleAnalyticsDomainName) {
|
|
||||||
this.googleAnalyticsDomainName = googleAnalyticsDomainName;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ public abstract class BasePage extends WebPage {
|
|||||||
if (StringUtils.isNotBlank(settings.getGoogleAnalyticsTrackingCode())) {
|
if (StringUtils.isNotBlank(settings.getGoogleAnalyticsTrackingCode())) {
|
||||||
Map<String, Object> vars = Maps.newHashMap();
|
Map<String, Object> vars = Maps.newHashMap();
|
||||||
vars.put("trackingCode", settings.getGoogleAnalyticsTrackingCode());
|
vars.put("trackingCode", settings.getGoogleAnalyticsTrackingCode());
|
||||||
vars.put("domainName", settings.getGoogleAnalyticsDomainName());
|
|
||||||
response.render(JavaScriptHeaderItem
|
response.render(JavaScriptHeaderItem
|
||||||
.forReference(new TextTemplateResourceReference(
|
.forReference(new TextTemplateResourceReference(
|
||||||
BasePage.class, "analytics.js", Model.ofMap(vars))));
|
BasePage.class, "analytics.js", Model.ofMap(vars))));
|
||||||
|
|||||||
@@ -9,5 +9,5 @@
|
|||||||
m.parentNode.insertBefore(a, m)
|
m.parentNode.insertBefore(a, m)
|
||||||
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
|
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
|
||||||
|
|
||||||
ga('create', '${trackingCode}', '${domainName}');
|
ga('create', '${trackingCode}');
|
||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
|
|||||||
@@ -49,14 +49,6 @@
|
|||||||
ng-model="settings.googleAnalyticsTrackingCode" />
|
ng-model="settings.googleAnalyticsTrackingCode" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-group">
|
|
||||||
<label class="control-label" for="googleAnalyticsDomainName">Google
|
|
||||||
Analytics domain name</label>
|
|
||||||
<div class="controls">
|
|
||||||
<input type="text" name="googleAnalyticsDomainName"
|
|
||||||
ng-model="settings.googleAnalyticsDomainName" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<label class="control-label" for="googleClientSecret">Background
|
<label class="control-label" for="googleClientSecret">Background
|
||||||
threads</label>
|
threads</label>
|
||||||
|
|||||||
Reference in New Issue
Block a user