From bc9cce5733dad9a43aa63d7c937d4febb1b46aa8 Mon Sep 17 00:00:00 2001
From: Miles Steele <msteele@edx.org>
Date: Thu, 20 Jun 2013 10:36:06 -0400
Subject: [PATCH] add instructor dash version switch

---
 lms/djangoapps/courseware/tabs.py                   |  9 ---------
 .../instructor/views/instructor_dashboard.py        |  1 +
 lms/djangoapps/instructor/views/legacy.py           |  1 +
 lms/static/sass/course/instructor/_instructor.scss  |  9 +++++++++
 .../sass/course/instructor/_instructor_2.scss       | 13 ++++++++++---
 lms/templates/courseware/instructor_dashboard.html  |  2 ++
 .../instructor_dashboard_2.html                     |  4 +++-
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 389a1c4456..38f81a476c 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -306,10 +306,6 @@ def get_course_tabs(user, course, active_page):
                               reverse('instructor_dashboard', args=[course.id]),
                               active_page == 'instructor'))
 
-    if has_access(user, course, 'staff'):
-        tabs.append(CourseTab('Instructor 2',
-                              reverse('instructor_dashboard_2', args=[course.id]),
-                              active_page == 'instructor_2'))
     return tabs
 
 
@@ -361,11 +357,6 @@ def get_default_tabs(user, course, active_page):
         link = reverse('instructor_dashboard', args=[course.id])
         tabs.append(CourseTab('Instructor', link, active_page == 'instructor'))
 
-    if has_access(user, course, 'staff'):
-        tabs.append(CourseTab('Instructor 2',
-                              reverse('instructor_dashboard_2', args=[course.id]),
-                              active_page == 'instructor_2'))
-
     return tabs
 
 
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index aea62813db..ae318abdce 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -57,6 +57,7 @@ def instructor_dashboard_2(request, course_id):
         'djangopid': os.getpid(),
         'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
         'cohorts_ajax_url': reverse('cohorts', kwargs={'course_id': course_id}),
+        'old_dashboard_url': reverse('instructor_dashboard', kwargs={'course_id': course_id}),
         'sections': sections
     }
 
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 4a1d9dd78a..e5b646bd0e 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -771,6 +771,7 @@ def instructor_dashboard(request, course_id):
                'instructor_tasks': instructor_tasks,
                'offline_grade_log': offline_grades_available(course_id),
                'cohorts_ajax_url': reverse('cohorts', kwargs={'course_id': course_id}),
+               'beta_dashboard_url': reverse('instructor_dashboard_2', kwargs={'course_id': course_id}),
 
                'analytics_results': analytics_results,
                }
diff --git a/lms/static/sass/course/instructor/_instructor.scss b/lms/static/sass/course/instructor/_instructor.scss
index ff5cc39a84..c16ca86ea9 100644
--- a/lms/static/sass/course/instructor/_instructor.scss
+++ b/lms/static/sass/course/instructor/_instructor.scss
@@ -1,5 +1,14 @@
 .instructor-dashboard-wrapper {
 	display: table;
+  @extend .table-wrapper;
+  display: table;
+  position: relative;
+
+  .beta-button-wrapper {
+    position: absolute;
+    top: 2em;
+    right: 2em;
+  }
 
 	section.instructor-dashboard-content {
 		@extend .content;
diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index f02ada1355..a8bbed61e8 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -1,12 +1,19 @@
 .instructor-dashboard-wrapper-2 {
-  @extend .table-wrapper;
-  display: table;
+  // @extend .table-wrapper;
+  // display: table;
+  position: relative;
+
+  .olddash-button-wrapper {
+    position: absolute;
+    top: 2em;
+    right: 2em;
+  }
 
   section.instructor-dashboard-content-2 {
     @extend .content;
     padding: 40px;
     width: 100%;
-    position: relative;
+    // position: relative;
 
     .slick-header-column {
       height: 100%;
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 2b4ba98a6a..554d26b420 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -102,6 +102,8 @@ function goto( mode)
 <section class="container">
 <div class="instructor-dashboard-wrapper">
 
+  <div class="beta-button-wrapper"><a href="${ beta_dashboard_url }"> Beta Dashboard </a></div>
+
   <section class="instructor-dashboard-content">
     <h1>${_("Instructor Dashboard")}</h1>
 
diff --git a/lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html
index 7e35849d9c..23de991f94 100644
--- a/lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html
@@ -18,7 +18,8 @@
   <link rel="stylesheet" href="${static.url('css/vendor/slickgrid/slick.grid.css')}">
 </%block>
 
-<%include file="/courseware/course_navigation.html" args="active_page='instructor_2'" />
+## NOTE that instructor is set as the active page so that the instructor button lights up, even though this is the instructor_2 page.
+<%include file="/courseware/course_navigation.html" args="active_page='instructor'" />
 
 <style type="text/css"></style>
 
@@ -26,6 +27,7 @@
 
 <section class="container">
 <div class="instructor-dashboard-wrapper-2">
+<div class="olddash-button-wrapper"><a href="${ old_dashboard_url }"> Standard Dashboard </a></div>
 <section class="instructor-dashboard-content-2">
 
   <h1>Instructor Dashboard</h1>