From 949efb62e97ddba937082c84edff6cc705e82713 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Mon, 9 Jul 2012 11:27:45 -0400 Subject: [PATCH] Got courses page working... mostly. --- common/lib/xmodule/xmodule/course_module.py | 6 +- lms/envs/dev.py | 2 +- lms/templates/course.html | 160 +------------------- lms/urls.py | 16 +- 4 files changed, 17 insertions(+), 167 deletions(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index 7e70b99012..714c11a711 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -1,7 +1,9 @@ from path import path from xmodule.modulestore import Location from xmodule.seq_module import SequenceDescriptor, SequenceModule +import logging +log = logging.getLogger("mitx.courseware") class CourseDescriptor(SequenceDescriptor): module_class = SequenceModule @@ -16,7 +18,7 @@ class CourseDescriptor(SequenceDescriptor): return "/".join([self.location.org, self.location.course, self.location.name]) @property - def display_name(self): + def title(self): self.metadata['display_name'] def get_about_section(self, section_key): @@ -52,7 +54,7 @@ class CourseDescriptor(SequenceDescriptor): elif section_key == "title": return self.name elif section_key == "university": - return self.org + return self.location.org elif section_key == "number": return self.number diff --git a/lms/envs/dev.py b/lms/envs/dev.py index f175ca1f53..decd92d136 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -11,7 +11,7 @@ from .common import * from .logsettings import get_logger_config DEBUG = True -TEMPLATE_DEBUG = False +TEMPLATE_DEBUG = True LOGGING = get_logger_config(ENV_ROOT / "log", logging_env="dev", diff --git a/lms/templates/course.html b/lms/templates/course.html index 35f9e46acf..c13e30b3f4 100644 --- a/lms/templates/course.html +++ b/lms/templates/course.html @@ -2,21 +2,20 @@ <%! from django.core.urlresolvers import reverse %> - -%for course in courses: +<%page args="course" />
- +
-

${course.title}

+

${course.get_about_section('title')}

➔
-

${course.institution}

+

${course.get_about_section('university')}

7/23/12 → 12/15/12

@@ -28,154 +27,3 @@
-%endfor - -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
- -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
- -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
- -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
- -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
- -
-
-
- -
-

${course.title}

-
-
➔
- -
-
-
-

${course.institution}

-

7/23/12 → 12/15/12

-
-
- -
-
-

An advanced introduction to analog circuits.

-
-
-
-
diff --git a/lms/urls.py b/lms/urls.py index 0f3d78770e..201dc7f182 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -69,15 +69,15 @@ if settings.COURSEWARE_ENABLED: # Multicourse related: url(r'^courses/?$', 'courseware.views.courses', name="courses"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/info$', 'courseware.views.course_info', name="info"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/book$', 'staticbook.views.index', name="book"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/enroll$', 'student.views.enroll', name="enroll"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/courseware/?$', 'courseware.views.index', name="courseware"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/courseware/(?P[^/]*)/(?P
[^/]*)/$', 'courseware.views.index', name="courseware_section"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/profile$', 'courseware.views.profile', name="profile"), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/profile/(?P[^/]*)/$', 'courseware.views.profile'), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/info$', 'courseware.views.course_info', name="info"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/book$', 'staticbook.views.index', name="book"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/enroll$', 'student.views.enroll', name="enroll"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/?$', 'courseware.views.index', name="courseware"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/(?P[^/]*)/(?P
[^/]*)/$', 'courseware.views.index', name="courseware_section"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile$', 'courseware.views.profile', name="profile"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile/(?P[^/]*)/$', 'courseware.views.profile'), - url(r'^courses/(?P[^/]+/[^/]+/[^/])/about$', 'courseware.views.course_info', name="about_course"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/about$', 'courseware.views.course_info', name="about_course"), ) if settings.ENABLE_MULTICOURSE: