Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics

Conflicts:
	cms/envs/common.py

cms/envs/common.py

@@ -34,7 +34,8 @@ MITX_FEATURES = {
     'ENABLE_DISCUSSION_SERVICE': False,
     'AUTH_USE_MIT_CERTIFICATES': False,
     'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
-    'STUDIO_NPS_SURVEY': True,
+    'STAFF_EMAIL': '',			# email address for staff (eg to request course creation)
+    'STUDIO_NPS_SURVEY': True, 
     'SEGMENT_IO': True,
 }
 ENABLE_JASMINE = False

cms/templates/index.html

@@ -46,6 +46,8 @@
           <li class="nav-item">
             % if not disable_course_creation:
               <a href="#" class="button new-button new-course-button"><i class="ss-icon ss-symbolicons-standard icon icon-create">&#x002B;</i> New Course</a>
+	    % elif settings.MITX_FEATURES.get('STAFF_EMAIL',''):
+	      <a href="mailto:${settings.MITX_FEATURES.get('STAFF_EMAIL','')}">Email staff to create course</a>
             % endif
           </li>
         </ul>
@@ -67,7 +69,7 @@
       <article class="my-classes">
         % if user.is_active:
         <ul class="class-list">
-          %for course, url, lms_link in courses:
+          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower()):
           <li>
             <a class="class-link" href="${url}" class="class-name">
               <span class="class-name">${course}</span>