From 09947ab094befef5dd456afc7027eb1263b58efc Mon Sep 17 00:00:00 2001
From: Brian Jacobel <bjacobel@gmail.com>
Date: Thu, 10 Nov 2016 15:49:33 -0500
Subject: [PATCH 1/7] Revert "Update to UXPL 0.17 (grids compilation
 performance work)"

---
 cms/static/sass/elements-v2/_header.scss      |   4 +-
 cms/static/sass/programs/_views.scss          |   5 -
 .../js/programs/program_details.underscore    |   2 +-
 cms/templates/program_authoring.html          |   2 +-
 lms/static/certificates/sass/_components.scss |   2 +-
 lms/static/certificates/sass/_layouts.scss    | 121 +++++++++---------
 lms/static/certificates/sass/_print.scss      |   6 +-
 lms/static/certificates/sass/_views.scss      |   8 +-
 lms/static/sass/discussion/_discussion.scss   |   3 +-
 lms/static/sass/elements/_banners.scss        |   4 +-
 lms/static/sass/elements/_course-card.scss    |  16 +--
 lms/static/sass/elements/_program-card.scss   |  29 ++---
 lms/static/sass/shared-v2/_base.scss          |   2 +-
 lms/static/sass/shared-v2/_footer.scss        |   4 +-
 lms/static/sass/shared-v2/_header.scss        |   1 +
 lms/static/sass/shared/_header.scss           |   2 +
 lms/static/sass/views/_program-details.scss   |   2 +-
 lms/static/sass/views/_program-list.scss      |   6 +-
 .../program_details_view.underscore           |   2 +-
 .../program_header_view.underscore            |   6 +-
 package.json                                  |   2 +-
 21 files changed, 110 insertions(+), 119 deletions(-)

diff --git a/cms/static/sass/elements-v2/_header.scss b/cms/static/sass/elements-v2/_header.scss
index 648995ca68..f04a3d93c9 100644
--- a/cms/static/sass/elements-v2/_header.scss
+++ b/cms/static/sass/elements-v2/_header.scss
@@ -11,7 +11,7 @@
 
   header.primary {
     @include clearfix();
-    @include grid-container();
+    @include span(12);
     @include float(none);
     box-sizing: border-box;
     max-width: $fg-max-width;
@@ -31,7 +31,7 @@
   }
 
   .wrapper-r {
-    @include span(4, before);
+    @include span(4 last);
     @include text-align(right);
   }
 
diff --git a/cms/static/sass/programs/_views.scss b/cms/static/sass/programs/_views.scss
index 741d19346a..a4b9f282fe 100644
--- a/cms/static/sass/programs/_views.scss
+++ b/cms/static/sass/programs/_views.scss
@@ -28,13 +28,8 @@
 
 .app-header {
   @include clearfix();
-  @include grid-row;
   border-bottom: 1px solid palette(grayscale, base);
   margin-bottom: 20px;
-
-  form {
-    @include span(12);
-  }
 }
 
 .course-container {
diff --git a/cms/templates/js/programs/program_details.underscore b/cms/templates/js/programs/program_details.underscore
index cb6207cabd..bb606fb03b 100644
--- a/cms/templates/js/programs/program_details.underscore
+++ b/cms/templates/js/programs/program_details.underscore
@@ -1,5 +1,5 @@
 <header class="app-header">
-    <form class="layout layout-1q3q">
+    <form>
         <div class="layout-col layout-col-b">
             <div class="js-inline-edit field">
                 <span class="js-model-value copy copy-large emphasized"><%- name %></span>
diff --git a/cms/templates/program_authoring.html b/cms/templates/program_authoring.html
index 781b8809cd..0f15d94220 100644
--- a/cms/templates/program_authoring.html
+++ b/cms/templates/program_authoring.html
@@ -17,5 +17,5 @@
 </%block>
 
 <%block name="content">
-    <div class="js-program-admin program-app layout-1q3q layout" data-home-url="${studio_home_url}" data-lms-base-url="${lms_base_url}" data-programs-api-url="${programs_api_url}" data-auth-url="${programs_token_url}" data-username="${request.user.username}"></div>
+    <div class="js-program-admin program-app layout-1q3q layout-reversed" data-home-url="${studio_home_url}" data-lms-base-url="${lms_base_url}" data-programs-api-url="${programs_api_url}" data-auth-url="${programs_token_url}" data-username="${request.user.username}"></div>
 </%block>
diff --git a/lms/static/certificates/sass/_components.scss b/lms/static/certificates/sass/_components.scss
index 3c3eeca7fa..6e32ca7cd7 100644
--- a/lms/static/certificates/sass/_components.scss
+++ b/lms/static/certificates/sass/_components.scss
@@ -228,7 +228,7 @@
     }
 
     .accomplishment-type-label {
-        @include span(10);
+        width: span(10);
         margin: 0 auto;
         font-weight: font-weight(semi-bold);
     }
diff --git a/lms/static/certificates/sass/_layouts.scss b/lms/static/certificates/sass/_layouts.scss
index 5ca564b477..087458230e 100644
--- a/lms/static/certificates/sass/_layouts.scss
+++ b/lms/static/certificates/sass/_layouts.scss
@@ -11,15 +11,15 @@
 // ------------------------------
 %layout-wrapper {
     margin-bottom: spacing-vertical(base);
-    padding: 0 5%;
+    padding: 0 (gutter()*2);
 
-    @media(min-width: $bp-screen-md) {
-        padding: 0 2.5%;
+    @include susy-breakpoint($bp-screen-md, $susy) {
+        padding: 0 gutter();
     }
 }
 
 %layout {
-    @include grid-container();
+    @include container();
 }
 
 // app header
@@ -45,9 +45,8 @@
 }
 
 .header-app-title {
-    @include text-align(center);
-    @include span(12);
     margin: 0;
+    @include text-align(center);
 }
 
 // banner
@@ -69,12 +68,12 @@
 .banner-user {
     @include text-align(center);
 
-    @media(min-width: $bp-screen-lg) {
+    @include susy-breakpoint($bp-screen-lg, $susy) {
         @include text-align(left);
     }
 
     .wrapper-copy-and-actions {
-        @include grid-container();
+        @include container();
 
         .message-copy {
             margin-bottom: spacing-vertical(small);
@@ -92,7 +91,7 @@
             // CASE: icon display only
             &.icon-only {
 
-                @media(min-width: $bp-screen-md) {
+                @include susy-breakpoint($bp-screen-md, $susy) {
                     padding: spacing-vertical(x-small) spacing-horizontal(base);
 
                     .icon {
@@ -101,7 +100,7 @@
                 }
             }
 
-            @media(min-width: $bp-screen-md) {
+            @include susy-breakpoint($bp-screen-md, $susy) {
                 display: inline-block;
                 vertical-align: middle;
                 width: auto;
@@ -127,16 +126,16 @@
 
 .footer-app-copyright {
 
-    @media(min-width: $bp-screen-md) {
-        @include span(6, after);
+    @include susy-breakpoint($bp-screen-md, $susy) {
+        @include span(6 first);
         margin-bottom: 0;
     }
 }
 
 .footer-app-nav {
 
-    @media(min-width: $bp-screen-md) {
-        @include span(6, before);
+    @include susy-breakpoint($bp-screen-md, $susy) {
+        @include span(6 last);
     }
 
     .list {
@@ -145,7 +144,7 @@
             display: block;
             margin-bottom: spacing-vertical(x-small);
 
-            @media(min-width: $bp-screen-md) {
+            @include susy-breakpoint($bp-screen-md, $susy) {
                 display: inline-block;
                 vertical-align: middle;
                 @include margin-right(spacing-horizontal(base));
@@ -156,7 +155,7 @@
 
     .list-legal {
 
-        @media(min-width: $bp-screen-md) {
+        @include susy-breakpoint($bp-screen-md, $susy) {
             @include text-align(right);
         }
     }
@@ -187,46 +186,52 @@
         top: -(spacing-vertical(base));
 
         .accomplishment-course,
-        .accomplishment-recipient,
-        .accomplishment-type {
-            @include span(12);
+        .accomplishment-recipient {
+            width: span(12);
+
+            @include susy-breakpoint($bp-screen-lg, $susy) {
+                width: span(10);
+            }
         }
 
         .accomplishment-summary,
         .accomplishment-statement-detail {
-           @include span(12);
+           width: span(12);
+
+           @include susy-breakpoint($bp-screen-lg, $susy) {
+               width: span(8);
+           }
         }
     }
 
     .accomplishment-orgs {
-        @include grid-row;
 
         .wrapper-orgs {
             @include text-align(center);
         }
 
         .wrapper-organization {
-            @include span(6);
-            @include margin-right(spacing-horizontal(base));
             display: inline-block;
             vertical-align: middle;
+            width: span(6);
             height: rem(100);
+            @include margin-right(spacing-horizontal(base));
             margin-bottom: spacing-vertical(small);
 
             &:last-child {
                 @include margin-right(0);
             }
 
-            @media(min-width: $bp-screen-md) {
-                @include span(3);
+            @include susy-breakpoint($bp-screen-md, $susy) {
+                width: span(3);
             }
 
-            @media(min-width: $bp-screen-lg) {
-                @include span(2);
+            @include susy-breakpoint($bp-screen-lg, $susy) {
+                width: span(2);
             }
 
-            @media(min-width: $bp-screen-xl) {
-                @include span(2);
+            @include susy-breakpoint($bp-screen-xl, $susy) {
+                width: span(2);
             }
         }
 
@@ -254,18 +259,18 @@
         .signatory {
             display: inline-block;
             vertical-align: middle;
-            @include span(12);
+            width: span(12);
 
-            @media(min-width: $bp-screen-md) {
-                @include span(4);
+            @include susy-breakpoint($bp-screen-md, $susy) {
+                width: span(4);
             }
 
-            @media(min-width: $bp-screen-lg) {
-                @include span(3);
+            @include susy-breakpoint($bp-screen-lg, $susy) {
+                width: span(3);
             }
 
-            @media(min-width: $bp-screen-xl) {
-                @include span(3);
+            @include susy-breakpoint($bp-screen-xl, $susy) {
+                width: span(3);
             }
 
             .signatory-signature {
@@ -281,32 +286,24 @@
         @extend %layout-wrapper;
 
         .accomplishment-metadata {
-           @extend %layout;
-
-           .accomplishment-metadata-title {
-               @include span(12);
-           }
+            @extend %layout;
         }
 
-        .wrapper-metadata {
-            @extend %layout;
+        .wrapper-metadata .metadata {
+            @extend %divider-2;
+            margin-bottom: spacing-vertical(small);
+            border-bottom-color: palette(grayscale, x-back);
+            padding-bottom: spacing-vertical(small);
 
-            .metadata {
-                @extend %divider-2;
-                margin-bottom: spacing-vertical(small);
-                border-bottom-color: palette(grayscale, x-back);
-                padding-bottom: spacing-vertical(small);
+            &:last-child {
+                border-bottom: none;
+                padding-bottom: 0;
+            }
 
-                &:last-child {
-                    border-bottom: none;
-                    padding-bottom: 0;
-                }
-
-                @media(min-width: $bp-screen-md) {
-                    @include span(4);
-                    border-bottom: none;
-                    padding-bottom: 0;
-                }
+            @include susy-breakpoint($bp-screen-md, $susy) {
+                @include gallery(4);
+                border-bottom: none;
+                padding-bottom: 0;
             }
         }
     }
@@ -321,8 +318,8 @@
         .accomplishment-brief {
             margin-bottom: spacing-vertical(small);
 
-            @media(min-width: $bp-screen-md) {
-                @include span(6);
+            @include susy-breakpoint($bp-screen-md, $susy) {
+                @include gallery(6);
             }
 
             .accomplishment-type-symbol {
@@ -346,8 +343,8 @@
                 margin-bottom: 0;
             }
 
-            @media(min-width: $bp-screen-md) {
-                @include span(6);
+            @include susy-breakpoint($bp-screen-md, $susy) {
+                @include gallery(6);
                 margin-bottom: 0;
             }
         }
diff --git a/lms/static/certificates/sass/_print.scss b/lms/static/certificates/sass/_print.scss
index 56e1f5d0c2..851cec3d38 100644
--- a/lms/static/certificates/sass/_print.scss
+++ b/lms/static/certificates/sass/_print.scss
@@ -212,7 +212,7 @@
 
         .accomplishment-statement {
             @extend %print-rendering-section;
-            @include span(8);
+            width: span(8);
             margin: 0 auto;
         }
 
@@ -244,7 +244,7 @@
 
         .accomplishment-signatories {
             @extend %print-rendering-section;
-            @include span(12, before);
+            @include span(12 last);
 
             .signatory-credentials {
                 font-size: 8pt;
@@ -271,7 +271,7 @@
             &.has-many {
 
                 .signatory {
-                    @include span(2);
+                    @include gallery(2);
                 }
             }
         }
diff --git a/lms/static/certificates/sass/_views.scss b/lms/static/certificates/sass/_views.scss
index 410d6dc37f..b8fa91dabd 100644
--- a/lms/static/certificates/sass/_views.scss
+++ b/lms/static/certificates/sass/_views.scss
@@ -26,15 +26,15 @@
   .content-main {
     margin-bottom: spacing-vertical(base);
 
-    @media(min-width: $bp-screen-md) {
-      @include span(9, after);
+    @include susy-breakpoint($bp-screen-md, $susy) {
+      @include span(9 of 12 first);
     }
   }
 
   .content-secondary {
 
-    @media(min-width: $bp-screen-md) {
-      @include span(3, before);
+    @include susy-breakpoint($bp-screen-md, $susy) {
+      @include span(3 of 12 last);
     }
   }
 }
diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss
index a9b7486131..8201afaebf 100644
--- a/lms/static/sass/discussion/_discussion.scss
+++ b/lms/static/sass/discussion/_discussion.scss
@@ -177,6 +177,7 @@ body.discussion {
 
 .container .discussion-body {
   @include clearfix();
+  display: block;
   border: none;
   background: transparent;
   box-shadow: none;
@@ -294,7 +295,7 @@ body.discussion {
 // inline discussion module
 .discussion-module {
   @extend .discussion-body;
-  display: block;
+
   position: relative;
   margin: $baseline 0;
   padding: $baseline;
diff --git a/lms/static/sass/elements/_banners.scss b/lms/static/sass/elements/_banners.scss
index 27d76fd8e9..949a908e48 100644
--- a/lms/static/sass/elements/_banners.scss
+++ b/lms/static/sass/elements/_banners.scss
@@ -22,7 +22,7 @@ $full-width-banner-margin: 20px;
             background: $black;
             opacity: 0.65;
 
-            @media(min-width: $bp-screen-md) {
+            @include susy-media($bp-screen-md) {
                 opacity: 0.4;
             }
         }
@@ -31,7 +31,7 @@ $full-width-banner-margin: 20px;
     .banner-background-image {
         height: $full-width-banner-img-height;
 
-        @media(min-width: $full-width-banner-img-width) {
+        @include susy-media($full-width-banner-img-width) {
             height: auto;
             width: 100%;
         }
diff --git a/lms/static/sass/elements/_course-card.scss b/lms/static/sass/elements/_course-card.scss
index a8acd37167..4e4f2ea9a1 100644
--- a/lms/static/sass/elements/_course-card.scss
+++ b/lms/static/sass/elements/_course-card.scss
@@ -1,7 +1,5 @@
 .course-card {
-  @include span(10);
-  @include pre(1);
-  @include post(1);
+  width: 85%;
   margin: {
     left: auto;
     right: auto;
@@ -10,7 +8,9 @@
   padding: $baseline/2 0;
 
   .section {
+    @extend .grid-container;
     @extend .grid-manual;
+
     padding: $baseline/2 $baseline;
   }
 
@@ -19,7 +19,7 @@
 
     .header-img {
       max-width: 100%;
-      @media(min-width: $bp-screen-sm) {
+      @include susy-media($bp-screen-sm) {
         max-width: 191px;
       }
     }
@@ -28,7 +28,7 @@
   .course-details {
     @include float(right);
     width: 100%;
-    @media(min-width: $bp-screen-sm) { width: calc(100% - 191px); }
+    @include susy-media($bp-screen-sm) { width: calc(100% - 191px); }
     padding-left: $baseline*1.5;
 
     .course-title {
@@ -131,17 +131,17 @@
   .message {
     margin-bottom: $baseline;
 
-    @media(min-width: $bp-screen-md) {
+    @include susy-media($bp-screen-md) {
       margin-bottom: 0;
     }
   }
-
+  
   .upgrade-message,
   .certificate-status {
     border-top: 1px solid palette(grayscale, back);
     padding-top: $baseline;
 
-    @media(min-width: $bp-screen-md) {
+    @include susy-media($bp-screen-md) {
       display: flex;
       align-items: center;
     }
diff --git a/lms/static/sass/elements/_program-card.scss b/lms/static/sass/elements/_program-card.scss
index 37b551075c..366bb471fb 100644
--- a/lms/static/sass/elements/_program-card.scss
+++ b/lms/static/sass/elements/_program-card.scss
@@ -7,20 +7,17 @@
 }
 
 .program-card {
-  @include span(12);
+  @include span(12);  
   border: 1px solid $border-color-l3;
   border-bottom: none;
   margin-bottom: $baseline;
   position: relative;
 
-  @media(min-width: $bp-screen-md) {
+  @include susy-media($bp-screen-md) {
     @include span(6);
 
     &:nth-child(2n) {
-      @include span(6, before);
-    }
-    &:nth-child(2n+1) {
-      @include span(6, after);
+      @include margin-right(0);
     }
   }
 
@@ -33,7 +30,7 @@
     border: 0;
     z-index: 1;
     opacity: 0.8;
-
+    
     &:active,
     &:hover,
     &:focus {
@@ -45,9 +42,9 @@
       overflow: hidden;
       height: 166px;
 
-      @media(min-width: $bp-screen-sm) { height: 242px; }
-      @media(min-width: $bp-screen-md) { height: 116px; }
-      @media(min-width: $bp-screen-lg) { height: 145px; }
+      @include susy-media($bp-screen-sm) { height: 242px; }
+      @include susy-media($bp-screen-md) { height: 116px; }
+      @include susy-media($bp-screen-lg) { height: 145px; }
 
       .banner-image {
         @include left(50%);
@@ -65,9 +62,9 @@
     position: relative;
     margin-top: 156px;
 
-    @media(min-width: $bp-screen-sm) { margin-top: 232px; }
-    @media(min-width: $bp-screen-md) { margin-top: 106px; }
-    @media(min-width: $bp-screen-lg) { margin-top: 135px; }
+    @include susy-media($bp-screen-sm) { margin-top: 232px; }
+    @include susy-media($bp-screen-md) { margin-top: 106px; }
+    @include susy-media($bp-screen-lg) { margin-top: 135px; }
   }
 
   .meta-info {
@@ -79,13 +76,13 @@
   }
 
   .organization {
-    @include span(6, none);
+    @include span(6);
     white-space: nowrap;
     overflow: hidden;
   }
 
   .category {
-    @include span(6, none);
+    @include span(6);
     @include text-align(right);
 
     .category-text {
@@ -116,7 +113,7 @@
       color: palette(grayscale, dark);
       line-height: 1;
     }
-
+ 
     .secondary {
       @extend %hide-until-focus;
     }
diff --git a/lms/static/sass/shared-v2/_base.scss b/lms/static/sass/shared-v2/_base.scss
index e3354f11bf..e96a278064 100644
--- a/lms/static/sass/shared-v2/_base.scss
+++ b/lms/static/sass/shared-v2/_base.scss
@@ -10,7 +10,7 @@
 }
 
 .content-wrapper {
-    @include span(12, none);
+    width: span(12);
     margin: 0 auto;
 
     @media print {
diff --git a/lms/static/sass/shared-v2/_footer.scss b/lms/static/sass/shared-v2/_footer.scss
index dd66047bad..d4d54c8a9f 100644
--- a/lms/static/sass/shared-v2/_footer.scss
+++ b/lms/static/sass/shared-v2/_footer.scss
@@ -38,7 +38,7 @@
         .colophon {
             @include span(12);
 
-            @media(min-width: $bp-screen-sm) {
+            @include susy-media($bp-screen-sm) {
                 @include span(8);
             }
 
@@ -168,7 +168,7 @@
             @include text-align(right);
             vertical-align: bottom;
 
-            @media(min-width: $bp-screen-sm) {
+            @include susy-media($bp-screen-sm) {
                 @include span(4);
                 @include margin-right(0);
             }
diff --git a/lms/static/sass/shared-v2/_header.scss b/lms/static/sass/shared-v2/_header.scss
index 5dcfcb9192..affbbe7199 100644
--- a/lms/static/sass/shared-v2/_header.scss
+++ b/lms/static/sass/shared-v2/_header.scss
@@ -12,6 +12,7 @@
     .wrapper-header {
         @include clearfix();
         box-sizing: border-box;
+        height: 74px;
         margin: 0 auto;
         padding: 10px 10px 0;
         width: 100%;
diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index 1379b44179..8e816f6c5d 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -16,6 +16,7 @@
     margin: 0 auto;
     padding: 18px ($baseline/2) 0;
     max-width: grid-width(12);
+    width: 100%;
   }
 
   h1.logo {
@@ -323,6 +324,7 @@
 
   .nav-courseware {
     @include float(right);
+    margin-top: ($baseline/4);
     list-style: none;
 
     li, div {
diff --git a/lms/static/sass/views/_program-details.scss b/lms/static/sass/views/_program-details.scss
index f7d5608cec..49dad91347 100644
--- a/lms/static/sass/views/_program-details.scss
+++ b/lms/static/sass/views/_program-details.scss
@@ -36,7 +36,7 @@
     .breadcrumb-wrapper {
         padding: $full-width-banner-margin;
 
-        @media(min-width: $bp-screen-xl) {
+        @include susy-media(1200px) {
             padding-left: 0;
         }
     }
diff --git a/lms/static/sass/views/_program-list.scss b/lms/static/sass/views/_program-list.scss
index 1f552a98b4..8e33f88911 100644
--- a/lms/static/sass/views/_program-list.scss
+++ b/lms/static/sass/views/_program-list.scss
@@ -3,10 +3,9 @@
 }
 
 .program-cards-container {
-  @include grid-container();
   @include span(12);
 
-  @media(min-width: $bp-screen-md) {
+  @include susy-media($bp-screen-md) {
     @include span(9);
   }
 }
@@ -16,7 +15,7 @@
   @include float(right);
   margin-bottom: $baseline;
 
-  @media(min-width: $bp-screen-md) {
+  @include susy-media($bp-screen-md) {
     @include span(3);
   }
 
@@ -67,7 +66,6 @@
 }
 
 .empty-programs-message {
-  @include span(12);
   border: 3px solid $gray-l4;
   background: $gray-l6;
   padding: ($baseline*2) 0;
diff --git a/lms/templates/learner_dashboard/program_details_view.underscore b/lms/templates/learner_dashboard/program_details_view.underscore
index b180cb1331..b38a3fea75 100644
--- a/lms/templates/learner_dashboard/program_details_view.underscore
+++ b/lms/templates/learner_dashboard/program_details_view.underscore
@@ -1,6 +1,6 @@
 <header class="js-program-header program-header full-width-banner"></header>
 <div class="program-details-content grid-container">
 	<div class="js-program-progress-view"></div>
-	<div class="js-course-list row"></div>
+	<div class="js-course-list"></div>
 	<aside class="js-course-sidebar"></aside>
 </div>
diff --git a/lms/templates/learner_dashboard/program_header_view.underscore b/lms/templates/learner_dashboard/program_header_view.underscore
index 7fe8c90703..e4664d2545 100644
--- a/lms/templates/learner_dashboard/program_header_view.underscore
+++ b/lms/templates/learner_dashboard/program_header_view.underscore
@@ -4,10 +4,10 @@
         <source srcset="<%- programData.banner_image_urls.w726h242 %>" media="(min-width: <%- breakpoints.min.medium %>)">
         <img class="banner-background-image" srcset="<%- programData.banner_image_urls.w348h116 %>" alt="">
     </picture>
-
+    
     <div class="banner-content grid-container">
-        <h2 class="hd-1 title row"><%- programData.name %></h2>
-        <p class="hd-4 subtitle row"><%- programData.subtitle %></p>
+        <h2 class="hd-1 title"><%- programData.name %></h2>
+        <p class="hd-4 subtitle"><%- programData.subtitle %></p>
         <% if (programData.organizations.length) { %>
             <div class="org-wrapper">
               <% _.each(programData.organizations, function(org) { %>
diff --git a/package.json b/package.json
index c25d153087..657f0b600a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "backbone": "~1.3.2",
     "backbone-validation": "~0.11.5",
     "coffee-script": "1.6.1",
-    "edx-pattern-library": "~0.17.0",
+    "edx-pattern-library": "0.16.6",
     "edx-ui-toolkit": "1.5.0",
     "jquery": "~2.2.0",
     "jquery-migrate": "^1.4.1",

From 1fa805a05299c805431669a443c16717e62aec19 Mon Sep 17 00:00:00 2001
From: Gregory Martin <greg@edx.org>
Date: Mon, 14 Nov 2016 14:33:23 -0500
Subject: [PATCH 2/7] js bundling error

---
 lms/envs/common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 684529b6fb..948a6452c2 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1572,6 +1572,7 @@ PIPELINE_JS = {
                 'js/sticky_filter.js',
                 'js/query-params.js',
                 'common/js/vendor/moment-with-locales.js',
+                'common/js/vendor/moment-timezone-with-data.js',
             ]
         ),
         'output_filename': 'js/lms-application.js',
@@ -1720,6 +1721,7 @@ REQUIRE_JS_PATH_OVERRIDES = {
     'js/bookmarks/views/bookmark_button': 'js/bookmarks/views/bookmark_button.js',
     'js/views/message_banner': 'js/views/message_banner.js',
     'moment': 'common/js/vendor/moment-with-locales.js',
+    'moment-timezone': 'common/js/vendor/moment-timezone-with-data.js',
     'js/courseware/course_home_events': 'js/courseware/course_home_events.js',
     'js/courseware/accordion_events': 'js/courseware/accordion_events.js',
     'js/courseware/link_clicked_events': 'js/courseware/link_clicked_events.js',

From 5b4048ddffb51d63315e87958363cbb11016f3e5 Mon Sep 17 00:00:00 2001
From: Gregory Martin <greg@edx.org>
Date: Mon, 14 Nov 2016 14:19:35 -0500
Subject: [PATCH 3/7] fix for send to transifex

---
 .../js/student_account/views/account_settings_factory.js   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lms/static/js/student_account/views/account_settings_factory.js b/lms/static/js/student_account/views/account_settings_factory.js
index c03ac83aba..419c1e1e7c 100644
--- a/lms/static/js/student_account/views/account_settings_factory.js
+++ b/lms/static/js/student_account/views/account_settings_factory.js
@@ -115,12 +115,7 @@
                                 required: true,
                                 title: gettext('Time Zone'),
                                 valueAttribute: 'time_zone',
-                                helpMessage: gettext(
-                                    'Select the time zone for displaying course dates. ' +
-                                    'If you do not specify a time zone, course dates, ' +
-                                    'including assignment deadlines, will be displayed ' +
-                                    'in your browser\'s local time zone.'
-                                ),
+                                helpMessage: gettext('Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser\'s local time zone.'), // eslint-disable-line max-len
                                 groupOptions: [{
                                     groupTitle: gettext('All Time Zones'),
                                     selectOptions: fieldsData.time_zone.options

From 18e7322e8d95f9bcf5f2f265c6f2e43ae346f81d Mon Sep 17 00:00:00 2001
From: alisan617 <atang@edx.org>
Date: Mon, 14 Nov 2016 21:43:03 -0500
Subject: [PATCH 4/7] Revert "Refactor discussion tab UI code into parts to be
 reusable for inline discussions"

This reverts commit e80d9b5792467eba85527f69d0fb87770bbdf63c.
---
 .../views/discussion_thread_list_view.js      | 339 ++++++++++++++++--
 .../view/discussion_thread_edit_view_spec.js  |   2 +-
 .../view/discussion_thread_list_view_spec.js  | 305 +++++++++++-----
 .../view/discussion_thread_show_view_spec.js  |   2 +-
 .../view/discussion_thread_view_spec.js       |  10 +-
 .../view/response_comment_view_spec.js        |   2 +-
 .../js/spec_helpers/discussion_spec_helper.js |  29 +-
 .../discussion}/discussion-home.underscore    |   0
 .../tests/discussion/test_discussion.py       |   2 -
 .../discussion/js/discussion_board_factory.js |  82 +++--
 .../js/discussion_profile_page_factory.js     |  17 +-
 .../static/discussion/js/discussion_router.js |  47 ++-
 .../js/spec/discussion_board_factory_spec.js  |  39 +-
 .../js/spec/discussion_board_view_spec.js     |  58 ---
 .../spec/views/discussion_search_view_spec.js |  36 ++
 .../js/views/discussion_board_view.js         | 336 -----------------
 .../js/views/discussion_search_view.js        |  19 +-
 .../discussion/discussion_board.html          |   2 -
 lms/static/lms/js/spec/main.js                |  33 +-
 .../discussion/_js_body_dependencies.html     |   3 -
 .../discussion/_thread_list_template.html     |   3 +-
 .../discussion/_underscore_templates.html     |   2 +-
 22 files changed, 704 insertions(+), 664 deletions(-)
 rename {lms/djangoapps/discussion/static/discussion/templates => common/static/common/templates/discussion}/discussion-home.underscore (100%)
 delete mode 100644 lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
 create mode 100644 lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
 delete mode 100644 lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js

diff --git a/common/static/common/js/discussion/views/discussion_thread_list_view.js b/common/static/common/js/discussion/views/discussion_thread_list_view.js
index 7ab85715d6..5ac5c91295 100644
--- a/common/static/common/js/discussion/views/discussion_thread_list_view.js
+++ b/common/static/common/js/discussion/views/discussion_thread_list_view.js
@@ -1,7 +1,6 @@
-/* globals _, Backbone, Content, Discussion, DiscussionUtil, DiscussionThreadView, DiscussionThreadListView */
+/* globals _, Backbone, Content, Discussion, DiscussionUtil */
 (function() {
     'use strict';
-    /* eslint-disable */
     var __hasProp = {}.hasOwnProperty,
         __extends = function(child, parent) {
             for (var key in parent) {
@@ -18,7 +17,6 @@
             child.__super__ = parent.prototype;
             return child;
         };
-        /* eslint-enable */
 
     if (typeof Backbone !== 'undefined' && Backbone !== null) {
         this.DiscussionThreadListView = (function(_super) {
@@ -38,6 +36,24 @@
                 this.chooseFilter = function() {
                     return DiscussionThreadListView.prototype.chooseFilter.apply(self, arguments);
                 };
+                this.keyboardBinding = function() {
+                    return DiscussionThreadListView.prototype.keyboardBinding.apply(self, arguments);
+                };
+                this.filterTopics = function() {
+                    return DiscussionThreadListView.prototype.filterTopics.apply(self, arguments);
+                };
+                this.toggleBrowseMenu = function() {
+                    return DiscussionThreadListView.prototype.toggleBrowseMenu.apply(self, arguments);
+                };
+                this.hideBrowseMenu = function() {
+                    return DiscussionThreadListView.prototype.hideBrowseMenu.apply(self, arguments);
+                };
+                this.showBrowseMenu = function() {
+                    return DiscussionThreadListView.prototype.showBrowseMenu.apply(self, arguments);
+                };
+                this.isBrowseMenuVisible = function() {
+                    return DiscussionThreadListView.prototype.isBrowseMenuVisible.apply(self, arguments);
+                };
                 this.threadRemoved = function() {
                     return DiscussionThreadListView.prototype.threadRemoved.apply(self, arguments);
                 };
@@ -56,6 +72,9 @@
                 this.renderThreads = function() {
                     return DiscussionThreadListView.prototype.renderThreads.apply(self, arguments);
                 };
+                this.updateSidebar = function() {
+                    return DiscussionThreadListView.prototype.updateSidebar.apply(self, arguments);
+                };
                 this.addAndSelectThread = function() {
                     return DiscussionThreadListView.prototype.addAndSelectThread.apply(self, arguments);
                 };
@@ -71,16 +90,17 @@
                 this.addSearchAlert = function() {
                     return DiscussionThreadListView.prototype.addSearchAlert.apply(self, arguments);
                 };
-                this.performSearch = function() {
-                    return DiscussionThreadListView.prototype.performSearch.apply(self, arguments);
-                };
-                return DiscussionThreadListView.__super__.constructor.apply(this, arguments); // eslint-disable-line no-underscore-dangle, max-len
+                return DiscussionThreadListView.__super__.constructor.apply(this, arguments);
             }
 
             DiscussionThreadListView.prototype.events = {
                 'keypress .forum-nav-browse-filter-input': function(event) {
                     return DiscussionUtil.ignoreEnterKey(event);
                 },
+                'keyup .forum-nav-browse-filter-input': 'filterTopics',
+                'keydown .forum-nav-browse-filter-input': 'keyboardBinding',
+                'click .forum-nav-browse-menu-wrapper': 'ignoreClick',
+                'click .forum-nav-browse-title': 'selectTopicHandler',
                 'change .forum-nav-sort-control': 'sortThreads',
                 'click .forum-nav-thread-link': 'threadSelected',
                 'click .forum-nav-load-more-link': 'loadMorePages',
@@ -97,6 +117,8 @@
                 this.collection.on('change', this.reloadDisplayedCollection);
                 this.discussionIds = '';
                 this.collection.on('reset', function(discussion) {
+                    var board;
+                    board = $('.current-board').html();
                     self.displayedCollection.current_page = discussion.current_page;
                     self.displayedCollection.pages = discussion.pages;
                     return self.displayedCollection.reset(discussion.models);
@@ -107,15 +129,23 @@
                 this.boardName = null;
                 this.current_search = '';
                 this.mode = 'all';
+                this.keyCodes = {
+                    enter: 13,
+                    escape: 27,
+                    up: 38,
+                    down: 40
+                };
+                this.filterInputReset();
+                this.selectedTopic = $('.forum-nav-browse-menu-item:visible .forum-nav-browse-title.is-focused');
                 this.searchAlertCollection = new Backbone.Collection([], {
                     model: Backbone.Model
                 });
                 this.searchAlertCollection.on('add', function(searchAlert) {
                     var content;
                     content = edx.HtmlUtils.template($('#search-alert-template').html())({
-                        messageHtml: searchAlert.attributes.message,
-                        cid: searchAlert.cid,
-                        css_class: searchAlert.attributes.css_class
+                        'messageHtml': searchAlert.attributes.message,
+                        'cid': searchAlert.cid,
+                        'css_class': searchAlert.attributes.css_class
                     });
                     edx.HtmlUtils.append(self.$('.search-alerts'), content);
                     return self.$('#search-alert-' + searchAlert.cid + ' .dismiss')
@@ -130,6 +160,7 @@
                     return self.$('.search-alerts').empty();
                 });
                 this.template = edx.HtmlUtils.template($('#thread-list-template').html());
+                this.homeTemplate = edx.HtmlUtils.template($('#discussion-home-template').html());
                 this.threadListItemTemplate = edx.HtmlUtils.template($('#thread-list-item-template').html());
             };
 
@@ -141,9 +172,10 @@
              * @returns {Backbone.Model}
              */
             DiscussionThreadListView.prototype.addSearchAlert = function(message, cssClass) {
-                var searchAlertModel = new Backbone.Model({message: message, css_class: cssClass || ''});
-                this.searchAlertCollection.add(searchAlertModel);
-                return searchAlertModel;
+                var m;
+                m = new Backbone.Model({message: message, css_class: cssClass || ''});
+                this.searchAlertCollection.add(m);
+                return m;
             };
 
             DiscussionThreadListView.prototype.removeSearchAlert = function(searchAlert) {
@@ -164,7 +196,7 @@
                 $currentElement.replaceWith($content);
                 this.showMetadataAccordingToSort();
                 if (active) {
-                    this.setActiveThread(threadId);
+                    return this.setActiveThread(threadId);
                 }
             };
 
@@ -180,6 +212,37 @@
                 });
             };
 
+            DiscussionThreadListView.prototype.updateSidebar = function() {
+                var amount, browseFilterHeight, discussionBody, discussionBottomOffset, discussionsBodyBottom,
+                    discussionsBodyTop, headerHeight, refineBarHeight, scrollTop, sidebar, sidebarHeight, topOffset,
+                    windowHeight;
+                scrollTop = $(window).scrollTop();
+                windowHeight = $(window).height();
+                discussionBody = $('.discussion-column');
+                discussionsBodyTop = discussionBody[0] ? discussionBody.offset().top : void 0;
+                discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight();
+                sidebar = $('.forum-nav');
+                if (scrollTop > discussionsBodyTop - this.sidebar_padding) {
+                    sidebar.css('top', scrollTop - discussionsBodyTop + this.sidebar_padding);
+                } else {
+                    sidebar.css('top', '0');
+                }
+                sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, this.sidebar_padding);
+                topOffset = scrollTop + windowHeight;
+                discussionBottomOffset = discussionsBodyBottom + this.sidebar_padding;
+                amount = Math.max(topOffset - discussionBottomOffset, 0);
+                sidebarHeight = sidebarHeight - this.sidebar_padding - amount;
+                sidebarHeight = Math.min(sidebarHeight + 1, discussionBody.outerHeight());
+                sidebar.css('height', sidebarHeight);
+                headerHeight = this.$('.forum-nav-header').outerHeight();
+                refineBarHeight = this.$('.forum-nav-refine-bar').outerHeight();
+                browseFilterHeight = this.$('.forum-nav-browse-filter').outerHeight();
+                this.$('.forum-nav-thread-list')
+                    .css('height', (sidebarHeight - headerHeight - refineBarHeight - 2) + 'px');
+                this.$('.forum-nav-browse-menu')
+                    .css('height', (sidebarHeight - headerHeight - browseFilterHeight - 2) + 'px');
+            };
+
             DiscussionThreadListView.prototype.ignoreClick = function(event) {
                 return event.stopPropagation();
             };
@@ -198,14 +261,16 @@
                 this.$('.forum-nav-sort-control option').removeProp('selected');
                 this.$('.forum-nav-sort-control option[value=' + this.collection.sort_preference + ']')
                     .prop('selected', true);
+                $(window).bind('load scroll resize', this.updateSidebar);
                 this.displayedCollection.on('reset', this.renderThreads);
                 this.displayedCollection.on('thread:remove', this.renderThreads);
                 this.displayedCollection.on('change:commentable_id', function() {
                     if (self.mode === 'commentables') {
-                        self.retrieveDiscussions(self.discussionIds.split(','));
+                        return self.retrieveDiscussions(self.discussionIds.split(','));
                     }
                 });
                 this.renderThreads();
+                this.showBrowseMenu(true);
                 return this;
             };
 
@@ -219,6 +284,7 @@
                 }
                 this.showMetadataAccordingToSort();
                 this.renderMorePages();
+                this.updateSidebar();
                 this.trigger('threads:rendered');
             };
 
@@ -253,7 +319,7 @@
             };
 
             DiscussionThreadListView.prototype.loadMorePages = function(event) {
-                var error, lastThread, loadMoreElem, loadingElem, options, ref,
+                var error, lastThread, loadMoreElem, loadingElem, options, _ref,
                     self = this;
                 if (event) {
                     event.preventDefault();
@@ -287,11 +353,9 @@
                     if (this.group_id) {
                         options.group_id = this.group_id;
                     }
-                    break;
-                default:
                 }
-                ref = this.collection.last();
-                lastThread = ref ? ref.get('id') : void 0;
+                _ref = this.collection.last();
+                lastThread = _ref ? _ref.get('id') : void 0;
                 if (lastThread) {
                     this.once('threads:rendered', function() {
                         var classSelector =
@@ -301,8 +365,8 @@
                     });
                 } else {
                     this.once('threads:rendered', function() {
-                        var ref1 = $('.forum-nav-thread-link').first();
-                        return ref1 ? ref1.focus() : void 0;
+                        var _ref1 = $('.forum-nav-thread-link').first();
+                        return _ref1 ? _ref1.focus() : void 0;
                     });
                 }
                 error = function() {
@@ -357,10 +421,224 @@
                     .prepend($srElem);
             };
 
+            DiscussionThreadListView.prototype.goHome = function() {
+                var url, $templateContent;
+                $templateContent = $(this.homeTemplate().toString());
+                $('.forum-content').empty().append($templateContent);
+                $('.forum-nav-thread-list a').removeClass('is-active').find('.sr')
+                    .remove();
+                $('input.email-setting').bind('click', this.updateEmailNotifications);
+                url = DiscussionUtil.urlFor('notifications_status', window.user.get('id'));
+                DiscussionUtil.safeAjax({
+                    url: url,
+                    type: 'GET',
+                    success: function(response) {
+                        $('input.email-setting').prop('checked', response.status);
+                    }
+                });
+            };
+
+            DiscussionThreadListView.prototype.isBrowseMenuVisible = function() {
+                return this.$('.forum-nav-browse-menu-wrapper').is(':visible');
+            };
+
+            DiscussionThreadListView.prototype.showBrowseMenu = function(initialLoad) {
+                if (!this.isBrowseMenuVisible()) {
+                    this.$('.forum-nav-browse-menu-wrapper').show();
+                    this.$('.forum-nav-thread-list-wrapper').hide();
+                    if (!initialLoad) {
+                        $('.forum-nav-browse-filter-input').focus();
+                        this.filterInputReset();
+                    }
+                    $('body').bind('click', this.hideBrowseMenu);
+                    return this.updateSidebar();
+                }
+            };
+
+            DiscussionThreadListView.prototype.hideBrowseMenu = function() {
+                var selectedTopicList = this.$('.forum-nav-browse-title.is-focused');
+                if (this.isBrowseMenuVisible()) {
+                    selectedTopicList.removeClass('is-focused');
+                    this.$('.forum-nav-browse-menu-wrapper').hide();
+                    this.$('.forum-nav-thread-list-wrapper').show();
+                    if (this.selectedTopicId !== 'undefined') {
+                        this.$('.forum-nav-browse-filter-input').attr('aria-activedescendant', this.selectedTopicId);
+                    }
+                    $('body').unbind('click', this.hideBrowseMenu);
+                    return this.updateSidebar();
+                }
+            };
+
+            DiscussionThreadListView.prototype.toggleBrowseMenu = function(event) {
+                var inputText = $('.forum-nav-browse-filter-input').val();
+                event.preventDefault();
+                event.stopPropagation();
+                if (this.isBrowseMenuVisible()) {
+                    return this.hideBrowseMenu();
+                } else {
+                    if (inputText !== '') {
+                        this.filterTopics(inputText);
+                    }
+                    return this.showBrowseMenu();
+                }
+            };
+
+            DiscussionThreadListView.prototype.getPathText = function(item) {
+                var path, pathTitles;
+                path = item.parents('.forum-nav-browse-menu-item').andSelf();
+                pathTitles = path.children('.forum-nav-browse-title').map(function(i, elem) {
+                    return $(elem).text();
+                }).get();
+                return pathTitles.join(' / ');
+            };
+
+            DiscussionThreadListView.prototype.getBreadcrumbText = function($item) {
+                var $parentSubMenus = $item.parents('.forum-nav-browse-submenu'),
+                    crumbs = [],
+                    subTopic = $('.forum-nav-browse-title', $item)
+                        .first()
+                        .text()
+                        .trim();
+
+                $parentSubMenus.each(function(i, el) {
+                    crumbs.push($(el).siblings('.forum-nav-browse-title')
+                        .first()
+                        .text()
+                        .trim()
+                    );
+                });
+
+                if (subTopic !== 'All Discussions') {
+                    crumbs.push(subTopic);
+                }
+
+                return crumbs;
+            };
+
+            DiscussionThreadListView.prototype.selectOption = function(element) {
+                var activeDescendantId, activeDescendantText;
+                if (this.selectedTopic.length > 0) {
+                    this.selectedTopic.removeClass('is-focused');
+                }
+                if (element) {
+                    element.addClass('is-focused');
+                    activeDescendantId = element.parent().attr('id');
+                    activeDescendantText = element.text();
+                    this.selectedTopic = element;
+                    this.selectedTopicId = activeDescendantId;
+                    $('.forum-nav-browse-filter-input')
+                        .attr('aria-activedescendant', activeDescendantId)
+                        .val(activeDescendantText);
+                }
+            };
+
+            DiscussionThreadListView.prototype.filterInputReset = function() {
+                this.filterEnabled = true;
+                this.selectedTopicIndex = -1;
+                this.selectedTopicId = null;
+            };
+
+            DiscussionThreadListView.prototype.keyboardBinding = function(event) {
+                var $inputText = $('.forum-nav-browse-filter-input'),
+                    $filteredMenuItems = $('.forum-nav-browse-menu-item:visible'),
+                    filteredMenuItemsLen = $filteredMenuItems.length,
+                    $curOption = $filteredMenuItems.eq(0).find('.forum-nav-browse-title').eq(0),
+                    $activeOption, $prev, $next;
+
+                switch (event.keyCode) {
+                case this.keyCodes.enter:
+                    $activeOption = $filteredMenuItems.find('.forum-nav-browse-title.is-focused');
+                    if ($inputText.val() !== '') {
+                        $activeOption.trigger('click');
+                        this.filterInputReset();
+                    }
+                    break;
+
+                case this.keyCodes.escape:
+                    this.toggleBrowseMenu(event);
+                    $('.forum-nav-browse-filter-input').val('');
+                    this.filterInputReset();
+                    $('.all-topics').trigger('click');
+                    break;
+
+                case this.keyCodes.up:
+                    if (this.selectedTopicIndex > 0) {
+                        this.selectedTopicIndex -= 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $prev = $('.forum-nav-browse-menu-item:visible')
+                            .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                            .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $prev.addClass('is-focused');
+                        }
+                        this.selectOption($prev);
+                    }
+                    break;
+
+                case this.keyCodes.down:
+                    if (this.selectedTopicIndex < filteredMenuItemsLen - 1) {
+                        this.selectedTopicIndex += 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $next = $('.forum-nav-browse-menu-item:visible')
+                                .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                                .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $next.addClass('is-focused');
+                        }
+                        this.selectOption($next);
+                    }
+                    break;
+
+                default:
+                    break;
+                }
+                return true;
+            };
+
+            DiscussionThreadListView.prototype.filterTopics = function() {
+                var items, query, filteredItems,
+                    self = this;
+                query = this.$('.forum-nav-browse-filter-input').val();
+                items = this.$('.forum-nav-browse-menu-item');
+                if (query.length === 0) {
+                    items.find('.forum-nav-browse-title.is-focused').removeClass('is-focused');
+                    return items.show();
+                } else {
+                    if (this.filterEnabled) {
+                        items.hide();
+                        filteredItems = items.each(function(i, item) {
+                            var path, pathText,
+                                $item = $(item);
+                            if (!$item.is(':visible')) {
+                                pathText = self.getPathText($item).toLowerCase();
+                                if (query.split(' ').every(function(term) {
+                                    return pathText.search(term.toLowerCase()) !== -1;
+                                })) {
+                                    path = $item.parents('.forum-nav-browse-menu-item').andSelf();
+                                    return path.add($item.find('.forum-nav-browse-menu-item')).show();
+                                }
+                            }
+                            return filteredItems;
+                        });
+                    }
+                    return filteredItems;
+                }
+            };
+
+            DiscussionThreadListView.prototype.selectTopicHandler = function(event) {
+                event.preventDefault();
+                return this.selectTopic($(event.target));
+            };
+
             DiscussionThreadListView.prototype.selectTopic = function($target) {
                 var allItems, discussionIds, $item;
+                this.hideBrowseMenu();
                 $item = $target.closest('.forum-nav-browse-menu-item');
 
+                this.trigger('topic:selected', this.getBreadcrumbText($item));
+
                 if ($item.hasClass('forum-nav-browse-menu-all')) {
                     this.discussionIds = '';
                     this.$('.forum-nav-filter-cohort').show();
@@ -389,8 +667,9 @@
             };
 
             DiscussionThreadListView.prototype.retrieveDiscussion = function(discussionId, callback) {
-                var url = DiscussionUtil.urlFor('retrieve_discussion', discussionId),
+                var url,
                     self = this;
+                url = DiscussionUtil.urlFor('retrieve_discussion', discussionId);
                 return DiscussionUtil.safeAjax({
                     url: url,
                     type: 'GET',
@@ -407,8 +686,8 @@
                 });
             };
 
-            DiscussionThreadListView.prototype.retrieveDiscussions = function(discussionIds) {
-                this.discussionIds = discussionIds.join(',');
+            DiscussionThreadListView.prototype.retrieveDiscussions = function(discussion_ids) {
+                this.discussionIds = discussion_ids.join(',');
                 this.mode = 'commentables';
                 return this.retrieveFirstPage();
             };
@@ -430,18 +709,19 @@
             };
 
             DiscussionThreadListView.prototype.performSearch = function($searchInput) {
+                this.hideBrowseMenu();
                 // trigger this event so the breadcrumbs can update as well
                 this.trigger('search:initiated');
                 this.searchFor($searchInput.val(), $searchInput);
             };
 
             DiscussionThreadListView.prototype.searchFor = function(text, $searchInput) {
-                var url = DiscussionUtil.urlFor('search'),
-                    self = this;
+                var url, self = this;
                 this.clearSearchAlerts();
                 this.clearFilters();
                 this.mode = 'search';
                 this.current_search = text;
+                url = DiscussionUtil.urlFor('search');
                 /*
                  TODO: This might be better done by setting discussion.current_page=0 and
                  calling discussion.loadMorePages
@@ -509,7 +789,6 @@
                                 return self.searchForUser(text);
                             }
                         }
-                        return response;
                     }
                 });
             };
@@ -537,9 +816,9 @@
                             );
 
                             message = edx.HtmlUtils.interpolateHtml(
-                                gettext('Show posts by {username}.'), {username: username}
+                                gettext('Show posts by {username}.'), {'username': username}
                             );
-                            self.addSearchAlert(message, 'search-by-user');
+                            return self.addSearchAlert(message, 'search-by-user');
                         }
                     }
                 });
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
index 6b3c3d2921..c2d876ae73 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
@@ -16,7 +16,7 @@
                 'title': 'test thread title'
             });
             this.thread = new Thread(this.threadData);
-            this.course_settings = DiscussionSpecHelper.createTestCourseSettings();
+            this.course_settings = DiscussionSpecHelper.makeCourseSettings();
 
             this.createEditView = function(options) {
                 options = _.extend({
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
index b142c6b784..7ccf8018fa 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
@@ -266,88 +266,6 @@
                 changeSorting(this.threads, 'votes', 'comments', ['Thread1', 'Thread4', 'Thread3', 'Thread2']);
             });
         });
-
-        describe('post type renders correctly', function() {
-            it('for discussion', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'discussion'
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-comments');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('discussion');
-            });
-
-            it('for answered question', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'question',
-                    endorsed: true
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-check-square-o');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('answered question');
-            });
-
-            it('for unanswered question', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'question',
-                    endorsed: false
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-question');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('unanswered question');
-            });
-        });
-
-        describe('post labels render correctly', function() {
-            beforeEach(function() {
-                this.moderatorId = '42';
-                this.administratorId = '43';
-                this.communityTaId = '44';
-                return DiscussionUtil.loadRoles({
-                    Moderator: [parseInt(this.moderatorId, 10)],
-                    Administrator: [parseInt(this.administratorId, 10)],
-                    'Community TA': [parseInt(this.communityTaId, 10)]
-                });
-            });
-
-            it('for pinned', function() {
-                renderSingleThreadWithProps({
-                    pinned: true
-                });
-                return expect($('.post-label-pinned').length).toEqual(1);
-            });
-
-            it('for following', function() {
-                renderSingleThreadWithProps({
-                    subscribed: true
-                });
-                return expect($('.post-label-following').length).toEqual(1);
-            });
-
-            it('for moderator', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.moderatorId
-                });
-                return expect($('.post-label-by-staff').length).toEqual(1);
-            });
-
-            it('for administrator', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.administratorId
-                });
-                return expect($('.post-label-by-staff').length).toEqual(1);
-            });
-
-            it('for community TA', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.communityTaId
-                });
-                return expect($('.post-label-by-community-ta').length).toEqual(1);
-            });
-
-            it('when none should be present', function() {
-                renderSingleThreadWithProps({});
-                return expect($('.forum-nav-thread-labels').length).toEqual(0);
-            });
-        });
-
         describe('search alerts', function() {
             var testAlertMessages, getAlertMessagesAndClasses;
 
@@ -542,5 +460,228 @@
             });
         });
 
+        describe('post type renders correctly', function() {
+            it('for discussion', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'discussion'
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-comments');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('discussion');
+            });
+
+            it('for answered question', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'question',
+                    endorsed: true
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-check-square-o');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('answered question');
+            });
+
+            it('for unanswered question', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'question',
+                    endorsed: false
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-question');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('unanswered question');
+            });
+        });
+
+        describe('post labels render correctly', function() {
+            beforeEach(function() {
+                this.moderatorId = '42';
+                this.administratorId = '43';
+                this.communityTaId = '44';
+                return DiscussionUtil.loadRoles({
+                    'Moderator': [parseInt(this.moderatorId)],
+                    'Administrator': [parseInt(this.administratorId)],
+                    'Community TA': [parseInt(this.communityTaId)]
+                });
+            });
+
+            it('for pinned', function() {
+                renderSingleThreadWithProps({
+                    pinned: true
+                });
+                return expect($('.post-label-pinned').length).toEqual(1);
+            });
+
+            it('for following', function() {
+                renderSingleThreadWithProps({
+                    subscribed: true
+                });
+                return expect($('.post-label-following').length).toEqual(1);
+            });
+
+            it('for moderator', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.moderatorId
+                });
+                return expect($('.post-label-by-staff').length).toEqual(1);
+            });
+
+            it('for administrator', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.administratorId
+                });
+                return expect($('.post-label-by-staff').length).toEqual(1);
+            });
+
+            it('for community TA', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.communityTaId
+                });
+                return expect($('.post-label-by-community-ta').length).toEqual(1);
+            });
+
+            it('when none should be present', function() {
+                renderSingleThreadWithProps({});
+                return expect($('.forum-nav-thread-labels').length).toEqual(0);
+            });
+        });
+
+        describe('browse menu', function() {
+            var expectBrowseMenuVisible;
+            afterEach(function() {
+                return $('body').unbind('click');
+            });
+
+            expectBrowseMenuVisible = function(isVisible) {
+                expect($('.forum-nav-browse-menu:visible').length).toEqual(isVisible ? 1 : 0);
+                return expect($('.forum-nav-thread-list-wrapper:visible').length).toEqual(isVisible ? 0 : 1);
+            };
+
+            it('should be visible by default', function() {
+                expectBrowseMenuVisible(true);
+            });
+
+            it('should disappear when header button is clicked', function() {
+                $('.forum-nav-browse').click();
+                return expectBrowseMenuVisible(false);
+            });
+
+            describe('when shown', function() {
+                it('should show again when header button is clicked', function() {
+                    $('.forum-nav-browse').click();
+                    return expectBrowseMenuVisible(false);
+                });
+
+                it('should hide when a click outside the menu occurs', function() {
+                    $('.forum-nav-search-input').click();
+                    return expectBrowseMenuVisible(false);
+                });
+
+                it('should hide when a category is clicked', function() {
+                    $('.forum-nav-browse-title')[0].click();
+                    return expectBrowseMenuVisible(false);
+                });
+
+                it('should still be shown when filter input is clicked', function() {
+                    $('.forum-nav-browse-filter-input').click();
+                    return expectBrowseMenuVisible(true);
+                });
+
+                describe('filtering', function() {
+                    var checkFilter;
+                    checkFilter = function(filterText, expectedItems) {
+                        var visibleItems;
+                        $('.forum-nav-browse-filter-input').val(filterText).keyup();
+                        visibleItems = $('.forum-nav-browse-title:visible').map(function(i, elem) {
+                            return $(elem).text();
+                        }).get();
+                        return expect(visibleItems).toEqual(expectedItems);
+                    };
+
+                    it('should be case-insensitive', function() {
+                        return checkFilter('other', ['Other Category']);
+                    });
+
+                    it('should match partial words', function() {
+                        return checkFilter('ateg', ['Other Category']);
+                    });
+
+                    it('should show ancestors and descendants of matches', function() {
+                        return checkFilter('Target', ['Parent', 'Target', 'Child']);
+                    });
+
+                    it('should handle multiple words regardless of order', function() {
+                        return checkFilter('Following Posts', ["Posts I'm Following"]);
+                    });
+
+                    it('should handle multiple words in different depths', function() {
+                        return checkFilter('Parent Child', ['Parent', 'Target', 'Child']);
+                    });
+                });
+            });
+
+            describe('selecting an item', function() {
+                var testSelectionRequest;
+
+                it('should show/hide the cohort selector', function() {
+                    var self = this;
+                    DiscussionSpecHelper.makeModerator();
+                    this.view.render();
+                    setupAjax();
+                    return _.each([
+                        {
+                            selector: '.forum-nav-browse-menu-all',
+                            cohortVisibility: true
+                        }, {
+                            selector: '.forum-nav-browse-menu-following',
+                            cohortVisibility: false
+                        }, {
+                            selector: '.forum-nav-browse-menu-item:' +
+                                        'has(.forum-nav-browse-menu-item .forum-nav-browse-menu-item)',
+                            cohortVisibility: false
+                        }, {
+                            selector: '[data-discussion-id=child]',
+                            cohortVisibility: false
+                        }, {
+                            selector: '[data-discussion-id=other]',
+                            cohortVisibility: true
+                        }
+                    ], function(itemInfo) {
+                        self.view.$('' + itemInfo.selector + ' > .forum-nav-browse-title').click();
+                        return expect(self.view.$('.forum-nav-filter-cohort').is(':visible'))
+                            .toEqual(itemInfo.cohortVisibility);
+                    });
+                });
+
+                testSelectionRequest = function(callback, itemText) {
+                    setupAjax(callback);
+                    $('.forum-nav-browse-title:contains(' + itemText + ')').click();
+                    return expect($.ajax).toHaveBeenCalled();
+                };
+
+                it('should get all discussions', function() {
+                    return testSelectionRequest(function(params) {
+                        return expect(params.url.path()).toEqual(DiscussionUtil.urlFor('threads'));
+                    }, 'All');
+                });
+
+                it('should get followed threads', function() {
+                    testSelectionRequest(function(params) {
+                        return expect(params.url.path())
+                            .toEqual(DiscussionUtil.urlFor('followed_threads', window.user.id));
+                    }, 'Following');
+                    return expect($.ajax.calls.mostRecent().args[0].data.group_id).toBeUndefined();
+                });
+
+                it('should get threads for the selected leaf', function() {
+                    return testSelectionRequest(function(params) {
+                        expect(params.url.path()).toEqual(DiscussionUtil.urlFor('search'));
+                        return expect(params.data.commentable_ids).toEqual('child');
+                    }, 'Child');
+                });
+
+                it('should get threads for children of the selected intermediate node', function() {
+                    return testSelectionRequest(function(params) {
+                        expect(params.url.path()).toEqual(DiscussionUtil.urlFor('search'));
+                        return expect(params.data.commentable_ids).toEqual('child,sibling');
+                    }, 'Parent');
+                });
+            });
+        });
     });
 }).call(this);
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
index fe9ac3332e..b13c9d6c23 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
@@ -5,7 +5,7 @@
     var $$course_id = '$$course_id';
     describe('DiscussionThreadShowView', function() {
         beforeEach(function() {
-            DiscussionSpecHelper.setUpGlobals({});
+            DiscussionSpecHelper.setUpGlobals();
             DiscussionSpecHelper.setUnderscoreFixtures();
             this.user = DiscussionUtil.getUser();
             this.threadData = {
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
index 3a35cfdbc5..9b39017d54 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
@@ -129,7 +129,7 @@
                     model: thread,
                     el: $('#fixture-element'),
                     mode: mode,
-                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
+                    course_settings: DiscussionSpecHelper.makeCourseSettings()
                 });
                 renderWithTestResponses(view, 1);
                 if (mode === 'inline') {
@@ -185,7 +185,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
+                    course_settings: DiscussionSpecHelper.makeCourseSettings()
                 });
             });
             describe('responses', function() {
@@ -282,7 +282,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'inline',
-                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
+                    course_settings: DiscussionSpecHelper.makeCourseSettings()
                 });
             });
             describe('render', function() {
@@ -397,7 +397,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
+                    course_settings: DiscussionSpecHelper.makeCourseSettings()
                 });
             });
             generateContent = function(idStart, idEnd) {
@@ -465,7 +465,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
+                    course_settings: DiscussionSpecHelper.makeCourseSettings()
                 });
             });
             it("doesn't show report option if can_report ability is disabled", function() {
diff --git a/common/static/common/js/spec/discussion/view/response_comment_view_spec.js b/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
index 35ba510892..57d5fbfeea 100644
--- a/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
@@ -5,7 +5,7 @@
 
     describe('ResponseCommentView', function() {
         beforeEach(function() {
-            DiscussionSpecHelper.setUpGlobals({});
+            DiscussionSpecHelper.setUpGlobals();
             this.comment = new Comment({
                 id: '01234567',
                 user_id: user.id,
diff --git a/common/static/common/js/spec_helpers/discussion_spec_helper.js b/common/static/common/js/spec_helpers/discussion_spec_helper.js
index e1838b05ad..679795f6ee 100644
--- a/common/static/common/js/spec_helpers/discussion_spec_helper.js
+++ b/common/static/common/js/spec_helpers/discussion_spec_helper.js
@@ -1,16 +1,15 @@
-/* global Content, Discussion, DiscussionCourseSettings, DiscussionUtil, DiscussionUser */
+/* global DiscussionCourseSettings, DiscussionUtil, DiscussionUser */
 (function() {
     'use strict';
     this.DiscussionSpecHelper = (function() {
         function DiscussionSpecHelper() {
         }
 
-        DiscussionSpecHelper.setUpGlobals = function(opts) {
-            var options = opts || {};
-            DiscussionUtil.loadRoles(options.roles || DiscussionSpecHelper.getTestRoleInfo());
-            window.$$course_id = options.courseName || 'edX/999/test';
-            window.user = new DiscussionUser(options.userInfo || DiscussionSpecHelper.getTestUserInfo());
-            DiscussionUtil.setUser(window.user);
+        DiscussionSpecHelper.setUpGlobals = function() {
+            DiscussionUtil.loadRoles(DiscussionSpecHelper.getTestRoleInfo());
+            window.$$course_id = 'edX/999/test';
+            window.user = new DiscussionUser(DiscussionSpecHelper.getTestUserInfo());
+            return DiscussionUtil.setUser(window.user);
         };
 
         DiscussionSpecHelper.getTestUserInfo = function() {
@@ -51,7 +50,7 @@
             return jasmine.createSpyObj('event', ['preventDefault', 'target']);
         };
 
-        DiscussionSpecHelper.createTestCourseSettings = function() {
+        DiscussionSpecHelper.makeCourseSettings = function() {
             return new DiscussionCourseSettings({
                 category_map: {
                     children: [['Test Topic', 'entry'], ['Other Topic', 'entry']],
@@ -70,24 +69,12 @@
             });
         };
 
-        DiscussionSpecHelper.createTestDiscussion = function(options) {
-            var sortPreference = options.sort_preference,
-                threads = options.threads || [],
-                threadPages = options.thread_pages || 1,
-                contentInfo = options.content_info;
-            DiscussionSpecHelper.setUpGlobals(options);
-            if (contentInfo) {
-                Content.loadContentInfos(contentInfo);
-            }
-            return new Discussion(threads, {pages: threadPages, sort: sortPreference});
-        };
-
         DiscussionSpecHelper.setUnderscoreFixtures = function() {
             var templateFixture, templateName, templateNames, templateNamesNoTrailingTemplate, i, j, len;
             templateNames = [
                 'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show',
                 'thread-response-edit', 'response-comment-show', 'response-comment-edit', 'thread-list-item',
-                'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-alert',
+                'discussion-home', 'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-alert',
                 'new-post-menu-category', 'topic', 'post-user-display', 'inline-discussion', 'pagination',
                 'profile-thread', 'customwmd-prompt', 'nav-loading'
             ];
diff --git a/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore b/common/static/common/templates/discussion/discussion-home.underscore
similarity index 100%
rename from lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore
rename to common/static/common/templates/discussion/discussion-home.underscore
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index 226fa15b08..77d823d950 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -511,7 +511,6 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
-                'aria-required-children',  # TODO: AC-534
                 'color-contrast',  # Commented out for now because they reproducibly fail on Jenkins but not locally
             ]
         })
@@ -521,7 +520,6 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
-                'aria-required-children',  # TODO: AC-534
                 'color-contrast',  # Commented out for now because they reproducibly fail on Jenkins but not locally
             ]
         })
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js b/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
index 6c2c310343..bea9bd56dc 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
@@ -5,50 +5,38 @@
         [
             'jquery',
             'backbone',
-            'common/js/discussion/content',
-            'common/js/discussion/discussion',
-            'common/js/discussion/utils',
-            'common/js/discussion/models/discussion_course_settings',
-            'common/js/discussion/models/discussion_user',
-            'common/js/discussion/views/new_post_view',
             'discussion/js/discussion_router',
-            'discussion/js/views/discussion_board_view'
+            'discussion/js/views/discussion_fake_breadcrumbs',
+            'discussion/js/views/discussion_search_view',
+            'common/js/discussion/views/new_post_view'
         ],
-        function($, Backbone, Content, Discussion, DiscussionUtil, DiscussionCourseSettings, DiscussionUser,
-                 NewPostView, DiscussionRouter, DiscussionBoardView) {
+        function($, Backbone, DiscussionRouter, DiscussionFakeBreadcrumbs, DiscussionSearchView, NewPostView) {
             return function(options) {
                 var userInfo = options.user_info,
                     sortPreference = options.sort_preference,
                     threads = options.threads,
                     threadPages = options.thread_pages,
                     contentInfo = options.content_info,
-                    user = new DiscussionUser(userInfo),
+                    user = new window.DiscussionUser(userInfo),
                     discussion,
                     courseSettings,
                     newPostView,
-                    discussionBoardView,
                     router,
+                    breadcrumbs,
+                    BreadcrumbsModel,
+                    searchBox,
                     routerEvents;
 
-                // TODO: eliminate usage of global variables when possible
-                DiscussionUtil.loadRoles(options.roles);
+                // TODO: Perhaps eliminate usage of global variables when possible
+                window.DiscussionUtil.loadRoles(options.roles);
                 window.$$course_id = options.courseId;
                 window.courseName = options.course_name;
-                DiscussionUtil.setUser(user);
+                window.DiscussionUtil.setUser(user);
                 window.user = user;
-                Content.loadContentInfos(contentInfo);
+                window.Content.loadContentInfos(contentInfo);
 
-                // Create a discussion model
-                discussion = new Discussion(threads, {pages: threadPages, sort: sortPreference});
-                courseSettings = new DiscussionCourseSettings(options.course_settings);
-
-                // Create the discussion board view
-                discussionBoardView = new DiscussionBoardView({
-                    el: $('.discussion-board'),
-                    discussion: discussion,
-                    courseSettings: courseSettings
-                });
-                discussionBoardView.render();
+                discussion = new window.Discussion(threads, {pages: threadPages, sort: sortPreference});
+                courseSettings = new window.DiscussionCourseSettings(options.course_settings);
 
                 // Create the new post view
                 newPostView = new NewPostView({
@@ -59,27 +47,59 @@
                 });
                 newPostView.render();
 
-                // Set up a router to manage the page's history
+                // Set up the router to manage the page's history
                 router = new DiscussionRouter({
                     courseId: options.courseId,
                     discussion: discussion,
                     courseSettings: courseSettings,
-                    discussionBoardView: discussionBoardView,
                     newPostView: newPostView
                 });
                 router.start();
+
+                // Initialize and render search box
+                searchBox = new DiscussionSearchView({
+                    el: $('.forum-search'),
+                    threadListView: router.nav
+                }).render();
+
+                // Initialize and render breadcrumbs
+                BreadcrumbsModel = Backbone.Model.extend({
+                    defaults: {
+                        contents: []
+                    }
+                });
+
+                breadcrumbs = new DiscussionFakeBreadcrumbs({
+                    el: $('.has-breadcrumbs'),
+                    model: new BreadcrumbsModel(),
+                    events: {
+                        'click .all-topics': function(event) {
+                            event.preventDefault();
+                            searchBox.clearSearch();
+                            this.model.set('contents', []);
+                            router.navigate('', {trigger: true});
+                            router.nav.toggleBrowseMenu(event);
+                        }
+                    }
+                }).render();
+
                 routerEvents = {
                     // Add new breadcrumbs and clear search box when the user selects topics
                     'topic:selected': function(topic) {
-                        router.discussionBoardView.breadcrumbs.model.set('contents', topic);
+                        breadcrumbs.model.set('contents', topic);
                     },
                     // Clear search box when a thread is selected
                     'thread:selected': function() {
-                        router.discussionBoardView.searchView.clearSearch();
+                        searchBox.clearSearch();
+                    },
+                    // Add 'Search Results' to breadcrumbs when user searches
+                    'search:initiated': function() {
+                        breadcrumbs.model.set('contents', ['Search Results']);
                     }
                 };
+
                 Object.keys(routerEvents).forEach(function(key) {
-                    router.discussionBoardView.on(key, routerEvents[key]);
+                    router.nav.on(key, routerEvents[key]);
                 });
             };
         });
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js b/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
index 537418a102..0b59b15a91 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
@@ -1,14 +1,8 @@
 (function(define) {
     'use strict';
 
-    define(
-        [
-            'jquery',
-            'common/js/discussion/utils',
-            'common/js/discussion/models/discussion_user',
-            'discussion/js/views/discussion_user_profile_view'
-        ],
-        function($, DiscussionUtil, DiscussionUser, DiscussionUserProfileView) {
+    define(['jquery', 'discussion/js/views/discussion_user_profile_view'],
+        function($, DiscussionUserProfileView) {
             return function(options) {
                 var $element = options.$el,
                     threads = options.threads,
@@ -16,16 +10,13 @@
                     page = options.page,
                     numPages = options.numPages;
                 // Roles are not included in user profile page, but they are not used for anything
-                DiscussionUtil.loadRoles({
+                window.DiscussionUtil.loadRoles({
                     Moderator: [],
                     Administrator: [],
                     'Community TA': []
                 });
-
-                // TODO: remove global variable usage
                 window.$$course_id = options.courseId;
-                window.user = new DiscussionUser(userInfo);
-
+                window.user = new window.DiscussionUser(userInfo);
                 new DiscussionUserProfileView({  // eslint-disable-line no-new
                     el: $element,
                     collection: threads,
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
index 83a4d19cd8..1280940c2a 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
@@ -6,10 +6,10 @@
             'underscore',
             'backbone',
             'common/js/discussion/utils',
-            'common/js/discussion/models/discussion_course_settings',
+            'common/js/discussion/views/discussion_thread_list_view',
             'common/js/discussion/views/discussion_thread_view'
         ],
-        function(_, Backbone, DiscussionUtil, DiscussionCourseSettings, DiscussionThreadView) {
+        function(_, Backbone, DiscussionUtil, DiscussionThreadListView, DiscussionThreadView) {
             var DiscussionRouter = Backbone.Router.extend({
                 routes: {
                     '': 'allThreads',
@@ -21,9 +21,14 @@
                     _.bindAll(this, 'allThreads', 'showThread');
                     this.courseId = options.courseId;
                     this.discussion = options.discussion;
-                    this.course_settings = new DiscussionCourseSettings(options.course_settings);
-                    this.discussionBoardView = options.discussionBoardView;
+                    this.course_settings = options.courseSettings;
                     this.newPostView = options.newPostView;
+                    this.nav = new DiscussionThreadListView({
+                        collection: this.discussion,
+                        el: $('.forum-nav'),
+                        courseSettings: this.course_settings
+                    });
+                    this.nav.render();
                 },
 
                 start: function() {
@@ -36,18 +41,10 @@
                     });
 
                     // Automatically navigate when the user selects threads
-                    this.discussionBoardView.discussionThreadListView.on(
-                        'thread:selected', _.bind(this.navigateToThread, this)
-                    );
-                    this.discussionBoardView.discussionThreadListView.on(
-                        'thread:removed', _.bind(this.navigateToAllThreads, this)
-                    );
-                    this.discussionBoardView.discussionThreadListView.on(
-                        'threads:rendered', _.bind(this.setActiveThread, this)
-                    );
-                    this.discussionBoardView.discussionThreadListView.on(
-                        'thread:created', _.bind(this.navigateToThread, this)
-                    );
+                    this.nav.on('thread:selected', _.bind(this.navigateToThread, this));
+                    this.nav.on('thread:removed', _.bind(this.navigateToAllThreads, this));
+                    this.nav.on('threads:rendered', _.bind(this.setActiveThread, this));
+                    this.nav.on('thread:created', _.bind(this.navigateToThread, this));
 
                     Backbone.history.start({
                         pushState: true,
@@ -60,15 +57,15 @@
                 },
 
                 allThreads: function() {
-                    this.discussionBoardView.updateSidebar();
-                    return this.discussionBoardView.goHome();
+                    this.nav.updateSidebar();
+                    return this.nav.goHome();
                 },
 
                 setActiveThread: function() {
                     if (this.thread) {
-                        return this.discussionBoardView.discussionThreadListView.setActiveThread(this.thread.get('id'));
+                        return this.nav.setActiveThread(this.thread.get('id'));
                     } else {
-                        return this.discussionBoardView.goHome;
+                        return this.nav.goHome;
                     }
                 },
 
@@ -89,8 +86,8 @@
                     if (!($('.forum-content').is(':visible'))) {
                         $('.forum-content').fadeIn();
                     }
-                    if ($('.new-post-article').is(':visible')) {
-                        $('.new-post-article').fadeOut();
+                    if (this.newPostView.$el.is(':visible')) {
+                        this.newPostView.$el.fadeOut();
                     }
                     this.main = new DiscussionThreadView({
                         el: $('.forum-content'),
@@ -100,13 +97,14 @@
                     });
                     this.main.render();
                     this.main.on('thread:responses:rendered', function() {
-                        return self.discussionBoardView.updateSidebar();
+                        return self.nav.updateSidebar();
                     });
                     return this.thread.on('thread:thread_type_updated', this.showMain);
                 },
 
                 navigateToThread: function(threadId) {
-                    var thread = this.discussion.get(threadId);
+                    var thread;
+                    thread = this.discussion.get(threadId);
                     return this.navigate('' + (thread.get('commentable_id')) + '/threads/' + threadId, {
                         trigger: true
                     });
@@ -137,7 +135,6 @@
                         }
                     });
                 }
-
             });
 
             return DiscussionRouter;
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
index cf571920a1..53e49dbd70 100644
--- a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
+++ b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
@@ -4,34 +4,16 @@ define(
         'backbone',
         'common/js/spec_helpers/page_helpers',
         'common/js/spec_helpers/discussion_spec_helper',
-        'discussion/js/discussion_board_factory',
-        'discussion/js/views/discussion_board_view'
+        'discussion/js/discussion_board_factory'
     ],
-    function($, Backbone, PageHelpers, DiscussionSpecHelper, DiscussionBoardFactory, DiscussionBoardView) {
+    function($, Backbone, PageHelpers, DiscussionSpecHelper, DiscussionBoardFactory) {
         'use strict';
 
         // TODO: re-enable when this doesn't interact badly with other history tests
-        describe('DiscussionBoardFactory', function() {
-            var createDiscussionBoardView = function() {
-                var discussionBoardView,
-                    discussion = DiscussionSpecHelper.createTestDiscussion({}),
-                    courseSettings = DiscussionSpecHelper.createTestCourseSettings();
-
-                setFixtures('<div class="discussion-board"><div class="forum-search"></div></div>');
-                DiscussionSpecHelper.setUnderscoreFixtures();
-
-                discussionBoardView = new DiscussionBoardView({
-                    el: $('.discussion-board'),
-                    discussion: discussion,
-                    courseSettings: courseSettings
-                });
-
-                return discussionBoardView;
-            };
-
+        xdescribe('Discussion Board Factory', function() {
             var initializeDiscussionBoardFactory = function() {
                 DiscussionBoardFactory({
-                    el: $('#discussion-container'),
+                    el: $('.discussion-board'),
                     courseId: 'test_course_id',
                     course_name: 'Test Course',
                     user_info: DiscussionSpecHelper.getTestUserInfo(),
@@ -51,11 +33,14 @@ define(
             };
 
             beforeEach(function() {
+                PageHelpers.preventBackboneChangingUrl();
+
                 // Install the fixtures
                 setFixtures(
-                    '<div id="discussion-container" class="discussion-board"></div></div>'
+                    '<div class="discussion-board">' +
+                    '    <div class="forum-nav"></div>' +
+                    '</div>'
                 );
-                PageHelpers.preventBackboneChangingUrl();
                 DiscussionSpecHelper.setUnderscoreFixtures();
             });
 
@@ -63,11 +48,9 @@ define(
                 Backbone.history.stop();
             });
 
-            xit('can render itself', function() { // this failed Search: navigates to search, and TeamsTab
-                var discussionView = createDiscussionBoardView();
-                discussionView.render();
+            it('can render itself', function() {
                 initializeDiscussionBoardFactory();
-                expect(discussionView.$el.text()).toContain('Search all posts');
+                expect($('.discussion-board').text()).toContain('All Discussions');
             });
         });
     }
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
deleted file mode 100644
index ccee1de7da..0000000000
--- a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* globals Discussion, DiscussionCourseSettings */
-(function(define) {
-    'use strict';
-    define(
-        [
-            'underscore',
-            'jquery',
-            'edx-ui-toolkit/js/utils/constants',
-            'common/js/discussion/discussion',
-            'common/js/spec_helpers/discussion_spec_helper',
-            'discussion/js/views/discussion_board_view'
-        ],
-        function(_, $, constants, Discussion, DiscussionSpecHelper, DiscussionBoardView) {
-            describe('DiscussionBoardView', function() {
-                var createDiscussionBoardView;
-                createDiscussionBoardView = function() {
-                    var discussionBoardView,
-                        discussion = DiscussionSpecHelper.createTestDiscussion({}),
-                        courseSettings = DiscussionSpecHelper.createTestCourseSettings();
-
-                    setFixtures('<div class="discussion-board"><div class="forum-search"></div></div>');
-                    DiscussionSpecHelper.setUnderscoreFixtures();
-
-                    discussionBoardView = new DiscussionBoardView({
-                        el: $('.discussion-board'),
-                        discussion: discussion,
-                        courseSettings: courseSettings
-                    });
-
-                    return discussionBoardView;
-                };
-
-                describe('Search events', function() {
-                    it('perform search when enter pressed inside search textfield', function() {
-                        var discussionBoardView = createDiscussionBoardView(),
-                            threadListView;
-                        discussionBoardView.render();
-                        threadListView = discussionBoardView.discussionThreadListView;
-                        spyOn(threadListView, 'performSearch');
-                        discussionBoardView.$('.search-input').trigger($.Event('keydown', {
-                            which: constants.keyCodes.enter
-                        }));
-                        expect(threadListView.performSearch).toHaveBeenCalled();
-                    });
-
-                    it('perform search when search icon is clicked', function() {
-                        var discussionBoardView = createDiscussionBoardView(),
-                            threadListView;
-                        discussionBoardView.render();
-                        threadListView = discussionBoardView.discussionThreadListView;
-                        spyOn(threadListView, 'performSearch');
-                        discussionBoardView.$el.find('.search-btn').click();
-                        expect(threadListView.performSearch).toHaveBeenCalled();
-                    });
-                });
-            });
-        });
-}).call(this, define || RequireJS.define);
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
new file mode 100644
index 0000000000..f7c05f4daf
--- /dev/null
+++ b/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
@@ -0,0 +1,36 @@
+define([
+    'jquery',
+    'edx-ui-toolkit/js/utils/constants',
+    'discussion/js/views/discussion_search_view'
+],
+    function($, constants, DiscussionSearchView) {
+        'use strict';
+
+        describe('DiscussionSearchView', function() {
+            var view;
+            beforeEach(function() {
+                setFixtures('<div class="search-container"></div>');
+                view = new DiscussionSearchView({
+                    el: $('.search-container'),
+                    threadListView: {
+                        performSearch: jasmine.createSpy()
+                    }
+                }).render();
+            });
+
+            describe('Search events', function() {
+                it('perform search when enter pressed inside search textfield', function() {
+                    view.$el.find('.search-input').trigger($.Event('keydown', {
+                        which: constants.keyCodes.enter
+                    }));
+                    expect(view.threadListView.performSearch).toHaveBeenCalled();
+                });
+
+                it('perform search when search icon is clicked', function() {
+                    view.$el.find('.search-btn').click();
+                    expect(view.threadListView.performSearch).toHaveBeenCalled();
+                });
+            });
+        });
+    }
+);
diff --git a/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js b/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
deleted file mode 100644
index 1c092d2675..0000000000
--- a/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
+++ /dev/null
@@ -1,336 +0,0 @@
-/* globals Discussion */
-(function(define) {
-    'use strict';
-
-    define([
-        'underscore',
-        'backbone',
-        'edx-ui-toolkit/js/utils/html-utils',
-        'edx-ui-toolkit/js/utils/constants',
-        'common/js/discussion/utils',
-        'common/js/discussion/views/discussion_thread_list_view',
-        'discussion/js/views/discussion_fake_breadcrumbs',
-        'discussion/js/views/discussion_search_view',
-        'text!discussion/templates/discussion-home.underscore'
-    ],
-    function(_, Backbone, HtmlUtils, Constants, DiscussionUtil,
-        DiscussionThreadListView, DiscussionFakeBreadcrumbs, DiscussionSearchView, discussionHomeTemplate) {
-        var DiscussionBoardView = Backbone.View.extend({
-            events: {
-                'click .forum-nav-browse-title': 'selectTopicHandler',
-                'click .all-topics': 'toggleBrowseMenu',
-                'keypress .forum-nav-browse-filter-input': function(event) {
-                    return DiscussionUtil.ignoreEnterKey(event);
-                },
-                'keyup .forum-nav-browse-filter-input': 'filterTopics',
-                'keydown .forum-nav-browse-filter-input': 'keyboardBinding',
-                'click .forum-nav-browse-menu-wrapper': 'ignoreClick',
-                'keydown .search-input': 'performSearch',
-                'click .search-btn': 'performSearch',
-                'topic:selected': 'clearSearch'
-            },
-
-            initialize: function(options) {
-                this.courseSettings = options.courseSettings;
-                this.sidebar_padding = 10;
-                this.current_search = '';
-                this.mode = 'all';
-                this.discussion = options.discussion;
-                this.filterInputReset();
-                this.selectedTopic = $('.forum-nav-browse-menu-item:visible .forum-nav-browse-title.is-focused');
-                this.listenTo(this.model, 'change', this.render);
-            },
-
-            render: function() {
-                this.discussionThreadListView = new DiscussionThreadListView({
-                    collection: this.discussion,
-                    el: this.$('.discussion-thread-list-container'),
-                    courseSettings: this.courseSettings
-                }).render();
-                this.searchView = new DiscussionSearchView({
-                    el: this.$('.forum-search')
-                }).render();
-                this.renderBreadcrumbs();
-                $(window).bind('load scroll resize', this.updateSidebar);
-                this.showBrowseMenu(true);
-                return this;
-            },
-
-            renderBreadcrumbs: function() {
-                var BreadcrumbsModel = Backbone.Model.extend({
-                    defaults: {
-                        contents: []
-                    }
-                });
-
-                this.breadcrumbs = new DiscussionFakeBreadcrumbs({
-                    el: $('.has-breadcrumbs'),
-                    model: new BreadcrumbsModel(),
-                    events: {
-                        'click .all-topics': function(event) {
-                            event.preventDefault();
-                        }
-                    }
-                }).render();
-            },
-
-            isBrowseMenuVisible: function() {
-                return this.$('.forum-nav-browse-menu-wrapper').is(':visible');
-            },
-
-            showBrowseMenu: function(initialLoad) {
-                if (!this.isBrowseMenuVisible()) {
-                    this.$('.forum-nav-browse-menu-wrapper').show();
-                    this.$('.forum-nav-thread-list-wrapper').hide();
-                    if (!initialLoad) {
-                        $('.forum-nav-browse-filter-input').focus();
-                        this.filterInputReset();
-                    }
-                    this.updateSidebar();
-                }
-            },
-
-            hideBrowseMenu: function() {
-                var selectedTopicList = this.$('.forum-nav-browse-title.is-focused');
-                if (this.isBrowseMenuVisible()) {
-                    selectedTopicList.removeClass('is-focused');
-                    this.$('.forum-nav-browse-menu-wrapper').hide();
-                    this.$('.forum-nav-thread-list-wrapper').show();
-                    if (this.selectedTopicId !== 'undefined') {
-                        this.$('.forum-nav-browse-filter-input').attr('aria-activedescendant', this.selectedTopicId);
-                    }
-                    this.updateSidebar();
-                }
-            },
-
-            toggleBrowseMenu: function(event) {
-                var inputText = this.$('.forum-nav-browse-filter-input').val();
-                event.preventDefault();
-                event.stopPropagation();
-                if (this.isBrowseMenuVisible()) {
-                    this.hideBrowseMenu();
-                } else {
-                    if (inputText !== '') {
-                        this.filterTopics(inputText);
-                    }
-                    this.showBrowseMenu();
-                }
-                this.breadcrumbs.model.set('contents', []);
-                this.clearSearch();
-            },
-
-            performSearch: function(event) {
-                if (event.which === Constants.keyCodes.enter || event.type === 'click') {
-                    event.preventDefault();
-                    this.hideBrowseMenu();
-                    this.breadcrumbs.model.set('contents', ['Search Results']);
-                    this.discussionThreadListView.performSearch($('.search-input', this.$el));
-                }
-            },
-
-            clearSearch: function() {
-                this.$('.search-input').val('');
-                this.discussionThreadListView.clearSearchAlerts();
-            },
-
-            updateSidebar: function() {
-                var amount, browseFilterHeight, discussionBottomOffset, discussionsBodyBottom,
-                    discussionsBodyTop, headerHeight, refineBarHeight, scrollTop, sidebarHeight, topOffset,
-                    windowHeight, $discussionBody, $sidebar;
-                scrollTop = $(window).scrollTop();
-                windowHeight = $(window).height();
-                $discussionBody = this.$('.discussion-column');
-                discussionsBodyTop = $discussionBody[0] ? $discussionBody.offset().top : undefined;
-                discussionsBodyBottom = discussionsBodyTop + $discussionBody.outerHeight();
-                $sidebar = this.$('.forum-nav');
-                if (scrollTop > discussionsBodyTop - this.sidebar_padding) {
-                    $sidebar.css('top', scrollTop - discussionsBodyTop + this.sidebar_padding);
-                } else {
-                    $sidebar.css('top', '0');
-                }
-                sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, this.sidebar_padding);
-                topOffset = scrollTop + windowHeight;
-                discussionBottomOffset = discussionsBodyBottom + this.sidebar_padding;
-                amount = Math.max(topOffset - discussionBottomOffset, 0);
-                sidebarHeight = sidebarHeight - this.sidebar_padding - amount;
-                sidebarHeight = Math.min(sidebarHeight + 1, $discussionBody.outerHeight());
-                $sidebar.css('height', sidebarHeight);
-                headerHeight = this.$('.forum-nav-header').outerHeight();
-                refineBarHeight = this.$('.forum-nav-refine-bar').outerHeight();
-                browseFilterHeight = this.$('.forum-nav-browse-filter').outerHeight();
-                this.$('.forum-nav-thread-list')
-                    .css('height', (sidebarHeight - headerHeight - refineBarHeight - 2) + 'px');
-                this.$('.forum-nav-browse-menu')
-                    .css('height', (sidebarHeight - headerHeight - browseFilterHeight - 2) + 'px');
-            },
-
-            goHome: function() {
-                var url = DiscussionUtil.urlFor('notifications_status', window.user.get('id'));
-                HtmlUtils.append(this.$('.forum-content').empty(), HtmlUtils.template(discussionHomeTemplate)({}));
-                this.$('.forum-nav-thread-list a').removeClass('is-active').find('.sr')
-                    .remove();
-                this.$('input.email-setting').bind('click', this.updateEmailNotifications);
-                DiscussionUtil.safeAjax({
-                    url: url,
-                    type: 'GET',
-                    success: function(response) {
-                        $('input.email-setting').prop('checked', response.status);
-                    }
-                });
-            },
-
-            filterInputReset: function() {
-                this.filterEnabled = true;
-                this.selectedTopicIndex = -1;
-                this.selectedTopicId = null;
-            },
-
-            selectOption: function(element) {
-                var activeDescendantId, activeDescendantText;
-                if (this.selectedTopic.length > 0) {
-                    this.selectedTopic.removeClass('is-focused');
-                }
-                if (element) {
-                    element.addClass('is-focused');
-                    activeDescendantId = element.parent().attr('id');
-                    activeDescendantText = element.text();
-                    this.selectedTopic = element;
-                    this.selectedTopicId = activeDescendantId;
-                    this.$('.forum-nav-browse-filter-input')
-                        .attr('aria-activedescendant', activeDescendantId)
-                        .val(activeDescendantText);
-                }
-            },
-
-            keyboardBinding: function(event) {
-                var key = event.which,
-                    $inputText = $('.forum-nav-browse-filter-input'),
-                    $filteredMenuItems = $('.forum-nav-browse-menu-item:visible'),
-                    filteredMenuItemsLen = $filteredMenuItems.length,
-                    $curOption = $filteredMenuItems.eq(0).find('.forum-nav-browse-title').eq(0),
-                    $activeOption, $prev, $next;
-
-                switch (key) {
-                case Constants.keyCodes.enter:
-                    $activeOption = $filteredMenuItems.find('.forum-nav-browse-title.is-focused');
-                    if ($inputText.val() !== '') {
-                        $activeOption.trigger('click');
-                        this.filterInputReset();
-                    }
-                    break;
-
-                case Constants.keyCodes.esc:
-                    this.toggleBrowseMenu(event);
-                    this.$('.forum-nav-browse-filter-input').val('');
-                    this.filterInputReset();
-                    $('.all-topics').trigger('click');
-                    break;
-
-                case Constants.keyCodes.up:
-                    if (this.selectedTopicIndex > 0) {
-                        this.selectedTopicIndex -= 1;
-                        if (this.isBrowseMenuVisible()) {
-                            $prev = $('.forum-nav-browse-menu-item:visible')
-                            .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
-                            .eq(0);
-                            this.filterEnabled = false;
-                            $curOption.removeClass('is-focused');
-                            $prev.addClass('is-focused');
-                        }
-                        this.selectOption($prev);
-                    }
-                    break;
-
-                case Constants.keyCodes.down:
-                    if (this.selectedTopicIndex < filteredMenuItemsLen - 1) {
-                        this.selectedTopicIndex += 1;
-                        if (this.isBrowseMenuVisible()) {
-                            $next = $('.forum-nav-browse-menu-item:visible')
-                                .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
-                                .eq(0);
-                            this.filterEnabled = false;
-                            $curOption.removeClass('is-focused');
-                            $next.addClass('is-focused');
-                        }
-                        this.selectOption($next);
-                    }
-                    break;
-
-                default:
-                }
-            },
-
-            filterTopics: function() {
-                var $items, query, filteredItems,
-                    self = this;
-                query = this.$('.forum-nav-browse-filter-input').val();
-                $items = this.$('.forum-nav-browse-menu-item');
-                if (query.length === 0) {
-                    $items.find('.forum-nav-browse-title.is-focused').removeClass('is-focused');
-                    return $items.show();
-                } else {
-                    if (self.filterEnabled) {
-                        $items.hide();
-                        filteredItems = $items.each(function(i, item) {
-                            var path, pathText,
-                                $item = $(item);
-                            if (!$item.is(':visible')) {
-                                pathText = self.getPathText($item).toLowerCase();
-                                if (query.split(' ').every(function(term) {
-                                    return pathText.search(term.toLowerCase()) !== -1;
-                                })) {
-                                    path = $item.parents('.forum-nav-browse-menu-item').andSelf();
-                                    path.add($item.find('.forum-nav-browse-menu-item')).show();
-                                }
-                            }
-                        });
-                    }
-                    return filteredItems;
-                }
-            },
-
-            getPathText: function(item) {
-                var path, pathTitles;
-                path = item.parents('.forum-nav-browse-menu-item').andSelf();
-                pathTitles = path.children('.forum-nav-browse-title').map(function(i, elem) {
-                    return $(elem).text();
-                }).get();
-                return pathTitles.join(' / ');
-            },
-
-            selectTopicHandler: function(event) {
-                var $item = $(event.target).closest('.forum-nav-browse-menu-item');
-                event.preventDefault();
-                this.hideBrowseMenu();
-                this.trigger('topic:selected', this.getBreadcrumbText($item));
-                return this.discussionThreadListView.selectTopic($(event.target));
-            },
-
-            getBreadcrumbText: function($item) {
-                var $parentSubMenus = $item.parents('.forum-nav-browse-submenu'),
-                    crumbs = [],
-                    subTopic = $('.forum-nav-browse-title', $item)
-                        .first()
-                        .text()
-                        .trim();
-
-                $parentSubMenus.each(function(i, el) {
-                    crumbs.push($(el).siblings('.forum-nav-browse-title')
-                        .first()
-                        .text()
-                        .trim()
-                    );
-                });
-
-                if (subTopic !== 'All Discussions') {
-                    crumbs.push(subTopic);
-                }
-
-                return crumbs;
-            }
-
-        });
-
-        return DiscussionBoardView;
-    });
-}).call(this, define || RequireJS.define);
diff --git a/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js b/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
index ebf122b402..9d1dd00620 100644
--- a/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
+++ b/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
@@ -15,16 +15,33 @@
          * in order to clean up that file and make it possible to break its logic into files like this one.
          */
         var searchView = Backbone.View.extend({
+            events: {
+                'keydown .search-input': 'performSearch',
+                'click .search-btn': 'performSearch',
+                'topic:selected': 'clearSearch'
+            },
             initialize: function(options) {
-                _.extend(this, _.pick(options, ['discussionBoardView']));
+                _.extend(this, _.pick(options, 'threadListView'));
 
                 this.template = HtmlUtils.template(searchTemplate);
+                this.threadListView = options.threadListView;
+
                 this.listenTo(this.model, 'change', this.render);
                 this.render();
             },
             render: function() {
                 HtmlUtils.setHtml(this.$el, this.template());
                 return this;
+            },
+            performSearch: function(event) {
+                if (event.which === constants.keyCodes.enter || event.type === 'click') {
+                    event.preventDefault();
+                    this.threadListView.performSearch($('.search-input', this.$el));
+                }
+            },
+            clearSearch: function() {
+                this.$('.search-input').val('');
+                this.threadListView.clearSearchAlerts();
             }
         });
 
diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board.html b/lms/djangoapps/discussion/templates/discussion/discussion_board.html
index 7882739cf1..b2a4b6d0ac 100644
--- a/lms/djangoapps/discussion/templates/discussion/discussion_board.html
+++ b/lms/djangoapps/discussion/templates/discussion/discussion_board.html
@@ -77,8 +77,6 @@ DiscussionBoardFactory({
     <div class="page-content">
         <div class="discussion-body layout layout-1t2t">
             <aside class="forum-nav layout-col layout-col-a" role="complementary" aria-label="${_("Discussion thread list")}">
-                <%include file="_filter_dropdown.html" />
-                <div class="discussion-thread-list-container"></div>
             </aside>
 
             <main id="main" aria-label="Content" tabindex="-1" class="discussion-column layout-col layout-col-b">
diff --git a/lms/static/lms/js/spec/main.js b/lms/static/lms/js/spec/main.js
index ded0787f3c..67e4f40cc5 100644
--- a/lms/static/lms/js/spec/main.js
+++ b/lms/static/lms/js/spec/main.js
@@ -288,11 +288,11 @@
                 deps: ['jquery', 'underscore', 'slick.core', 'slick.grid'],
                 init: function() {
                     // Set global variables that the util code is expecting to be defined
-                    require([  // eslint-disable-line global-require
+                    require([
                         'edx-ui-toolkit/js/utils/html-utils',
                         'edx-ui-toolkit/js/utils/string-utils'
                     ], function(HtmlUtils, StringUtils) {
-                        window.edx = window.edx || {};
+                        window.edx = edx || {};
                         window.edx.HtmlUtils = HtmlUtils;
                         window.edx.StringUtils = StringUtils;
                     });
@@ -383,7 +383,7 @@
                 deps: ['jquery', 'underscore', 'underscore.string', 'backbone', 'gettext'],
                 init: function() {
                     // Set global variables that the payment code is expecting to be defined
-                    require([  // eslint-disable-line global-require
+                    require([
                         'underscore',
                         'underscore.string',
                         'edx-ui-toolkit/js/utils/html-utils',
@@ -391,7 +391,7 @@
                     ], function(_, str, HtmlUtils, StringUtils) {
                         window._ = _;
                         window._.str = str;
-                        window.edx = window.edx || {};
+                        window.edx = edx || {};
                         window.edx.HtmlUtils = HtmlUtils;
                         window.edx.StringUtils = StringUtils;
                     });
@@ -527,21 +527,10 @@
                 exports: 'DiscussionUtil',
                 init: function() {
                     // Set global variables that the discussion code is expecting to be defined
-                    require(  // eslint-disable-line global-require
-                        [
-                            'backbone',
-                            'URI',
-                            'edx-ui-toolkit/js/utils/html-utils',
-                            'edx-ui-toolkit/js/utils/string-utils'
-                        ],
-                        function(Backbone, URI, HtmlUtils, StringUtils) {
-                            window.Backbone = Backbone;
-                            window.URI = URI;
-                            window.edx = window.edx || {};
-                            window.edx.HtmlUtils = HtmlUtils;
-                            window.edx.StringUtils = StringUtils;
-                        }
-                    );
+                    require(['backbone', 'URI'], function(Backbone, URI) {
+                        window.Backbone = Backbone;
+                        window.URI = URI;
+                    });
                 }
             },
             'common/js/discussion/content': {
@@ -553,11 +542,11 @@
             'common/js/discussion/discussion': {
                 deps: [
                     'common/js/discussion/utils',
-                    'common/js/discussion/content'
+                    'xmodule_js/common_static/common/js/discussion/content'
                 ],
                 exports: 'Discussion'
             },
-            'common/js/discussion/models/discussion_course_settings': {
+            'common/js/discussion/discussion_course_settings': {
                 deps: [
                     'common/js/discussion/utils'
                 ],
@@ -675,7 +664,7 @@
     var testFiles = [
         'discussion/js/spec/discussion_board_factory_spec.js',
         'discussion/js/spec/discussion_profile_page_factory_spec.js',
-        'discussion/js/spec/discussion_board_view_spec.js',
+        'discussion/js/spec/views/discussion_search_view_spec.js',
         'discussion/js/spec/views/discussion_user_profile_view_spec.js',
         'lms/js/spec/preview/preview_factory_spec.js',
         'js/spec/api_admin/catalog_preview_spec.js',
diff --git a/lms/templates/discussion/_js_body_dependencies.html b/lms/templates/discussion/_js_body_dependencies.html
index d4be582f9b..fda375a109 100644
--- a/lms/templates/discussion/_js_body_dependencies.html
+++ b/lms/templates/discussion/_js_body_dependencies.html
@@ -16,14 +16,11 @@ from openedx.core.djangolib.js_utils import js_escaped_string
 <%
 discussion_classes = [
     ['Discussion', 'common/js/discussion/discussion'],
-    ['Content', 'common/js/discussion/content'],
     ['DiscussionModuleView', 'common/js/discussion/discussion_module_view'],
     ['DiscussionThreadView', 'common/js/discussion/views/discussion_thread_view'],
     ['DiscussionThreadListView', 'common/js/discussion/views/discussion_thread_list_view'],
     ['DiscussionThreadProfileView', 'common/js/discussion/views/discussion_thread_profile_view'],
     ['DiscussionUtil', 'common/js/discussion/utils'],
-    ['DiscussionCourseSettings', 'common/js/discussion/models/discussion_course_settings'],
-    ['DiscussionUser', 'common/js/discussion/models/discussion_user'],
     ['NewPostView', 'common/js/discussion/views/new_post_view'],
 ]
 %>
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
index 20a2d64170..d0d73f7ce4 100644
--- a/lms/templates/discussion/_thread_list_template.html
+++ b/lms/templates/discussion/_thread_list_template.html
@@ -1,7 +1,8 @@
 <%page expression_filter="h"/>
 <%! from django.utils.translation import ugettext as _ %>
 <script type="text/template" id="thread-list-template">
-    <div class="forum-nav-thread-list-wrapper" id="sort-filter-wrapper" tabindex="-1" style="display:none">
+    <%include file="_filter_dropdown.html" />
+    <div class="forum-nav-thread-list-wrapper" id="sort-filter-wrapper" tabindex="-1">
         <div class="forum-nav-refine-bar">
             <label class="forum-nav-filter-main">
                 ## Translators: This labels a filter menu in forum navigation
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index b8d210a4bd..6c87246665 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -14,7 +14,7 @@
 <%
 template_names = [
     'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show', 'thread-response-edit',
-    'response-comment-show', 'response-comment-edit', 'thread-list-item', 'search-alert',
+    'response-comment-show', 'response-comment-edit', 'thread-list-item', 'discussion-home', 'search-alert',
     'new-post', 'new-post-menu-entry', 'new-post-menu-category', 'new-post-alert', 'topic', 'post-user-display',
     'inline-discussion', 'pagination', 'profile-thread', 'customwmd-prompt', 'nav-loading', 'thread-type'
 ]

From 57fa123f5e0166bc4e16a3a264e6c7b835fd1360 Mon Sep 17 00:00:00 2001
From: alisan617 <atang@edx.org>
Date: Tue, 15 Nov 2016 14:46:57 -0500
Subject: [PATCH 5/7] Revert "Revert PR#13843"

---
 .../views/discussion_thread_list_view.js      | 339 ++----------------
 .../view/discussion_thread_edit_view_spec.js  |   2 +-
 .../view/discussion_thread_list_view_spec.js  | 305 +++++-----------
 .../view/discussion_thread_show_view_spec.js  |   2 +-
 .../view/discussion_thread_view_spec.js       |  10 +-
 .../view/response_comment_view_spec.js        |   2 +-
 .../js/spec_helpers/discussion_spec_helper.js |  29 +-
 .../tests/discussion/test_discussion.py       |   2 +
 .../discussion/js/discussion_board_factory.js |  82 ++---
 .../js/discussion_profile_page_factory.js     |  17 +-
 .../static/discussion/js/discussion_router.js |  47 +--
 .../js/spec/discussion_board_factory_spec.js  |  39 +-
 .../js/spec/discussion_board_view_spec.js     |  58 +++
 .../spec/views/discussion_search_view_spec.js |  36 --
 .../js/views/discussion_board_view.js         | 336 +++++++++++++++++
 .../js/views/discussion_search_view.js        |  19 +-
 .../templates}/discussion-home.underscore     |   0
 .../discussion/discussion_board.html          |   2 +
 lms/static/lms/js/spec/main.js                |  33 +-
 .../discussion/_js_body_dependencies.html     |   3 +
 .../discussion/_thread_list_template.html     |   3 +-
 .../discussion/_underscore_templates.html     |   2 +-
 22 files changed, 664 insertions(+), 704 deletions(-)
 create mode 100644 lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
 delete mode 100644 lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
 create mode 100644 lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
 rename {common/static/common/templates/discussion => lms/djangoapps/discussion/static/discussion/templates}/discussion-home.underscore (100%)

diff --git a/common/static/common/js/discussion/views/discussion_thread_list_view.js b/common/static/common/js/discussion/views/discussion_thread_list_view.js
index 5ac5c91295..7ab85715d6 100644
--- a/common/static/common/js/discussion/views/discussion_thread_list_view.js
+++ b/common/static/common/js/discussion/views/discussion_thread_list_view.js
@@ -1,6 +1,7 @@
-/* globals _, Backbone, Content, Discussion, DiscussionUtil */
+/* globals _, Backbone, Content, Discussion, DiscussionUtil, DiscussionThreadView, DiscussionThreadListView */
 (function() {
     'use strict';
+    /* eslint-disable */
     var __hasProp = {}.hasOwnProperty,
         __extends = function(child, parent) {
             for (var key in parent) {
@@ -17,6 +18,7 @@
             child.__super__ = parent.prototype;
             return child;
         };
+        /* eslint-enable */
 
     if (typeof Backbone !== 'undefined' && Backbone !== null) {
         this.DiscussionThreadListView = (function(_super) {
@@ -36,24 +38,6 @@
                 this.chooseFilter = function() {
                     return DiscussionThreadListView.prototype.chooseFilter.apply(self, arguments);
                 };
-                this.keyboardBinding = function() {
-                    return DiscussionThreadListView.prototype.keyboardBinding.apply(self, arguments);
-                };
-                this.filterTopics = function() {
-                    return DiscussionThreadListView.prototype.filterTopics.apply(self, arguments);
-                };
-                this.toggleBrowseMenu = function() {
-                    return DiscussionThreadListView.prototype.toggleBrowseMenu.apply(self, arguments);
-                };
-                this.hideBrowseMenu = function() {
-                    return DiscussionThreadListView.prototype.hideBrowseMenu.apply(self, arguments);
-                };
-                this.showBrowseMenu = function() {
-                    return DiscussionThreadListView.prototype.showBrowseMenu.apply(self, arguments);
-                };
-                this.isBrowseMenuVisible = function() {
-                    return DiscussionThreadListView.prototype.isBrowseMenuVisible.apply(self, arguments);
-                };
                 this.threadRemoved = function() {
                     return DiscussionThreadListView.prototype.threadRemoved.apply(self, arguments);
                 };
@@ -72,9 +56,6 @@
                 this.renderThreads = function() {
                     return DiscussionThreadListView.prototype.renderThreads.apply(self, arguments);
                 };
-                this.updateSidebar = function() {
-                    return DiscussionThreadListView.prototype.updateSidebar.apply(self, arguments);
-                };
                 this.addAndSelectThread = function() {
                     return DiscussionThreadListView.prototype.addAndSelectThread.apply(self, arguments);
                 };
@@ -90,17 +71,16 @@
                 this.addSearchAlert = function() {
                     return DiscussionThreadListView.prototype.addSearchAlert.apply(self, arguments);
                 };
-                return DiscussionThreadListView.__super__.constructor.apply(this, arguments);
+                this.performSearch = function() {
+                    return DiscussionThreadListView.prototype.performSearch.apply(self, arguments);
+                };
+                return DiscussionThreadListView.__super__.constructor.apply(this, arguments); // eslint-disable-line no-underscore-dangle, max-len
             }
 
             DiscussionThreadListView.prototype.events = {
                 'keypress .forum-nav-browse-filter-input': function(event) {
                     return DiscussionUtil.ignoreEnterKey(event);
                 },
-                'keyup .forum-nav-browse-filter-input': 'filterTopics',
-                'keydown .forum-nav-browse-filter-input': 'keyboardBinding',
-                'click .forum-nav-browse-menu-wrapper': 'ignoreClick',
-                'click .forum-nav-browse-title': 'selectTopicHandler',
                 'change .forum-nav-sort-control': 'sortThreads',
                 'click .forum-nav-thread-link': 'threadSelected',
                 'click .forum-nav-load-more-link': 'loadMorePages',
@@ -117,8 +97,6 @@
                 this.collection.on('change', this.reloadDisplayedCollection);
                 this.discussionIds = '';
                 this.collection.on('reset', function(discussion) {
-                    var board;
-                    board = $('.current-board').html();
                     self.displayedCollection.current_page = discussion.current_page;
                     self.displayedCollection.pages = discussion.pages;
                     return self.displayedCollection.reset(discussion.models);
@@ -129,23 +107,15 @@
                 this.boardName = null;
                 this.current_search = '';
                 this.mode = 'all';
-                this.keyCodes = {
-                    enter: 13,
-                    escape: 27,
-                    up: 38,
-                    down: 40
-                };
-                this.filterInputReset();
-                this.selectedTopic = $('.forum-nav-browse-menu-item:visible .forum-nav-browse-title.is-focused');
                 this.searchAlertCollection = new Backbone.Collection([], {
                     model: Backbone.Model
                 });
                 this.searchAlertCollection.on('add', function(searchAlert) {
                     var content;
                     content = edx.HtmlUtils.template($('#search-alert-template').html())({
-                        'messageHtml': searchAlert.attributes.message,
-                        'cid': searchAlert.cid,
-                        'css_class': searchAlert.attributes.css_class
+                        messageHtml: searchAlert.attributes.message,
+                        cid: searchAlert.cid,
+                        css_class: searchAlert.attributes.css_class
                     });
                     edx.HtmlUtils.append(self.$('.search-alerts'), content);
                     return self.$('#search-alert-' + searchAlert.cid + ' .dismiss')
@@ -160,7 +130,6 @@
                     return self.$('.search-alerts').empty();
                 });
                 this.template = edx.HtmlUtils.template($('#thread-list-template').html());
-                this.homeTemplate = edx.HtmlUtils.template($('#discussion-home-template').html());
                 this.threadListItemTemplate = edx.HtmlUtils.template($('#thread-list-item-template').html());
             };
 
@@ -172,10 +141,9 @@
              * @returns {Backbone.Model}
              */
             DiscussionThreadListView.prototype.addSearchAlert = function(message, cssClass) {
-                var m;
-                m = new Backbone.Model({message: message, css_class: cssClass || ''});
-                this.searchAlertCollection.add(m);
-                return m;
+                var searchAlertModel = new Backbone.Model({message: message, css_class: cssClass || ''});
+                this.searchAlertCollection.add(searchAlertModel);
+                return searchAlertModel;
             };
 
             DiscussionThreadListView.prototype.removeSearchAlert = function(searchAlert) {
@@ -196,7 +164,7 @@
                 $currentElement.replaceWith($content);
                 this.showMetadataAccordingToSort();
                 if (active) {
-                    return this.setActiveThread(threadId);
+                    this.setActiveThread(threadId);
                 }
             };
 
@@ -212,37 +180,6 @@
                 });
             };
 
-            DiscussionThreadListView.prototype.updateSidebar = function() {
-                var amount, browseFilterHeight, discussionBody, discussionBottomOffset, discussionsBodyBottom,
-                    discussionsBodyTop, headerHeight, refineBarHeight, scrollTop, sidebar, sidebarHeight, topOffset,
-                    windowHeight;
-                scrollTop = $(window).scrollTop();
-                windowHeight = $(window).height();
-                discussionBody = $('.discussion-column');
-                discussionsBodyTop = discussionBody[0] ? discussionBody.offset().top : void 0;
-                discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight();
-                sidebar = $('.forum-nav');
-                if (scrollTop > discussionsBodyTop - this.sidebar_padding) {
-                    sidebar.css('top', scrollTop - discussionsBodyTop + this.sidebar_padding);
-                } else {
-                    sidebar.css('top', '0');
-                }
-                sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, this.sidebar_padding);
-                topOffset = scrollTop + windowHeight;
-                discussionBottomOffset = discussionsBodyBottom + this.sidebar_padding;
-                amount = Math.max(topOffset - discussionBottomOffset, 0);
-                sidebarHeight = sidebarHeight - this.sidebar_padding - amount;
-                sidebarHeight = Math.min(sidebarHeight + 1, discussionBody.outerHeight());
-                sidebar.css('height', sidebarHeight);
-                headerHeight = this.$('.forum-nav-header').outerHeight();
-                refineBarHeight = this.$('.forum-nav-refine-bar').outerHeight();
-                browseFilterHeight = this.$('.forum-nav-browse-filter').outerHeight();
-                this.$('.forum-nav-thread-list')
-                    .css('height', (sidebarHeight - headerHeight - refineBarHeight - 2) + 'px');
-                this.$('.forum-nav-browse-menu')
-                    .css('height', (sidebarHeight - headerHeight - browseFilterHeight - 2) + 'px');
-            };
-
             DiscussionThreadListView.prototype.ignoreClick = function(event) {
                 return event.stopPropagation();
             };
@@ -261,16 +198,14 @@
                 this.$('.forum-nav-sort-control option').removeProp('selected');
                 this.$('.forum-nav-sort-control option[value=' + this.collection.sort_preference + ']')
                     .prop('selected', true);
-                $(window).bind('load scroll resize', this.updateSidebar);
                 this.displayedCollection.on('reset', this.renderThreads);
                 this.displayedCollection.on('thread:remove', this.renderThreads);
                 this.displayedCollection.on('change:commentable_id', function() {
                     if (self.mode === 'commentables') {
-                        return self.retrieveDiscussions(self.discussionIds.split(','));
+                        self.retrieveDiscussions(self.discussionIds.split(','));
                     }
                 });
                 this.renderThreads();
-                this.showBrowseMenu(true);
                 return this;
             };
 
@@ -284,7 +219,6 @@
                 }
                 this.showMetadataAccordingToSort();
                 this.renderMorePages();
-                this.updateSidebar();
                 this.trigger('threads:rendered');
             };
 
@@ -319,7 +253,7 @@
             };
 
             DiscussionThreadListView.prototype.loadMorePages = function(event) {
-                var error, lastThread, loadMoreElem, loadingElem, options, _ref,
+                var error, lastThread, loadMoreElem, loadingElem, options, ref,
                     self = this;
                 if (event) {
                     event.preventDefault();
@@ -353,9 +287,11 @@
                     if (this.group_id) {
                         options.group_id = this.group_id;
                     }
+                    break;
+                default:
                 }
-                _ref = this.collection.last();
-                lastThread = _ref ? _ref.get('id') : void 0;
+                ref = this.collection.last();
+                lastThread = ref ? ref.get('id') : void 0;
                 if (lastThread) {
                     this.once('threads:rendered', function() {
                         var classSelector =
@@ -365,8 +301,8 @@
                     });
                 } else {
                     this.once('threads:rendered', function() {
-                        var _ref1 = $('.forum-nav-thread-link').first();
-                        return _ref1 ? _ref1.focus() : void 0;
+                        var ref1 = $('.forum-nav-thread-link').first();
+                        return ref1 ? ref1.focus() : void 0;
                     });
                 }
                 error = function() {
@@ -421,224 +357,10 @@
                     .prepend($srElem);
             };
 
-            DiscussionThreadListView.prototype.goHome = function() {
-                var url, $templateContent;
-                $templateContent = $(this.homeTemplate().toString());
-                $('.forum-content').empty().append($templateContent);
-                $('.forum-nav-thread-list a').removeClass('is-active').find('.sr')
-                    .remove();
-                $('input.email-setting').bind('click', this.updateEmailNotifications);
-                url = DiscussionUtil.urlFor('notifications_status', window.user.get('id'));
-                DiscussionUtil.safeAjax({
-                    url: url,
-                    type: 'GET',
-                    success: function(response) {
-                        $('input.email-setting').prop('checked', response.status);
-                    }
-                });
-            };
-
-            DiscussionThreadListView.prototype.isBrowseMenuVisible = function() {
-                return this.$('.forum-nav-browse-menu-wrapper').is(':visible');
-            };
-
-            DiscussionThreadListView.prototype.showBrowseMenu = function(initialLoad) {
-                if (!this.isBrowseMenuVisible()) {
-                    this.$('.forum-nav-browse-menu-wrapper').show();
-                    this.$('.forum-nav-thread-list-wrapper').hide();
-                    if (!initialLoad) {
-                        $('.forum-nav-browse-filter-input').focus();
-                        this.filterInputReset();
-                    }
-                    $('body').bind('click', this.hideBrowseMenu);
-                    return this.updateSidebar();
-                }
-            };
-
-            DiscussionThreadListView.prototype.hideBrowseMenu = function() {
-                var selectedTopicList = this.$('.forum-nav-browse-title.is-focused');
-                if (this.isBrowseMenuVisible()) {
-                    selectedTopicList.removeClass('is-focused');
-                    this.$('.forum-nav-browse-menu-wrapper').hide();
-                    this.$('.forum-nav-thread-list-wrapper').show();
-                    if (this.selectedTopicId !== 'undefined') {
-                        this.$('.forum-nav-browse-filter-input').attr('aria-activedescendant', this.selectedTopicId);
-                    }
-                    $('body').unbind('click', this.hideBrowseMenu);
-                    return this.updateSidebar();
-                }
-            };
-
-            DiscussionThreadListView.prototype.toggleBrowseMenu = function(event) {
-                var inputText = $('.forum-nav-browse-filter-input').val();
-                event.preventDefault();
-                event.stopPropagation();
-                if (this.isBrowseMenuVisible()) {
-                    return this.hideBrowseMenu();
-                } else {
-                    if (inputText !== '') {
-                        this.filterTopics(inputText);
-                    }
-                    return this.showBrowseMenu();
-                }
-            };
-
-            DiscussionThreadListView.prototype.getPathText = function(item) {
-                var path, pathTitles;
-                path = item.parents('.forum-nav-browse-menu-item').andSelf();
-                pathTitles = path.children('.forum-nav-browse-title').map(function(i, elem) {
-                    return $(elem).text();
-                }).get();
-                return pathTitles.join(' / ');
-            };
-
-            DiscussionThreadListView.prototype.getBreadcrumbText = function($item) {
-                var $parentSubMenus = $item.parents('.forum-nav-browse-submenu'),
-                    crumbs = [],
-                    subTopic = $('.forum-nav-browse-title', $item)
-                        .first()
-                        .text()
-                        .trim();
-
-                $parentSubMenus.each(function(i, el) {
-                    crumbs.push($(el).siblings('.forum-nav-browse-title')
-                        .first()
-                        .text()
-                        .trim()
-                    );
-                });
-
-                if (subTopic !== 'All Discussions') {
-                    crumbs.push(subTopic);
-                }
-
-                return crumbs;
-            };
-
-            DiscussionThreadListView.prototype.selectOption = function(element) {
-                var activeDescendantId, activeDescendantText;
-                if (this.selectedTopic.length > 0) {
-                    this.selectedTopic.removeClass('is-focused');
-                }
-                if (element) {
-                    element.addClass('is-focused');
-                    activeDescendantId = element.parent().attr('id');
-                    activeDescendantText = element.text();
-                    this.selectedTopic = element;
-                    this.selectedTopicId = activeDescendantId;
-                    $('.forum-nav-browse-filter-input')
-                        .attr('aria-activedescendant', activeDescendantId)
-                        .val(activeDescendantText);
-                }
-            };
-
-            DiscussionThreadListView.prototype.filterInputReset = function() {
-                this.filterEnabled = true;
-                this.selectedTopicIndex = -1;
-                this.selectedTopicId = null;
-            };
-
-            DiscussionThreadListView.prototype.keyboardBinding = function(event) {
-                var $inputText = $('.forum-nav-browse-filter-input'),
-                    $filteredMenuItems = $('.forum-nav-browse-menu-item:visible'),
-                    filteredMenuItemsLen = $filteredMenuItems.length,
-                    $curOption = $filteredMenuItems.eq(0).find('.forum-nav-browse-title').eq(0),
-                    $activeOption, $prev, $next;
-
-                switch (event.keyCode) {
-                case this.keyCodes.enter:
-                    $activeOption = $filteredMenuItems.find('.forum-nav-browse-title.is-focused');
-                    if ($inputText.val() !== '') {
-                        $activeOption.trigger('click');
-                        this.filterInputReset();
-                    }
-                    break;
-
-                case this.keyCodes.escape:
-                    this.toggleBrowseMenu(event);
-                    $('.forum-nav-browse-filter-input').val('');
-                    this.filterInputReset();
-                    $('.all-topics').trigger('click');
-                    break;
-
-                case this.keyCodes.up:
-                    if (this.selectedTopicIndex > 0) {
-                        this.selectedTopicIndex -= 1;
-                        if (this.isBrowseMenuVisible()) {
-                            $prev = $('.forum-nav-browse-menu-item:visible')
-                            .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
-                            .eq(0);
-                            this.filterEnabled = false;
-                            $curOption.removeClass('is-focused');
-                            $prev.addClass('is-focused');
-                        }
-                        this.selectOption($prev);
-                    }
-                    break;
-
-                case this.keyCodes.down:
-                    if (this.selectedTopicIndex < filteredMenuItemsLen - 1) {
-                        this.selectedTopicIndex += 1;
-                        if (this.isBrowseMenuVisible()) {
-                            $next = $('.forum-nav-browse-menu-item:visible')
-                                .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
-                                .eq(0);
-                            this.filterEnabled = false;
-                            $curOption.removeClass('is-focused');
-                            $next.addClass('is-focused');
-                        }
-                        this.selectOption($next);
-                    }
-                    break;
-
-                default:
-                    break;
-                }
-                return true;
-            };
-
-            DiscussionThreadListView.prototype.filterTopics = function() {
-                var items, query, filteredItems,
-                    self = this;
-                query = this.$('.forum-nav-browse-filter-input').val();
-                items = this.$('.forum-nav-browse-menu-item');
-                if (query.length === 0) {
-                    items.find('.forum-nav-browse-title.is-focused').removeClass('is-focused');
-                    return items.show();
-                } else {
-                    if (this.filterEnabled) {
-                        items.hide();
-                        filteredItems = items.each(function(i, item) {
-                            var path, pathText,
-                                $item = $(item);
-                            if (!$item.is(':visible')) {
-                                pathText = self.getPathText($item).toLowerCase();
-                                if (query.split(' ').every(function(term) {
-                                    return pathText.search(term.toLowerCase()) !== -1;
-                                })) {
-                                    path = $item.parents('.forum-nav-browse-menu-item').andSelf();
-                                    return path.add($item.find('.forum-nav-browse-menu-item')).show();
-                                }
-                            }
-                            return filteredItems;
-                        });
-                    }
-                    return filteredItems;
-                }
-            };
-
-            DiscussionThreadListView.prototype.selectTopicHandler = function(event) {
-                event.preventDefault();
-                return this.selectTopic($(event.target));
-            };
-
             DiscussionThreadListView.prototype.selectTopic = function($target) {
                 var allItems, discussionIds, $item;
-                this.hideBrowseMenu();
                 $item = $target.closest('.forum-nav-browse-menu-item');
 
-                this.trigger('topic:selected', this.getBreadcrumbText($item));
-
                 if ($item.hasClass('forum-nav-browse-menu-all')) {
                     this.discussionIds = '';
                     this.$('.forum-nav-filter-cohort').show();
@@ -667,9 +389,8 @@
             };
 
             DiscussionThreadListView.prototype.retrieveDiscussion = function(discussionId, callback) {
-                var url,
+                var url = DiscussionUtil.urlFor('retrieve_discussion', discussionId),
                     self = this;
-                url = DiscussionUtil.urlFor('retrieve_discussion', discussionId);
                 return DiscussionUtil.safeAjax({
                     url: url,
                     type: 'GET',
@@ -686,8 +407,8 @@
                 });
             };
 
-            DiscussionThreadListView.prototype.retrieveDiscussions = function(discussion_ids) {
-                this.discussionIds = discussion_ids.join(',');
+            DiscussionThreadListView.prototype.retrieveDiscussions = function(discussionIds) {
+                this.discussionIds = discussionIds.join(',');
                 this.mode = 'commentables';
                 return this.retrieveFirstPage();
             };
@@ -709,19 +430,18 @@
             };
 
             DiscussionThreadListView.prototype.performSearch = function($searchInput) {
-                this.hideBrowseMenu();
                 // trigger this event so the breadcrumbs can update as well
                 this.trigger('search:initiated');
                 this.searchFor($searchInput.val(), $searchInput);
             };
 
             DiscussionThreadListView.prototype.searchFor = function(text, $searchInput) {
-                var url, self = this;
+                var url = DiscussionUtil.urlFor('search'),
+                    self = this;
                 this.clearSearchAlerts();
                 this.clearFilters();
                 this.mode = 'search';
                 this.current_search = text;
-                url = DiscussionUtil.urlFor('search');
                 /*
                  TODO: This might be better done by setting discussion.current_page=0 and
                  calling discussion.loadMorePages
@@ -789,6 +509,7 @@
                                 return self.searchForUser(text);
                             }
                         }
+                        return response;
                     }
                 });
             };
@@ -816,9 +537,9 @@
                             );
 
                             message = edx.HtmlUtils.interpolateHtml(
-                                gettext('Show posts by {username}.'), {'username': username}
+                                gettext('Show posts by {username}.'), {username: username}
                             );
-                            return self.addSearchAlert(message, 'search-by-user');
+                            self.addSearchAlert(message, 'search-by-user');
                         }
                     }
                 });
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
index c2d876ae73..6b3c3d2921 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
@@ -16,7 +16,7 @@
                 'title': 'test thread title'
             });
             this.thread = new Thread(this.threadData);
-            this.course_settings = DiscussionSpecHelper.makeCourseSettings();
+            this.course_settings = DiscussionSpecHelper.createTestCourseSettings();
 
             this.createEditView = function(options) {
                 options = _.extend({
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
index 7ccf8018fa..b142c6b784 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
@@ -266,6 +266,88 @@
                 changeSorting(this.threads, 'votes', 'comments', ['Thread1', 'Thread4', 'Thread3', 'Thread2']);
             });
         });
+
+        describe('post type renders correctly', function() {
+            it('for discussion', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'discussion'
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-comments');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('discussion');
+            });
+
+            it('for answered question', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'question',
+                    endorsed: true
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-check-square-o');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('answered question');
+            });
+
+            it('for unanswered question', function() {
+                renderSingleThreadWithProps({
+                    thread_type: 'question',
+                    endorsed: false
+                });
+                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-question');
+                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('unanswered question');
+            });
+        });
+
+        describe('post labels render correctly', function() {
+            beforeEach(function() {
+                this.moderatorId = '42';
+                this.administratorId = '43';
+                this.communityTaId = '44';
+                return DiscussionUtil.loadRoles({
+                    Moderator: [parseInt(this.moderatorId, 10)],
+                    Administrator: [parseInt(this.administratorId, 10)],
+                    'Community TA': [parseInt(this.communityTaId, 10)]
+                });
+            });
+
+            it('for pinned', function() {
+                renderSingleThreadWithProps({
+                    pinned: true
+                });
+                return expect($('.post-label-pinned').length).toEqual(1);
+            });
+
+            it('for following', function() {
+                renderSingleThreadWithProps({
+                    subscribed: true
+                });
+                return expect($('.post-label-following').length).toEqual(1);
+            });
+
+            it('for moderator', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.moderatorId
+                });
+                return expect($('.post-label-by-staff').length).toEqual(1);
+            });
+
+            it('for administrator', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.administratorId
+                });
+                return expect($('.post-label-by-staff').length).toEqual(1);
+            });
+
+            it('for community TA', function() {
+                renderSingleThreadWithProps({
+                    user_id: this.communityTaId
+                });
+                return expect($('.post-label-by-community-ta').length).toEqual(1);
+            });
+
+            it('when none should be present', function() {
+                renderSingleThreadWithProps({});
+                return expect($('.forum-nav-thread-labels').length).toEqual(0);
+            });
+        });
+
         describe('search alerts', function() {
             var testAlertMessages, getAlertMessagesAndClasses;
 
@@ -460,228 +542,5 @@
             });
         });
 
-        describe('post type renders correctly', function() {
-            it('for discussion', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'discussion'
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-comments');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('discussion');
-            });
-
-            it('for answered question', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'question',
-                    endorsed: true
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-check-square-o');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('answered question');
-            });
-
-            it('for unanswered question', function() {
-                renderSingleThreadWithProps({
-                    thread_type: 'question',
-                    endorsed: false
-                });
-                expect($('.forum-nav-thread-wrapper-0 .icon')).toHaveClass('fa-question');
-                return expect($('.forum-nav-thread-wrapper-0 .sr')).toHaveText('unanswered question');
-            });
-        });
-
-        describe('post labels render correctly', function() {
-            beforeEach(function() {
-                this.moderatorId = '42';
-                this.administratorId = '43';
-                this.communityTaId = '44';
-                return DiscussionUtil.loadRoles({
-                    'Moderator': [parseInt(this.moderatorId)],
-                    'Administrator': [parseInt(this.administratorId)],
-                    'Community TA': [parseInt(this.communityTaId)]
-                });
-            });
-
-            it('for pinned', function() {
-                renderSingleThreadWithProps({
-                    pinned: true
-                });
-                return expect($('.post-label-pinned').length).toEqual(1);
-            });
-
-            it('for following', function() {
-                renderSingleThreadWithProps({
-                    subscribed: true
-                });
-                return expect($('.post-label-following').length).toEqual(1);
-            });
-
-            it('for moderator', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.moderatorId
-                });
-                return expect($('.post-label-by-staff').length).toEqual(1);
-            });
-
-            it('for administrator', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.administratorId
-                });
-                return expect($('.post-label-by-staff').length).toEqual(1);
-            });
-
-            it('for community TA', function() {
-                renderSingleThreadWithProps({
-                    user_id: this.communityTaId
-                });
-                return expect($('.post-label-by-community-ta').length).toEqual(1);
-            });
-
-            it('when none should be present', function() {
-                renderSingleThreadWithProps({});
-                return expect($('.forum-nav-thread-labels').length).toEqual(0);
-            });
-        });
-
-        describe('browse menu', function() {
-            var expectBrowseMenuVisible;
-            afterEach(function() {
-                return $('body').unbind('click');
-            });
-
-            expectBrowseMenuVisible = function(isVisible) {
-                expect($('.forum-nav-browse-menu:visible').length).toEqual(isVisible ? 1 : 0);
-                return expect($('.forum-nav-thread-list-wrapper:visible').length).toEqual(isVisible ? 0 : 1);
-            };
-
-            it('should be visible by default', function() {
-                expectBrowseMenuVisible(true);
-            });
-
-            it('should disappear when header button is clicked', function() {
-                $('.forum-nav-browse').click();
-                return expectBrowseMenuVisible(false);
-            });
-
-            describe('when shown', function() {
-                it('should show again when header button is clicked', function() {
-                    $('.forum-nav-browse').click();
-                    return expectBrowseMenuVisible(false);
-                });
-
-                it('should hide when a click outside the menu occurs', function() {
-                    $('.forum-nav-search-input').click();
-                    return expectBrowseMenuVisible(false);
-                });
-
-                it('should hide when a category is clicked', function() {
-                    $('.forum-nav-browse-title')[0].click();
-                    return expectBrowseMenuVisible(false);
-                });
-
-                it('should still be shown when filter input is clicked', function() {
-                    $('.forum-nav-browse-filter-input').click();
-                    return expectBrowseMenuVisible(true);
-                });
-
-                describe('filtering', function() {
-                    var checkFilter;
-                    checkFilter = function(filterText, expectedItems) {
-                        var visibleItems;
-                        $('.forum-nav-browse-filter-input').val(filterText).keyup();
-                        visibleItems = $('.forum-nav-browse-title:visible').map(function(i, elem) {
-                            return $(elem).text();
-                        }).get();
-                        return expect(visibleItems).toEqual(expectedItems);
-                    };
-
-                    it('should be case-insensitive', function() {
-                        return checkFilter('other', ['Other Category']);
-                    });
-
-                    it('should match partial words', function() {
-                        return checkFilter('ateg', ['Other Category']);
-                    });
-
-                    it('should show ancestors and descendants of matches', function() {
-                        return checkFilter('Target', ['Parent', 'Target', 'Child']);
-                    });
-
-                    it('should handle multiple words regardless of order', function() {
-                        return checkFilter('Following Posts', ["Posts I'm Following"]);
-                    });
-
-                    it('should handle multiple words in different depths', function() {
-                        return checkFilter('Parent Child', ['Parent', 'Target', 'Child']);
-                    });
-                });
-            });
-
-            describe('selecting an item', function() {
-                var testSelectionRequest;
-
-                it('should show/hide the cohort selector', function() {
-                    var self = this;
-                    DiscussionSpecHelper.makeModerator();
-                    this.view.render();
-                    setupAjax();
-                    return _.each([
-                        {
-                            selector: '.forum-nav-browse-menu-all',
-                            cohortVisibility: true
-                        }, {
-                            selector: '.forum-nav-browse-menu-following',
-                            cohortVisibility: false
-                        }, {
-                            selector: '.forum-nav-browse-menu-item:' +
-                                        'has(.forum-nav-browse-menu-item .forum-nav-browse-menu-item)',
-                            cohortVisibility: false
-                        }, {
-                            selector: '[data-discussion-id=child]',
-                            cohortVisibility: false
-                        }, {
-                            selector: '[data-discussion-id=other]',
-                            cohortVisibility: true
-                        }
-                    ], function(itemInfo) {
-                        self.view.$('' + itemInfo.selector + ' > .forum-nav-browse-title').click();
-                        return expect(self.view.$('.forum-nav-filter-cohort').is(':visible'))
-                            .toEqual(itemInfo.cohortVisibility);
-                    });
-                });
-
-                testSelectionRequest = function(callback, itemText) {
-                    setupAjax(callback);
-                    $('.forum-nav-browse-title:contains(' + itemText + ')').click();
-                    return expect($.ajax).toHaveBeenCalled();
-                };
-
-                it('should get all discussions', function() {
-                    return testSelectionRequest(function(params) {
-                        return expect(params.url.path()).toEqual(DiscussionUtil.urlFor('threads'));
-                    }, 'All');
-                });
-
-                it('should get followed threads', function() {
-                    testSelectionRequest(function(params) {
-                        return expect(params.url.path())
-                            .toEqual(DiscussionUtil.urlFor('followed_threads', window.user.id));
-                    }, 'Following');
-                    return expect($.ajax.calls.mostRecent().args[0].data.group_id).toBeUndefined();
-                });
-
-                it('should get threads for the selected leaf', function() {
-                    return testSelectionRequest(function(params) {
-                        expect(params.url.path()).toEqual(DiscussionUtil.urlFor('search'));
-                        return expect(params.data.commentable_ids).toEqual('child');
-                    }, 'Child');
-                });
-
-                it('should get threads for children of the selected intermediate node', function() {
-                    return testSelectionRequest(function(params) {
-                        expect(params.url.path()).toEqual(DiscussionUtil.urlFor('search'));
-                        return expect(params.data.commentable_ids).toEqual('child,sibling');
-                    }, 'Parent');
-                });
-            });
-        });
     });
 }).call(this);
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
index b13c9d6c23..fe9ac3332e 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
@@ -5,7 +5,7 @@
     var $$course_id = '$$course_id';
     describe('DiscussionThreadShowView', function() {
         beforeEach(function() {
-            DiscussionSpecHelper.setUpGlobals();
+            DiscussionSpecHelper.setUpGlobals({});
             DiscussionSpecHelper.setUnderscoreFixtures();
             this.user = DiscussionUtil.getUser();
             this.threadData = {
diff --git a/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
index 9b39017d54..3a35cfdbc5 100644
--- a/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
@@ -129,7 +129,7 @@
                     model: thread,
                     el: $('#fixture-element'),
                     mode: mode,
-                    course_settings: DiscussionSpecHelper.makeCourseSettings()
+                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
                 });
                 renderWithTestResponses(view, 1);
                 if (mode === 'inline') {
@@ -185,7 +185,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.makeCourseSettings()
+                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
                 });
             });
             describe('responses', function() {
@@ -282,7 +282,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'inline',
-                    course_settings: DiscussionSpecHelper.makeCourseSettings()
+                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
                 });
             });
             describe('render', function() {
@@ -397,7 +397,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.makeCourseSettings()
+                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
                 });
             });
             generateContent = function(idStart, idEnd) {
@@ -465,7 +465,7 @@
                     model: this.thread,
                     el: $('#fixture-element'),
                     mode: 'tab',
-                    course_settings: DiscussionSpecHelper.makeCourseSettings()
+                    course_settings: DiscussionSpecHelper.createTestCourseSettings()
                 });
             });
             it("doesn't show report option if can_report ability is disabled", function() {
diff --git a/common/static/common/js/spec/discussion/view/response_comment_view_spec.js b/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
index 57d5fbfeea..35ba510892 100644
--- a/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
+++ b/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
@@ -5,7 +5,7 @@
 
     describe('ResponseCommentView', function() {
         beforeEach(function() {
-            DiscussionSpecHelper.setUpGlobals();
+            DiscussionSpecHelper.setUpGlobals({});
             this.comment = new Comment({
                 id: '01234567',
                 user_id: user.id,
diff --git a/common/static/common/js/spec_helpers/discussion_spec_helper.js b/common/static/common/js/spec_helpers/discussion_spec_helper.js
index 679795f6ee..e1838b05ad 100644
--- a/common/static/common/js/spec_helpers/discussion_spec_helper.js
+++ b/common/static/common/js/spec_helpers/discussion_spec_helper.js
@@ -1,15 +1,16 @@
-/* global DiscussionCourseSettings, DiscussionUtil, DiscussionUser */
+/* global Content, Discussion, DiscussionCourseSettings, DiscussionUtil, DiscussionUser */
 (function() {
     'use strict';
     this.DiscussionSpecHelper = (function() {
         function DiscussionSpecHelper() {
         }
 
-        DiscussionSpecHelper.setUpGlobals = function() {
-            DiscussionUtil.loadRoles(DiscussionSpecHelper.getTestRoleInfo());
-            window.$$course_id = 'edX/999/test';
-            window.user = new DiscussionUser(DiscussionSpecHelper.getTestUserInfo());
-            return DiscussionUtil.setUser(window.user);
+        DiscussionSpecHelper.setUpGlobals = function(opts) {
+            var options = opts || {};
+            DiscussionUtil.loadRoles(options.roles || DiscussionSpecHelper.getTestRoleInfo());
+            window.$$course_id = options.courseName || 'edX/999/test';
+            window.user = new DiscussionUser(options.userInfo || DiscussionSpecHelper.getTestUserInfo());
+            DiscussionUtil.setUser(window.user);
         };
 
         DiscussionSpecHelper.getTestUserInfo = function() {
@@ -50,7 +51,7 @@
             return jasmine.createSpyObj('event', ['preventDefault', 'target']);
         };
 
-        DiscussionSpecHelper.makeCourseSettings = function() {
+        DiscussionSpecHelper.createTestCourseSettings = function() {
             return new DiscussionCourseSettings({
                 category_map: {
                     children: [['Test Topic', 'entry'], ['Other Topic', 'entry']],
@@ -69,12 +70,24 @@
             });
         };
 
+        DiscussionSpecHelper.createTestDiscussion = function(options) {
+            var sortPreference = options.sort_preference,
+                threads = options.threads || [],
+                threadPages = options.thread_pages || 1,
+                contentInfo = options.content_info;
+            DiscussionSpecHelper.setUpGlobals(options);
+            if (contentInfo) {
+                Content.loadContentInfos(contentInfo);
+            }
+            return new Discussion(threads, {pages: threadPages, sort: sortPreference});
+        };
+
         DiscussionSpecHelper.setUnderscoreFixtures = function() {
             var templateFixture, templateName, templateNames, templateNamesNoTrailingTemplate, i, j, len;
             templateNames = [
                 'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show',
                 'thread-response-edit', 'response-comment-show', 'response-comment-edit', 'thread-list-item',
-                'discussion-home', 'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-alert',
+                'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-alert',
                 'new-post-menu-category', 'topic', 'post-user-display', 'inline-discussion', 'pagination',
                 'profile-thread', 'customwmd-prompt', 'nav-loading'
             ];
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index 77d823d950..226fa15b08 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -511,6 +511,7 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TODO: AC-534
                 'color-contrast',  # Commented out for now because they reproducibly fail on Jenkins but not locally
             ]
         })
@@ -520,6 +521,7 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
         page.a11y_audit.config.set_rules({
             'ignore': [
                 'section',  # TODO: AC-491
+                'aria-required-children',  # TODO: AC-534
                 'color-contrast',  # Commented out for now because they reproducibly fail on Jenkins but not locally
             ]
         })
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js b/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
index bea9bd56dc..6c2c310343 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
@@ -5,38 +5,50 @@
         [
             'jquery',
             'backbone',
+            'common/js/discussion/content',
+            'common/js/discussion/discussion',
+            'common/js/discussion/utils',
+            'common/js/discussion/models/discussion_course_settings',
+            'common/js/discussion/models/discussion_user',
+            'common/js/discussion/views/new_post_view',
             'discussion/js/discussion_router',
-            'discussion/js/views/discussion_fake_breadcrumbs',
-            'discussion/js/views/discussion_search_view',
-            'common/js/discussion/views/new_post_view'
+            'discussion/js/views/discussion_board_view'
         ],
-        function($, Backbone, DiscussionRouter, DiscussionFakeBreadcrumbs, DiscussionSearchView, NewPostView) {
+        function($, Backbone, Content, Discussion, DiscussionUtil, DiscussionCourseSettings, DiscussionUser,
+                 NewPostView, DiscussionRouter, DiscussionBoardView) {
             return function(options) {
                 var userInfo = options.user_info,
                     sortPreference = options.sort_preference,
                     threads = options.threads,
                     threadPages = options.thread_pages,
                     contentInfo = options.content_info,
-                    user = new window.DiscussionUser(userInfo),
+                    user = new DiscussionUser(userInfo),
                     discussion,
                     courseSettings,
                     newPostView,
+                    discussionBoardView,
                     router,
-                    breadcrumbs,
-                    BreadcrumbsModel,
-                    searchBox,
                     routerEvents;
 
-                // TODO: Perhaps eliminate usage of global variables when possible
-                window.DiscussionUtil.loadRoles(options.roles);
+                // TODO: eliminate usage of global variables when possible
+                DiscussionUtil.loadRoles(options.roles);
                 window.$$course_id = options.courseId;
                 window.courseName = options.course_name;
-                window.DiscussionUtil.setUser(user);
+                DiscussionUtil.setUser(user);
                 window.user = user;
-                window.Content.loadContentInfos(contentInfo);
+                Content.loadContentInfos(contentInfo);
 
-                discussion = new window.Discussion(threads, {pages: threadPages, sort: sortPreference});
-                courseSettings = new window.DiscussionCourseSettings(options.course_settings);
+                // Create a discussion model
+                discussion = new Discussion(threads, {pages: threadPages, sort: sortPreference});
+                courseSettings = new DiscussionCourseSettings(options.course_settings);
+
+                // Create the discussion board view
+                discussionBoardView = new DiscussionBoardView({
+                    el: $('.discussion-board'),
+                    discussion: discussion,
+                    courseSettings: courseSettings
+                });
+                discussionBoardView.render();
 
                 // Create the new post view
                 newPostView = new NewPostView({
@@ -47,59 +59,27 @@
                 });
                 newPostView.render();
 
-                // Set up the router to manage the page's history
+                // Set up a router to manage the page's history
                 router = new DiscussionRouter({
                     courseId: options.courseId,
                     discussion: discussion,
                     courseSettings: courseSettings,
+                    discussionBoardView: discussionBoardView,
                     newPostView: newPostView
                 });
                 router.start();
-
-                // Initialize and render search box
-                searchBox = new DiscussionSearchView({
-                    el: $('.forum-search'),
-                    threadListView: router.nav
-                }).render();
-
-                // Initialize and render breadcrumbs
-                BreadcrumbsModel = Backbone.Model.extend({
-                    defaults: {
-                        contents: []
-                    }
-                });
-
-                breadcrumbs = new DiscussionFakeBreadcrumbs({
-                    el: $('.has-breadcrumbs'),
-                    model: new BreadcrumbsModel(),
-                    events: {
-                        'click .all-topics': function(event) {
-                            event.preventDefault();
-                            searchBox.clearSearch();
-                            this.model.set('contents', []);
-                            router.navigate('', {trigger: true});
-                            router.nav.toggleBrowseMenu(event);
-                        }
-                    }
-                }).render();
-
                 routerEvents = {
                     // Add new breadcrumbs and clear search box when the user selects topics
                     'topic:selected': function(topic) {
-                        breadcrumbs.model.set('contents', topic);
+                        router.discussionBoardView.breadcrumbs.model.set('contents', topic);
                     },
                     // Clear search box when a thread is selected
                     'thread:selected': function() {
-                        searchBox.clearSearch();
-                    },
-                    // Add 'Search Results' to breadcrumbs when user searches
-                    'search:initiated': function() {
-                        breadcrumbs.model.set('contents', ['Search Results']);
+                        router.discussionBoardView.searchView.clearSearch();
                     }
                 };
-
                 Object.keys(routerEvents).forEach(function(key) {
-                    router.nav.on(key, routerEvents[key]);
+                    router.discussionBoardView.on(key, routerEvents[key]);
                 });
             };
         });
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js b/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
index 0b59b15a91..537418a102 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
@@ -1,8 +1,14 @@
 (function(define) {
     'use strict';
 
-    define(['jquery', 'discussion/js/views/discussion_user_profile_view'],
-        function($, DiscussionUserProfileView) {
+    define(
+        [
+            'jquery',
+            'common/js/discussion/utils',
+            'common/js/discussion/models/discussion_user',
+            'discussion/js/views/discussion_user_profile_view'
+        ],
+        function($, DiscussionUtil, DiscussionUser, DiscussionUserProfileView) {
             return function(options) {
                 var $element = options.$el,
                     threads = options.threads,
@@ -10,13 +16,16 @@
                     page = options.page,
                     numPages = options.numPages;
                 // Roles are not included in user profile page, but they are not used for anything
-                window.DiscussionUtil.loadRoles({
+                DiscussionUtil.loadRoles({
                     Moderator: [],
                     Administrator: [],
                     'Community TA': []
                 });
+
+                // TODO: remove global variable usage
                 window.$$course_id = options.courseId;
-                window.user = new window.DiscussionUser(userInfo);
+                window.user = new DiscussionUser(userInfo);
+
                 new DiscussionUserProfileView({  // eslint-disable-line no-new
                     el: $element,
                     collection: threads,
diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
index 1280940c2a..83a4d19cd8 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
@@ -6,10 +6,10 @@
             'underscore',
             'backbone',
             'common/js/discussion/utils',
-            'common/js/discussion/views/discussion_thread_list_view',
+            'common/js/discussion/models/discussion_course_settings',
             'common/js/discussion/views/discussion_thread_view'
         ],
-        function(_, Backbone, DiscussionUtil, DiscussionThreadListView, DiscussionThreadView) {
+        function(_, Backbone, DiscussionUtil, DiscussionCourseSettings, DiscussionThreadView) {
             var DiscussionRouter = Backbone.Router.extend({
                 routes: {
                     '': 'allThreads',
@@ -21,14 +21,9 @@
                     _.bindAll(this, 'allThreads', 'showThread');
                     this.courseId = options.courseId;
                     this.discussion = options.discussion;
-                    this.course_settings = options.courseSettings;
+                    this.course_settings = new DiscussionCourseSettings(options.course_settings);
+                    this.discussionBoardView = options.discussionBoardView;
                     this.newPostView = options.newPostView;
-                    this.nav = new DiscussionThreadListView({
-                        collection: this.discussion,
-                        el: $('.forum-nav'),
-                        courseSettings: this.course_settings
-                    });
-                    this.nav.render();
                 },
 
                 start: function() {
@@ -41,10 +36,18 @@
                     });
 
                     // Automatically navigate when the user selects threads
-                    this.nav.on('thread:selected', _.bind(this.navigateToThread, this));
-                    this.nav.on('thread:removed', _.bind(this.navigateToAllThreads, this));
-                    this.nav.on('threads:rendered', _.bind(this.setActiveThread, this));
-                    this.nav.on('thread:created', _.bind(this.navigateToThread, this));
+                    this.discussionBoardView.discussionThreadListView.on(
+                        'thread:selected', _.bind(this.navigateToThread, this)
+                    );
+                    this.discussionBoardView.discussionThreadListView.on(
+                        'thread:removed', _.bind(this.navigateToAllThreads, this)
+                    );
+                    this.discussionBoardView.discussionThreadListView.on(
+                        'threads:rendered', _.bind(this.setActiveThread, this)
+                    );
+                    this.discussionBoardView.discussionThreadListView.on(
+                        'thread:created', _.bind(this.navigateToThread, this)
+                    );
 
                     Backbone.history.start({
                         pushState: true,
@@ -57,15 +60,15 @@
                 },
 
                 allThreads: function() {
-                    this.nav.updateSidebar();
-                    return this.nav.goHome();
+                    this.discussionBoardView.updateSidebar();
+                    return this.discussionBoardView.goHome();
                 },
 
                 setActiveThread: function() {
                     if (this.thread) {
-                        return this.nav.setActiveThread(this.thread.get('id'));
+                        return this.discussionBoardView.discussionThreadListView.setActiveThread(this.thread.get('id'));
                     } else {
-                        return this.nav.goHome;
+                        return this.discussionBoardView.goHome;
                     }
                 },
 
@@ -86,8 +89,8 @@
                     if (!($('.forum-content').is(':visible'))) {
                         $('.forum-content').fadeIn();
                     }
-                    if (this.newPostView.$el.is(':visible')) {
-                        this.newPostView.$el.fadeOut();
+                    if ($('.new-post-article').is(':visible')) {
+                        $('.new-post-article').fadeOut();
                     }
                     this.main = new DiscussionThreadView({
                         el: $('.forum-content'),
@@ -97,14 +100,13 @@
                     });
                     this.main.render();
                     this.main.on('thread:responses:rendered', function() {
-                        return self.nav.updateSidebar();
+                        return self.discussionBoardView.updateSidebar();
                     });
                     return this.thread.on('thread:thread_type_updated', this.showMain);
                 },
 
                 navigateToThread: function(threadId) {
-                    var thread;
-                    thread = this.discussion.get(threadId);
+                    var thread = this.discussion.get(threadId);
                     return this.navigate('' + (thread.get('commentable_id')) + '/threads/' + threadId, {
                         trigger: true
                     });
@@ -135,6 +137,7 @@
                         }
                     });
                 }
+
             });
 
             return DiscussionRouter;
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
index 53e49dbd70..cf571920a1 100644
--- a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
+++ b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_factory_spec.js
@@ -4,16 +4,34 @@ define(
         'backbone',
         'common/js/spec_helpers/page_helpers',
         'common/js/spec_helpers/discussion_spec_helper',
-        'discussion/js/discussion_board_factory'
+        'discussion/js/discussion_board_factory',
+        'discussion/js/views/discussion_board_view'
     ],
-    function($, Backbone, PageHelpers, DiscussionSpecHelper, DiscussionBoardFactory) {
+    function($, Backbone, PageHelpers, DiscussionSpecHelper, DiscussionBoardFactory, DiscussionBoardView) {
         'use strict';
 
         // TODO: re-enable when this doesn't interact badly with other history tests
-        xdescribe('Discussion Board Factory', function() {
+        describe('DiscussionBoardFactory', function() {
+            var createDiscussionBoardView = function() {
+                var discussionBoardView,
+                    discussion = DiscussionSpecHelper.createTestDiscussion({}),
+                    courseSettings = DiscussionSpecHelper.createTestCourseSettings();
+
+                setFixtures('<div class="discussion-board"><div class="forum-search"></div></div>');
+                DiscussionSpecHelper.setUnderscoreFixtures();
+
+                discussionBoardView = new DiscussionBoardView({
+                    el: $('.discussion-board'),
+                    discussion: discussion,
+                    courseSettings: courseSettings
+                });
+
+                return discussionBoardView;
+            };
+
             var initializeDiscussionBoardFactory = function() {
                 DiscussionBoardFactory({
-                    el: $('.discussion-board'),
+                    el: $('#discussion-container'),
                     courseId: 'test_course_id',
                     course_name: 'Test Course',
                     user_info: DiscussionSpecHelper.getTestUserInfo(),
@@ -33,14 +51,11 @@ define(
             };
 
             beforeEach(function() {
-                PageHelpers.preventBackboneChangingUrl();
-
                 // Install the fixtures
                 setFixtures(
-                    '<div class="discussion-board">' +
-                    '    <div class="forum-nav"></div>' +
-                    '</div>'
+                    '<div id="discussion-container" class="discussion-board"></div></div>'
                 );
+                PageHelpers.preventBackboneChangingUrl();
                 DiscussionSpecHelper.setUnderscoreFixtures();
             });
 
@@ -48,9 +63,11 @@ define(
                 Backbone.history.stop();
             });
 
-            it('can render itself', function() {
+            xit('can render itself', function() { // this failed Search: navigates to search, and TeamsTab
+                var discussionView = createDiscussionBoardView();
+                discussionView.render();
                 initializeDiscussionBoardFactory();
-                expect($('.discussion-board').text()).toContain('All Discussions');
+                expect(discussionView.$el.text()).toContain('Search all posts');
             });
         });
     }
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
new file mode 100644
index 0000000000..ccee1de7da
--- /dev/null
+++ b/lms/djangoapps/discussion/static/discussion/js/spec/discussion_board_view_spec.js
@@ -0,0 +1,58 @@
+/* globals Discussion, DiscussionCourseSettings */
+(function(define) {
+    'use strict';
+    define(
+        [
+            'underscore',
+            'jquery',
+            'edx-ui-toolkit/js/utils/constants',
+            'common/js/discussion/discussion',
+            'common/js/spec_helpers/discussion_spec_helper',
+            'discussion/js/views/discussion_board_view'
+        ],
+        function(_, $, constants, Discussion, DiscussionSpecHelper, DiscussionBoardView) {
+            describe('DiscussionBoardView', function() {
+                var createDiscussionBoardView;
+                createDiscussionBoardView = function() {
+                    var discussionBoardView,
+                        discussion = DiscussionSpecHelper.createTestDiscussion({}),
+                        courseSettings = DiscussionSpecHelper.createTestCourseSettings();
+
+                    setFixtures('<div class="discussion-board"><div class="forum-search"></div></div>');
+                    DiscussionSpecHelper.setUnderscoreFixtures();
+
+                    discussionBoardView = new DiscussionBoardView({
+                        el: $('.discussion-board'),
+                        discussion: discussion,
+                        courseSettings: courseSettings
+                    });
+
+                    return discussionBoardView;
+                };
+
+                describe('Search events', function() {
+                    it('perform search when enter pressed inside search textfield', function() {
+                        var discussionBoardView = createDiscussionBoardView(),
+                            threadListView;
+                        discussionBoardView.render();
+                        threadListView = discussionBoardView.discussionThreadListView;
+                        spyOn(threadListView, 'performSearch');
+                        discussionBoardView.$('.search-input').trigger($.Event('keydown', {
+                            which: constants.keyCodes.enter
+                        }));
+                        expect(threadListView.performSearch).toHaveBeenCalled();
+                    });
+
+                    it('perform search when search icon is clicked', function() {
+                        var discussionBoardView = createDiscussionBoardView(),
+                            threadListView;
+                        discussionBoardView.render();
+                        threadListView = discussionBoardView.discussionThreadListView;
+                        spyOn(threadListView, 'performSearch');
+                        discussionBoardView.$el.find('.search-btn').click();
+                        expect(threadListView.performSearch).toHaveBeenCalled();
+                    });
+                });
+            });
+        });
+}).call(this, define || RequireJS.define);
diff --git a/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js b/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
deleted file mode 100644
index f7c05f4daf..0000000000
--- a/lms/djangoapps/discussion/static/discussion/js/spec/views/discussion_search_view_spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define([
-    'jquery',
-    'edx-ui-toolkit/js/utils/constants',
-    'discussion/js/views/discussion_search_view'
-],
-    function($, constants, DiscussionSearchView) {
-        'use strict';
-
-        describe('DiscussionSearchView', function() {
-            var view;
-            beforeEach(function() {
-                setFixtures('<div class="search-container"></div>');
-                view = new DiscussionSearchView({
-                    el: $('.search-container'),
-                    threadListView: {
-                        performSearch: jasmine.createSpy()
-                    }
-                }).render();
-            });
-
-            describe('Search events', function() {
-                it('perform search when enter pressed inside search textfield', function() {
-                    view.$el.find('.search-input').trigger($.Event('keydown', {
-                        which: constants.keyCodes.enter
-                    }));
-                    expect(view.threadListView.performSearch).toHaveBeenCalled();
-                });
-
-                it('perform search when search icon is clicked', function() {
-                    view.$el.find('.search-btn').click();
-                    expect(view.threadListView.performSearch).toHaveBeenCalled();
-                });
-            });
-        });
-    }
-);
diff --git a/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js b/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
new file mode 100644
index 0000000000..1c092d2675
--- /dev/null
+++ b/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
@@ -0,0 +1,336 @@
+/* globals Discussion */
+(function(define) {
+    'use strict';
+
+    define([
+        'underscore',
+        'backbone',
+        'edx-ui-toolkit/js/utils/html-utils',
+        'edx-ui-toolkit/js/utils/constants',
+        'common/js/discussion/utils',
+        'common/js/discussion/views/discussion_thread_list_view',
+        'discussion/js/views/discussion_fake_breadcrumbs',
+        'discussion/js/views/discussion_search_view',
+        'text!discussion/templates/discussion-home.underscore'
+    ],
+    function(_, Backbone, HtmlUtils, Constants, DiscussionUtil,
+        DiscussionThreadListView, DiscussionFakeBreadcrumbs, DiscussionSearchView, discussionHomeTemplate) {
+        var DiscussionBoardView = Backbone.View.extend({
+            events: {
+                'click .forum-nav-browse-title': 'selectTopicHandler',
+                'click .all-topics': 'toggleBrowseMenu',
+                'keypress .forum-nav-browse-filter-input': function(event) {
+                    return DiscussionUtil.ignoreEnterKey(event);
+                },
+                'keyup .forum-nav-browse-filter-input': 'filterTopics',
+                'keydown .forum-nav-browse-filter-input': 'keyboardBinding',
+                'click .forum-nav-browse-menu-wrapper': 'ignoreClick',
+                'keydown .search-input': 'performSearch',
+                'click .search-btn': 'performSearch',
+                'topic:selected': 'clearSearch'
+            },
+
+            initialize: function(options) {
+                this.courseSettings = options.courseSettings;
+                this.sidebar_padding = 10;
+                this.current_search = '';
+                this.mode = 'all';
+                this.discussion = options.discussion;
+                this.filterInputReset();
+                this.selectedTopic = $('.forum-nav-browse-menu-item:visible .forum-nav-browse-title.is-focused');
+                this.listenTo(this.model, 'change', this.render);
+            },
+
+            render: function() {
+                this.discussionThreadListView = new DiscussionThreadListView({
+                    collection: this.discussion,
+                    el: this.$('.discussion-thread-list-container'),
+                    courseSettings: this.courseSettings
+                }).render();
+                this.searchView = new DiscussionSearchView({
+                    el: this.$('.forum-search')
+                }).render();
+                this.renderBreadcrumbs();
+                $(window).bind('load scroll resize', this.updateSidebar);
+                this.showBrowseMenu(true);
+                return this;
+            },
+
+            renderBreadcrumbs: function() {
+                var BreadcrumbsModel = Backbone.Model.extend({
+                    defaults: {
+                        contents: []
+                    }
+                });
+
+                this.breadcrumbs = new DiscussionFakeBreadcrumbs({
+                    el: $('.has-breadcrumbs'),
+                    model: new BreadcrumbsModel(),
+                    events: {
+                        'click .all-topics': function(event) {
+                            event.preventDefault();
+                        }
+                    }
+                }).render();
+            },
+
+            isBrowseMenuVisible: function() {
+                return this.$('.forum-nav-browse-menu-wrapper').is(':visible');
+            },
+
+            showBrowseMenu: function(initialLoad) {
+                if (!this.isBrowseMenuVisible()) {
+                    this.$('.forum-nav-browse-menu-wrapper').show();
+                    this.$('.forum-nav-thread-list-wrapper').hide();
+                    if (!initialLoad) {
+                        $('.forum-nav-browse-filter-input').focus();
+                        this.filterInputReset();
+                    }
+                    this.updateSidebar();
+                }
+            },
+
+            hideBrowseMenu: function() {
+                var selectedTopicList = this.$('.forum-nav-browse-title.is-focused');
+                if (this.isBrowseMenuVisible()) {
+                    selectedTopicList.removeClass('is-focused');
+                    this.$('.forum-nav-browse-menu-wrapper').hide();
+                    this.$('.forum-nav-thread-list-wrapper').show();
+                    if (this.selectedTopicId !== 'undefined') {
+                        this.$('.forum-nav-browse-filter-input').attr('aria-activedescendant', this.selectedTopicId);
+                    }
+                    this.updateSidebar();
+                }
+            },
+
+            toggleBrowseMenu: function(event) {
+                var inputText = this.$('.forum-nav-browse-filter-input').val();
+                event.preventDefault();
+                event.stopPropagation();
+                if (this.isBrowseMenuVisible()) {
+                    this.hideBrowseMenu();
+                } else {
+                    if (inputText !== '') {
+                        this.filterTopics(inputText);
+                    }
+                    this.showBrowseMenu();
+                }
+                this.breadcrumbs.model.set('contents', []);
+                this.clearSearch();
+            },
+
+            performSearch: function(event) {
+                if (event.which === Constants.keyCodes.enter || event.type === 'click') {
+                    event.preventDefault();
+                    this.hideBrowseMenu();
+                    this.breadcrumbs.model.set('contents', ['Search Results']);
+                    this.discussionThreadListView.performSearch($('.search-input', this.$el));
+                }
+            },
+
+            clearSearch: function() {
+                this.$('.search-input').val('');
+                this.discussionThreadListView.clearSearchAlerts();
+            },
+
+            updateSidebar: function() {
+                var amount, browseFilterHeight, discussionBottomOffset, discussionsBodyBottom,
+                    discussionsBodyTop, headerHeight, refineBarHeight, scrollTop, sidebarHeight, topOffset,
+                    windowHeight, $discussionBody, $sidebar;
+                scrollTop = $(window).scrollTop();
+                windowHeight = $(window).height();
+                $discussionBody = this.$('.discussion-column');
+                discussionsBodyTop = $discussionBody[0] ? $discussionBody.offset().top : undefined;
+                discussionsBodyBottom = discussionsBodyTop + $discussionBody.outerHeight();
+                $sidebar = this.$('.forum-nav');
+                if (scrollTop > discussionsBodyTop - this.sidebar_padding) {
+                    $sidebar.css('top', scrollTop - discussionsBodyTop + this.sidebar_padding);
+                } else {
+                    $sidebar.css('top', '0');
+                }
+                sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, this.sidebar_padding);
+                topOffset = scrollTop + windowHeight;
+                discussionBottomOffset = discussionsBodyBottom + this.sidebar_padding;
+                amount = Math.max(topOffset - discussionBottomOffset, 0);
+                sidebarHeight = sidebarHeight - this.sidebar_padding - amount;
+                sidebarHeight = Math.min(sidebarHeight + 1, $discussionBody.outerHeight());
+                $sidebar.css('height', sidebarHeight);
+                headerHeight = this.$('.forum-nav-header').outerHeight();
+                refineBarHeight = this.$('.forum-nav-refine-bar').outerHeight();
+                browseFilterHeight = this.$('.forum-nav-browse-filter').outerHeight();
+                this.$('.forum-nav-thread-list')
+                    .css('height', (sidebarHeight - headerHeight - refineBarHeight - 2) + 'px');
+                this.$('.forum-nav-browse-menu')
+                    .css('height', (sidebarHeight - headerHeight - browseFilterHeight - 2) + 'px');
+            },
+
+            goHome: function() {
+                var url = DiscussionUtil.urlFor('notifications_status', window.user.get('id'));
+                HtmlUtils.append(this.$('.forum-content').empty(), HtmlUtils.template(discussionHomeTemplate)({}));
+                this.$('.forum-nav-thread-list a').removeClass('is-active').find('.sr')
+                    .remove();
+                this.$('input.email-setting').bind('click', this.updateEmailNotifications);
+                DiscussionUtil.safeAjax({
+                    url: url,
+                    type: 'GET',
+                    success: function(response) {
+                        $('input.email-setting').prop('checked', response.status);
+                    }
+                });
+            },
+
+            filterInputReset: function() {
+                this.filterEnabled = true;
+                this.selectedTopicIndex = -1;
+                this.selectedTopicId = null;
+            },
+
+            selectOption: function(element) {
+                var activeDescendantId, activeDescendantText;
+                if (this.selectedTopic.length > 0) {
+                    this.selectedTopic.removeClass('is-focused');
+                }
+                if (element) {
+                    element.addClass('is-focused');
+                    activeDescendantId = element.parent().attr('id');
+                    activeDescendantText = element.text();
+                    this.selectedTopic = element;
+                    this.selectedTopicId = activeDescendantId;
+                    this.$('.forum-nav-browse-filter-input')
+                        .attr('aria-activedescendant', activeDescendantId)
+                        .val(activeDescendantText);
+                }
+            },
+
+            keyboardBinding: function(event) {
+                var key = event.which,
+                    $inputText = $('.forum-nav-browse-filter-input'),
+                    $filteredMenuItems = $('.forum-nav-browse-menu-item:visible'),
+                    filteredMenuItemsLen = $filteredMenuItems.length,
+                    $curOption = $filteredMenuItems.eq(0).find('.forum-nav-browse-title').eq(0),
+                    $activeOption, $prev, $next;
+
+                switch (key) {
+                case Constants.keyCodes.enter:
+                    $activeOption = $filteredMenuItems.find('.forum-nav-browse-title.is-focused');
+                    if ($inputText.val() !== '') {
+                        $activeOption.trigger('click');
+                        this.filterInputReset();
+                    }
+                    break;
+
+                case Constants.keyCodes.esc:
+                    this.toggleBrowseMenu(event);
+                    this.$('.forum-nav-browse-filter-input').val('');
+                    this.filterInputReset();
+                    $('.all-topics').trigger('click');
+                    break;
+
+                case Constants.keyCodes.up:
+                    if (this.selectedTopicIndex > 0) {
+                        this.selectedTopicIndex -= 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $prev = $('.forum-nav-browse-menu-item:visible')
+                            .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                            .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $prev.addClass('is-focused');
+                        }
+                        this.selectOption($prev);
+                    }
+                    break;
+
+                case Constants.keyCodes.down:
+                    if (this.selectedTopicIndex < filteredMenuItemsLen - 1) {
+                        this.selectedTopicIndex += 1;
+                        if (this.isBrowseMenuVisible()) {
+                            $next = $('.forum-nav-browse-menu-item:visible')
+                                .eq(this.selectedTopicIndex).find('.forum-nav-browse-title')
+                                .eq(0);
+                            this.filterEnabled = false;
+                            $curOption.removeClass('is-focused');
+                            $next.addClass('is-focused');
+                        }
+                        this.selectOption($next);
+                    }
+                    break;
+
+                default:
+                }
+            },
+
+            filterTopics: function() {
+                var $items, query, filteredItems,
+                    self = this;
+                query = this.$('.forum-nav-browse-filter-input').val();
+                $items = this.$('.forum-nav-browse-menu-item');
+                if (query.length === 0) {
+                    $items.find('.forum-nav-browse-title.is-focused').removeClass('is-focused');
+                    return $items.show();
+                } else {
+                    if (self.filterEnabled) {
+                        $items.hide();
+                        filteredItems = $items.each(function(i, item) {
+                            var path, pathText,
+                                $item = $(item);
+                            if (!$item.is(':visible')) {
+                                pathText = self.getPathText($item).toLowerCase();
+                                if (query.split(' ').every(function(term) {
+                                    return pathText.search(term.toLowerCase()) !== -1;
+                                })) {
+                                    path = $item.parents('.forum-nav-browse-menu-item').andSelf();
+                                    path.add($item.find('.forum-nav-browse-menu-item')).show();
+                                }
+                            }
+                        });
+                    }
+                    return filteredItems;
+                }
+            },
+
+            getPathText: function(item) {
+                var path, pathTitles;
+                path = item.parents('.forum-nav-browse-menu-item').andSelf();
+                pathTitles = path.children('.forum-nav-browse-title').map(function(i, elem) {
+                    return $(elem).text();
+                }).get();
+                return pathTitles.join(' / ');
+            },
+
+            selectTopicHandler: function(event) {
+                var $item = $(event.target).closest('.forum-nav-browse-menu-item');
+                event.preventDefault();
+                this.hideBrowseMenu();
+                this.trigger('topic:selected', this.getBreadcrumbText($item));
+                return this.discussionThreadListView.selectTopic($(event.target));
+            },
+
+            getBreadcrumbText: function($item) {
+                var $parentSubMenus = $item.parents('.forum-nav-browse-submenu'),
+                    crumbs = [],
+                    subTopic = $('.forum-nav-browse-title', $item)
+                        .first()
+                        .text()
+                        .trim();
+
+                $parentSubMenus.each(function(i, el) {
+                    crumbs.push($(el).siblings('.forum-nav-browse-title')
+                        .first()
+                        .text()
+                        .trim()
+                    );
+                });
+
+                if (subTopic !== 'All Discussions') {
+                    crumbs.push(subTopic);
+                }
+
+                return crumbs;
+            }
+
+        });
+
+        return DiscussionBoardView;
+    });
+}).call(this, define || RequireJS.define);
diff --git a/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js b/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
index 9d1dd00620..ebf122b402 100644
--- a/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
+++ b/lms/djangoapps/discussion/static/discussion/js/views/discussion_search_view.js
@@ -15,33 +15,16 @@
          * in order to clean up that file and make it possible to break its logic into files like this one.
          */
         var searchView = Backbone.View.extend({
-            events: {
-                'keydown .search-input': 'performSearch',
-                'click .search-btn': 'performSearch',
-                'topic:selected': 'clearSearch'
-            },
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'threadListView'));
+                _.extend(this, _.pick(options, ['discussionBoardView']));
 
                 this.template = HtmlUtils.template(searchTemplate);
-                this.threadListView = options.threadListView;
-
                 this.listenTo(this.model, 'change', this.render);
                 this.render();
             },
             render: function() {
                 HtmlUtils.setHtml(this.$el, this.template());
                 return this;
-            },
-            performSearch: function(event) {
-                if (event.which === constants.keyCodes.enter || event.type === 'click') {
-                    event.preventDefault();
-                    this.threadListView.performSearch($('.search-input', this.$el));
-                }
-            },
-            clearSearch: function() {
-                this.$('.search-input').val('');
-                this.threadListView.clearSearchAlerts();
             }
         });
 
diff --git a/common/static/common/templates/discussion/discussion-home.underscore b/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore
similarity index 100%
rename from common/static/common/templates/discussion/discussion-home.underscore
rename to lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore
diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board.html b/lms/djangoapps/discussion/templates/discussion/discussion_board.html
index b2a4b6d0ac..7882739cf1 100644
--- a/lms/djangoapps/discussion/templates/discussion/discussion_board.html
+++ b/lms/djangoapps/discussion/templates/discussion/discussion_board.html
@@ -77,6 +77,8 @@ DiscussionBoardFactory({
     <div class="page-content">
         <div class="discussion-body layout layout-1t2t">
             <aside class="forum-nav layout-col layout-col-a" role="complementary" aria-label="${_("Discussion thread list")}">
+                <%include file="_filter_dropdown.html" />
+                <div class="discussion-thread-list-container"></div>
             </aside>
 
             <main id="main" aria-label="Content" tabindex="-1" class="discussion-column layout-col layout-col-b">
diff --git a/lms/static/lms/js/spec/main.js b/lms/static/lms/js/spec/main.js
index 67e4f40cc5..ded0787f3c 100644
--- a/lms/static/lms/js/spec/main.js
+++ b/lms/static/lms/js/spec/main.js
@@ -288,11 +288,11 @@
                 deps: ['jquery', 'underscore', 'slick.core', 'slick.grid'],
                 init: function() {
                     // Set global variables that the util code is expecting to be defined
-                    require([
+                    require([  // eslint-disable-line global-require
                         'edx-ui-toolkit/js/utils/html-utils',
                         'edx-ui-toolkit/js/utils/string-utils'
                     ], function(HtmlUtils, StringUtils) {
-                        window.edx = edx || {};
+                        window.edx = window.edx || {};
                         window.edx.HtmlUtils = HtmlUtils;
                         window.edx.StringUtils = StringUtils;
                     });
@@ -383,7 +383,7 @@
                 deps: ['jquery', 'underscore', 'underscore.string', 'backbone', 'gettext'],
                 init: function() {
                     // Set global variables that the payment code is expecting to be defined
-                    require([
+                    require([  // eslint-disable-line global-require
                         'underscore',
                         'underscore.string',
                         'edx-ui-toolkit/js/utils/html-utils',
@@ -391,7 +391,7 @@
                     ], function(_, str, HtmlUtils, StringUtils) {
                         window._ = _;
                         window._.str = str;
-                        window.edx = edx || {};
+                        window.edx = window.edx || {};
                         window.edx.HtmlUtils = HtmlUtils;
                         window.edx.StringUtils = StringUtils;
                     });
@@ -527,10 +527,21 @@
                 exports: 'DiscussionUtil',
                 init: function() {
                     // Set global variables that the discussion code is expecting to be defined
-                    require(['backbone', 'URI'], function(Backbone, URI) {
-                        window.Backbone = Backbone;
-                        window.URI = URI;
-                    });
+                    require(  // eslint-disable-line global-require
+                        [
+                            'backbone',
+                            'URI',
+                            'edx-ui-toolkit/js/utils/html-utils',
+                            'edx-ui-toolkit/js/utils/string-utils'
+                        ],
+                        function(Backbone, URI, HtmlUtils, StringUtils) {
+                            window.Backbone = Backbone;
+                            window.URI = URI;
+                            window.edx = window.edx || {};
+                            window.edx.HtmlUtils = HtmlUtils;
+                            window.edx.StringUtils = StringUtils;
+                        }
+                    );
                 }
             },
             'common/js/discussion/content': {
@@ -542,11 +553,11 @@
             'common/js/discussion/discussion': {
                 deps: [
                     'common/js/discussion/utils',
-                    'xmodule_js/common_static/common/js/discussion/content'
+                    'common/js/discussion/content'
                 ],
                 exports: 'Discussion'
             },
-            'common/js/discussion/discussion_course_settings': {
+            'common/js/discussion/models/discussion_course_settings': {
                 deps: [
                     'common/js/discussion/utils'
                 ],
@@ -664,7 +675,7 @@
     var testFiles = [
         'discussion/js/spec/discussion_board_factory_spec.js',
         'discussion/js/spec/discussion_profile_page_factory_spec.js',
-        'discussion/js/spec/views/discussion_search_view_spec.js',
+        'discussion/js/spec/discussion_board_view_spec.js',
         'discussion/js/spec/views/discussion_user_profile_view_spec.js',
         'lms/js/spec/preview/preview_factory_spec.js',
         'js/spec/api_admin/catalog_preview_spec.js',
diff --git a/lms/templates/discussion/_js_body_dependencies.html b/lms/templates/discussion/_js_body_dependencies.html
index fda375a109..d4be582f9b 100644
--- a/lms/templates/discussion/_js_body_dependencies.html
+++ b/lms/templates/discussion/_js_body_dependencies.html
@@ -16,11 +16,14 @@ from openedx.core.djangolib.js_utils import js_escaped_string
 <%
 discussion_classes = [
     ['Discussion', 'common/js/discussion/discussion'],
+    ['Content', 'common/js/discussion/content'],
     ['DiscussionModuleView', 'common/js/discussion/discussion_module_view'],
     ['DiscussionThreadView', 'common/js/discussion/views/discussion_thread_view'],
     ['DiscussionThreadListView', 'common/js/discussion/views/discussion_thread_list_view'],
     ['DiscussionThreadProfileView', 'common/js/discussion/views/discussion_thread_profile_view'],
     ['DiscussionUtil', 'common/js/discussion/utils'],
+    ['DiscussionCourseSettings', 'common/js/discussion/models/discussion_course_settings'],
+    ['DiscussionUser', 'common/js/discussion/models/discussion_user'],
     ['NewPostView', 'common/js/discussion/views/new_post_view'],
 ]
 %>
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
index d0d73f7ce4..20a2d64170 100644
--- a/lms/templates/discussion/_thread_list_template.html
+++ b/lms/templates/discussion/_thread_list_template.html
@@ -1,8 +1,7 @@
 <%page expression_filter="h"/>
 <%! from django.utils.translation import ugettext as _ %>
 <script type="text/template" id="thread-list-template">
-    <%include file="_filter_dropdown.html" />
-    <div class="forum-nav-thread-list-wrapper" id="sort-filter-wrapper" tabindex="-1">
+    <div class="forum-nav-thread-list-wrapper" id="sort-filter-wrapper" tabindex="-1" style="display:none">
         <div class="forum-nav-refine-bar">
             <label class="forum-nav-filter-main">
                 ## Translators: This labels a filter menu in forum navigation
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 6c87246665..b8d210a4bd 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -14,7 +14,7 @@
 <%
 template_names = [
     'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show', 'thread-response-edit',
-    'response-comment-show', 'response-comment-edit', 'thread-list-item', 'discussion-home', 'search-alert',
+    'response-comment-show', 'response-comment-edit', 'thread-list-item', 'search-alert',
     'new-post', 'new-post-menu-entry', 'new-post-menu-category', 'new-post-alert', 'topic', 'post-user-display',
     'inline-discussion', 'pagination', 'profile-thread', 'customwmd-prompt', 'nav-loading', 'thread-type'
 ]

From cb14d1598e173a0a43dbfd9fb080cd83ef72ba57 Mon Sep 17 00:00:00 2001
From: alisan617 <atang@edx.org>
Date: Tue, 15 Nov 2016 15:05:28 -0500
Subject: [PATCH 6/7] discussion course settings change

---
 .../discussion/static/discussion/js/discussion_router.js     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
index 83a4d19cd8..a6bea34cbf 100644
--- a/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
+++ b/lms/djangoapps/discussion/static/discussion/js/discussion_router.js
@@ -6,10 +6,9 @@
             'underscore',
             'backbone',
             'common/js/discussion/utils',
-            'common/js/discussion/models/discussion_course_settings',
             'common/js/discussion/views/discussion_thread_view'
         ],
-        function(_, Backbone, DiscussionUtil, DiscussionCourseSettings, DiscussionThreadView) {
+        function(_, Backbone, DiscussionUtil, DiscussionThreadView) {
             var DiscussionRouter = Backbone.Router.extend({
                 routes: {
                     '': 'allThreads',
@@ -21,7 +20,7 @@
                     _.bindAll(this, 'allThreads', 'showThread');
                     this.courseId = options.courseId;
                     this.discussion = options.discussion;
-                    this.course_settings = new DiscussionCourseSettings(options.course_settings);
+                    this.course_settings = options.courseSettings;
                     this.discussionBoardView = options.discussionBoardView;
                     this.newPostView = options.newPostView;
                 },

From b8146789337e9e3ba573f2107e65dbcc049a6006 Mon Sep 17 00:00:00 2001
From: Gregory Martin <greg@edx.org>
Date: Tue, 15 Nov 2016 11:23:29 -0500
Subject: [PATCH 7/7] register dateutil_factory in request.js

---
 lms/envs/common.py                | 1 +
 lms/static/js/dateutil_factory.js | 1 -
 lms/static/lms/js/build.js        | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 948a6452c2..7f5b41f683 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1724,6 +1724,7 @@ REQUIRE_JS_PATH_OVERRIDES = {
     'moment-timezone': 'common/js/vendor/moment-timezone-with-data.js',
     'js/courseware/course_home_events': 'js/courseware/course_home_events.js',
     'js/courseware/accordion_events': 'js/courseware/accordion_events.js',
+    'js/dateutil_factory': 'js/dateutil_factory.js',
     'js/courseware/link_clicked_events': 'js/courseware/link_clicked_events.js',
     'js/courseware/toggle_element_visibility': 'js/courseware/toggle_element_visibility.js',
     'js/student_account/logistration_factory': 'js/student_account/logistration_factory.js',
diff --git a/lms/static/js/dateutil_factory.js b/lms/static/js/dateutil_factory.js
index d0b5b6c6a5..4e75636c5a 100644
--- a/lms/static/js/dateutil_factory.js
+++ b/lms/static/js/dateutil_factory.js
@@ -93,4 +93,3 @@
         return DateUtilFactory;
     });
 }).call(this, define || RequireJS.define);
-
diff --git a/lms/static/lms/js/build.js b/lms/static/lms/js/build.js
index c9a088cce8..a80b35e875 100644
--- a/lms/static/lms/js/build.js
+++ b/lms/static/lms/js/build.js
@@ -40,7 +40,8 @@
             'lms/js/preview/preview_factory',
             'support/js/certificates_factory',
             'support/js/enrollment_factory',
-            'teams/js/teams_tab_factory'
+            'teams/js/teams_tab_factory',
+            'js/dateutil_factory'
         ]),
 
         /**