From afe22ca42eb292dae6cc50a5d3c845a99494355f Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mitx.mit.edu>
Date: Fri, 20 Jun 2014 10:57:11 -0400
Subject: [PATCH] Review from Cale
---
lms/djangoapps/courseware/tests/test_navigation.py | 48 ++++++++++++++++++++++++++++--------------------
lms/lib/xblock/mixin.py | 14 +++++++-------
lms/templates/courseware/courseware.html | 2 +-
3 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/lms/djangoapps/courseware/tests/test_navigation.py b/lms/djangoapps/courseware/tests/test_navigation.py
index e447ee1..aac89f5 100644
--- a/lms/djangoapps/courseware/tests/test_navigation.py
+++ b/lms/djangoapps/courseware/tests/test_navigation.py
@@ -69,6 +69,20 @@ class TestNavigation(ModuleStoreTestCase, LoginEnrollmentTestCase):
self.staff_user = GlobalStaffFactory()
+ def assertTabActive(self, tabname, response):
+ ''' Check if the progress tab is active in the tab set '''
+ for line in response.content.split('\n'):
+ if tabname in line and 'active' in line:
+ return
+ raise AssertionError("assertTabActive failed: "+tabname+" not active")
+
+ def assertTabInactive(self, tabname, response):
+ ''' Check if the progress tab is active in the tab set '''
+ for line in response.content.split('\n'):
+ if tabname in line and 'active' in line:
+ raise AssertionError("assertTabInactive failed: "+tabname+" active")
+ return
+
def test_chrome_settings(self):
'''
Test settings for disabling and modifying navigation chrome in the courseware:
@@ -84,34 +98,28 @@ class TestNavigation(ModuleStoreTestCase, LoginEnrollmentTestCase):
('none', False, False),
('fullchrome', True, True),
('accordion', True, False),
- ('fullchrome', True, True))
+ ('fullchrome', True, True)
+ )
for (displayname, accordion, tabs) in test_data:
response = self.client.get(reverse('courseware_section', kwargs={
- 'course_id': self.course.id.to_deprecated_string(),
- 'chapter': 'Chrome',
- 'section': displayname,
- }))
+ 'course_id': self.course.id.to_deprecated_string(),
+ 'chapter': 'Chrome',
+ 'section': displayname,
+ }))
self.assertEquals('open_close_accordion' in response.content, accordion)
self.assertEquals('course-tabs' in response.content, tabs)
- def tab_active(tabname, response):
- ''' Check if the progress tab is active in the tab set '''
- for line in response.content.split('\n'):
- if tabname in line and 'active' in line:
- return True
- return False
-
- self.assertFalse(tab_active('progress', response))
- self.assertTrue(tab_active('courseware', response))
+ self.assertTabInactive('progress', response)
+ self.assertTabActive('courseware', response)
response = self.client.get(reverse('courseware_section', kwargs={
- 'course_id': self.course.id.to_deprecated_string(),
- 'chapter': 'Chrome',
- 'section': 'progress_tab',
- }))
+ 'course_id': self.course.id.to_deprecated_string(),
+ 'chapter': 'Chrome',
+ 'section': 'progress_tab',
+ }))
- self.assertTrue(tab_active('progress', response))
- self.assertFalse(tab_active('courseware', response))
+ self.assertTabActive('progress', response)
+ self.assertTabInactive('courseware', response)
@override_settings(SESSION_INACTIVITY_TIMEOUT_IN_SECONDS=1)
def test_inactive_session_timeout(self):
diff --git a/lms/lib/xblock/mixin.py b/lms/lib/xblock/mixin.py
index 0f5ba0c..89c7ae2 100644
--- a/lms/lib/xblock/mixin.py
+++ b/lms/lib/xblock/mixin.py
@@ -19,19 +19,19 @@ class LmsBlockMixin(XBlockMixin):
scope=Scope.settings,
)
chrome = String(
- help="Which chrome to show. Options: "
- "chromeless -- No chrome"
- "tabs -- just tabs"
- "accordion -- just accordion"
+ help="Which chrome to show. Options: \n"
+ "chromeless -- No chrome\n"
+ "tabs -- just tabs\n"
+ "accordion -- just accordion\n"
"tabs,accordion -- Full Chrome",
scope=Scope.settings,
- default = None,
+ default=None,
)
default_tab = String(
- help="Override which tab is selected."
+ help="Override which tab is selected. "
"If not set, courseware tab is shown.",
scope=Scope.settings,
- default = None,
+ default=None,
)
source_file = String(help="source file name (eg for latex)", scope=Scope.settings)
ispublic = Boolean(help="Whether this course is open to the public, or only to admins", scope=Scope.settings)
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 8098483..f25dcfb 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -189,7 +189,7 @@ ${fragment.foot_html()}
<div class="container">
<div class="course-wrapper">
-% if not disable_accordion:
+% if disable_accordion is UNDEFINED:
<div class="course-index" role="navigation">
<header id="open_close_accordion">
<a href="#">${_("close")}</a>
--
libgit2 0.26.0