Merge branch 'release'

common/lib/xmodule/xmodule/js/src/problem/edit.coffee

@@ -48,7 +48,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
   ###
   onShowXMLButton: (e) =>
     e.preventDefault();
-    @addRemoveCheatsheetCSS()
+    if @cheatsheet != undefined
+      @addRemoveCheatsheetCSS()
     if @confirmConversionToXml()
       @createXMLEditor(MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()))
       # Need to refresh to get line numbers to display properly (and put cursor position to 0)

lms/djangoapps/linkedin/management/commands/linkedin_mailusers.py

@@ -205,7 +205,11 @@ class Command(BaseCommand):
                 'linkedin_add_url': self.certificate_url(cert),
             })
 
-        context = {'courses_list': courses_list, 'num_courses': len(courses_list)}
+        context = {
+            'courses_list': courses_list,
+            'num_courses': len(courses_list),
+            'google_analytics': settings.GOOGLE_ANALYTICS_LINKEDIN,
+        }
         body = render_to_string('linkedin/linkedin_email.html', context)
         subject = u'{}, Add your Achievements to your LinkedIn Profile'.format(user.profile.name)
         if mock_run:

lms/envs/aws.py

@@ -398,3 +398,7 @@ THIRD_PARTY_AUTH = AUTH_TOKENS.get('THIRD_PARTY_AUTH', THIRD_PARTY_AUTH)
 
 ##### ADVANCED_SECURITY_CONFIG #####
 ADVANCED_SECURITY_CONFIG = ENV_TOKENS.get('ADVANCED_SECURITY_CONFIG', {})
+
+##### GOOGLE ANALYTICS IDS #####
+GOOGLE_ANALYTICS_ACCOUNT = AUTH_TOKENS.get('GOOGLE_ANALYTICS_ACCOUNT')
+GOOGLE_ANALYTICS_LINKEDIN = AUTH_TOKENS.get('GOOGLE_ANALYTICS_LINKEDIN')

lms/envs/common.py

@@ -421,6 +421,10 @@ if FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
 TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat']
 TRACKING_ENABLED = True
 
+######################## GOOGLE ANALYTICS ###########################
+GOOGLE_ANALYTICS_ACCOUNT = 'GOOGLE_ANALYTICS_ACCOUNT_DUMMY'
+GOOGLE_ANALYTICS_LINKEDIN = 'GOOGLE_ANALYTICS_LINKEDIN_DUMMY'
+
 ######################## subdomain specific settings ###########################
 COURSE_LISTINGS = {}
 SUBDOMAIN_BRANDING = {}

lms/templates/google_analytics.html

@@ -1,6 +1,6 @@
 <script type="text/javascript">
 var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-35248639-1']);
+_gaq.push(['_setAccount', ${settings.GOOGLE_ANALYTICS_ACCOUNT}]);
 _gaq.push(['_trackPageview']);
 
 (function() {

lms/templates/linkedin/linkedin_email.html

@@ -393,7 +393,7 @@
             <script type="text/javascript">
             try {
                 var _gaq = _gaq || [];
-                _gaq.push(["_setAccount", "UA-329148-88"]);
+                _gaq.push(["_setAccount", ${google_analytics}]);
                 _gaq.push(["_setDomainName", ".campaign-archive.com"]);
                 _gaq.push(["_trackPageview"]);
                 _gaq.push(["_setAllowLinker", true]);