From 4fd1ebce1cfcdfcc81841a4a0d5e7fc2914e59fd Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Mon, 8 Jun 2015 14:55:56 -0400 Subject: [PATCH] Fixing test to match CSS --- common/test/acceptance/tests/lms/test_lms.py | 2 +- .../instructor_dashboard_2/instructor_dashboard_2.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index 94e2829b29..f2faded951 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -116,7 +116,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest): self.login_page.visit().password_reset(email=email) # Expect that we're shown a success message - self.assertIn("PASSWORD RESET EMAIL SENT", self.login_page.wait_for_success()) + self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success()) def test_password_reset_failure(self): # Navigate to the password reset form diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html index ca7c8d0246..8cf87e56d3 100644 --- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html +++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html @@ -4,6 +4,10 @@ from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> +<<<<<<< Updated upstream +======= +<%block name="bodyclass">view-incourse view-instructordash +>>>>>>> Stashed changes ## ----- Tips on adding something to the new instructor dashboard ----- ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html