Only show banner on legacy dash for edx.org

LMS-1296

lms/envs/common.py

@@ -171,6 +171,8 @@ FEATURES = {
 
     # Enable legacy instructor dashboard
     'ENABLE_INSTRUCTOR_LEGACY_DASHBOARD': True,
+    # Is this an edX-owned domain? (used on instructor dashboard)
+    'IS_EDX_DOMAIN': False,
 
     # Toggle to enable certificates of courses on dashboard
     'ENABLE_VERIFIED_CERTIFICATES': False,

lms/envs/dev.py

@@ -36,6 +36,8 @@ FEATURES['MULTIPLE_ENROLLMENT_ROLES'] = True
 FEATURES['ENABLE_SHOPPING_CART'] = True
 FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True
 FEATURES['ENABLE_S3_GRADE_DOWNLOADS'] = True
+FEATURES['IS_EDX_DOMAIN'] = True  # Is this an edX-owned domain? (used on instructor dashboard)
+
 
 FEEDBACK_SUBMISSION_EMAIL = "dummy@example.com"
 

lms/static/js/spec/staff_debug_actions_spec.js

@@ -6,7 +6,7 @@ describe('StaffDebugActions', function() {
     describe('get_url ', function() {
         it('defines url to courseware ajax entry point', function() {
             spyOn(StaffDebug, "get_current_url").andReturn("/courses/edX/Open_DemoX/edx_demo_course/courseware/stuff");
-            expect(StaffDebug.get_url('rescore_problem')).toBe('/courses/edX/Open_DemoX/edx_demo_course/instructor_dashboard/api/rescore_problem');
+            expect(StaffDebug.get_url('rescore_problem')).toBe('/courses/edX/Open_DemoX/edx_demo_course/instructor/api/rescore_problem');
         });
     });
 
@@ -40,7 +40,7 @@ describe('StaffDebugActions', function() {
                 'delete_module': false
             });
             expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
-                '/instructor_dashboard/api/reset_student_attempts'
+                '/instructor/api/reset_student_attempts'
             );
             $('#' + fixture_id).remove();
         });
@@ -59,7 +59,7 @@ describe('StaffDebugActions', function() {
                 'delete_module': true
             });
             expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
-                '/instructor_dashboard/api/reset_student_attempts'
+                '/instructor/api/reset_student_attempts'
             );
 
             $('#' + fixture_id).remove();
@@ -79,7 +79,7 @@ describe('StaffDebugActions', function() {
                 'delete_module': false
             });
             expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
-                '/instructor_dashboard/api/rescore_problem'
+                '/instructor/api/rescore_problem'
             );
             $('#' + fixture_id).remove();
         });

lms/static/js/staff_debug_actions.js

@@ -7,7 +7,7 @@ var StaffDebug = (function(){
 
   get_url = function(action){
     var pathname = this.get_current_url();
-    var url = pathname.substr(0,pathname.indexOf('/courseware')) + '/instructor_dashboard/api/' + action;
+    var url = pathname.substr(0,pathname.indexOf('/courseware')) + '/instructor/api/' + action;
     return url;
   }
 

lms/templates/courseware/instructor_dashboard.html

-## NOTE: This is the template for the legacy instructor dashboard
-## We are no longer supporting this file or accepting changes into it.
+## NOTE: This is the template for the LEGACY instructor dashboard         ##
+## We are no longer supporting this file or accepting changes into it.    ##
+## Please see lms/templates/instructor for instructor dashboard templates ##
 
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
@@ -125,15 +126,18 @@ function goto( mode)
       %if studio_url:
         <a class="instructor-info-action" href="${studio_url}">${_("View Course in Studio")}</a>
       %endif
-      <a class="instructor-info-action beta-button" href="${ standard_dashboard_url }">${_("Back To Standard Dashboard")}</a>
+      <a class="instructor-info-action beta-button" href="${ standard_dashboard_url }">${_("Back To Instructor Dashboard")}</a>
     </div>
 
     <h1>${_("Instructor Dashboard")}</h1>
 
+    %if settings.FEATURES.get('IS_EDX_DOMAIN', False):
+    ## Only show this banner on the edx.org website (other sites may choose to show this if they wish)
     <div class="wrapper-msg urgency-low msg-warning is-shown">
-        <p>${_("You are using the legacy instructor dashboard, which we will retire in the near future.")} <a href="${ standard_dashboard_url }">${_("Return to the Standard Dashboard")} <i class="icon-double-angle-right"></i></a></p>
-          <p class="note">${_("If the Standard Dashboard is missing functionality, please let us know.")}</p>
+        <p>${_("You are using the legacy instructor dashboard, which we will retire in the near future.")} <a href="${ standard_dashboard_url }">${_("Return to the Instructor Dashboard")} <i class="icon-double-angle-right"></i></a></p>
+          <p class="note">${_("If the Instructor Dashboard is missing functionality, please contact your PM to let us know.")}</p>
     </div>
+    %endif
 
     <h2 class="navbar">[ <a href="#" onclick="goto('Grades');" class="${modeflag.get('Grades')}">Grades</a> |
           %if settings.FEATURES.get('ENABLE_PSYCHOMETRICS'):

lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html

@@ -66,7 +66,7 @@
 
   <h1>${_("Instructor Dashboard")}</h1>
     <div class="wrapper-msg urgency-low msg-warning is-shown">
-        <p>${_("We've changed the look and feel of the Instructor Dashboard. During this transition time, you can still access the old Instructor Dashboard by clicking the 'Revert to Legacy Dashboard' button in the top right hand corner.")}</p>
+        <p>${_("We've changed the look and feel of the Instructor Dashboard. During this transition time, you can still access the old Instructor Dashboard by clicking the 'Revert to Legacy Dashboard' button above.")}</p>
     </div>
 
   ## links which are tied to idash-sections below.