diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/settings_sidebar.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/user_settings.jsx | 5 | ||||
| -rw-r--r-- | web/react/utils/client.jsx | 4 | ||||
| -rw-r--r-- | web/templates/head.html | 33 |
4 files changed, 32 insertions, 16 deletions
diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index 34e3c9203..a1546890f 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -14,11 +14,13 @@ module.exports = React.createClass({ <li className={this.props.activeTab == 'general' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("general");}}><i className="glyphicon glyphicon-cog"></i>General</a></li> <li className={this.props.activeTab == 'security' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("security");}}><i className="glyphicon glyphicon-lock"></i>Security</a></li> <li className={this.props.activeTab == 'notifications' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("notifications");}}><i className="glyphicon glyphicon-exclamation-sign"></i>Notifications</a></li> - <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li> - <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li> <li className={this.props.activeTab == 'appearance' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("appearance");}}><i className="glyphicon glyphicon-wrench"></i>Appearance</a></li> </ul> </div> ); + /* Temporarily removing sessions and activity logs + <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li> + <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li> + */ } }); diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index b165a59ad..a9c2433f2 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1126,6 +1126,9 @@ module.exports = React.createClass({ <NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + + /* Temporarily removing sessions and activity_log tabs + } else if (this.props.activeTab === 'sessions') { return ( <div> @@ -1138,6 +1141,8 @@ module.exports = React.createClass({ <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + */ + } else if (this.props.activeTab === 'appearance') { return ( <div> diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index b83ee22e7..786e6dcea 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -4,12 +4,12 @@ module.exports.track = function(category, action, label, prop, val) { global.window.snowplow('trackStructEvent', category, action, label, prop, val); - if (global.window.analytics != null) global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); + global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); }; module.exports.trackPage = function() { global.window.snowplow('trackPageView'); - if (global.window.analytics != null) global.window.analytics.page(); + global.window.analytics.page(); }; function handleError(method_name, xhr, status, err) { diff --git a/web/templates/head.html b/web/templates/head.html index 5fd3ee104..5eb7a7333 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -36,6 +36,7 @@ window._LTracker = _LTracker; _LTracker.push({'logglyKey': config.LogglyWriteKey, 'sendConsoleErrors' : config.LogglyConsoleErrors }); } else { + window._LTracker = []; console.warn("config.js missing LogglyWriteKey, Loggly analytics is not reporting"); } </script> @@ -58,26 +59,34 @@ analytics.page(); }}(); } else { + analytics = {}; + analytics.page = function(){}; + analytics.track = function(){}; console.warn("config.js missing SegmentWriteKey, SegmentIO analytics is not tracking"); } </script> <!-- Snowplow starts plowing --> <script type="text/javascript"> - ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[]; - p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments) - };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1; - n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.4.2/sp.js","snowplow")); + if ('{{ .Props.AnalyticsUrl }}'.trim() !== '') { + ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[]; + p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments) + };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1; + n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.4.2/sp.js","snowplow")); - window.snowplow('newTracker', 'cf', '{{ .Props.AnalyticsUrl }}', { - appId: '{{ .SiteName }}' - }); + window.snowplow('newTracker', 'cf', '{{ .Props.AnalyticsUrl }}', { + appId: '{{ .SiteName }}' + }); - var user = window.UserStore.getCurrentUser(true); - if (user) { - window.snowplow('setUserId', user.id); - } + var user = window.UserStore.getCurrentUser(true); + if (user) { + window.snowplow('setUserId', user.id); + } - window.snowplow('trackPageView'); + window.snowplow('trackPageView'); + } else { + window.snowplow = function(){}; + console.warn("config.json missing AnalyticsUrl, Snowplow analytics is not tracking"); + } </script> <!-- Snowplow stops plowing --> </head> |