Merge branch 'release' from 2014-08-12 release.

lms/envs/common.py

@@ -148,7 +148,10 @@ FEATURES = {
     # Staff Debug tool.
     'ENABLE_STUDENT_HISTORY_VIEW': True,
 
-    # segment.io for LMS--need to explicitly turn it on for production.
+    # Optimizely for the LMS--need to explicitly turn on for production.
+    'OPTIMIZELY_LMS': False,
+
+    # Segment.io for LMS--need to explicitly turn on for production.
     'SEGMENT_IO_LMS': False,
 
     # Provide a UI to allow users to submit feedback from the LMS (left-hand help modal)

lms/templates/main.html

@@ -90,6 +90,8 @@
     <script src="${static.url('js/html5shiv.js')}"></script>
   <![endif]-->
 
+  <%include file="widgets/optimizely.html" />
+
   <meta name="path_prefix" content="${EDX_ROOT_URL}">
   <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
 

lms/templates/mktg_iframe.html

@@ -22,6 +22,8 @@
 
   <%block name="headextra"/>
 
+  <%include file="widgets/optimizely.html" />
+
   <!-- NOTE: if we want segment io on these iframes at some point, put
     include file="widgets/segment-io.html"
   here -->

lms/templates/widgets/optimizely.html

@@ -0,0 +1,3 @@
+% if settings.FEATURES.get('OPTIMIZELY_LMS'):
+<script src="//cdn.optimizely.com/js/1706490390.js"></script>
+% endif