Skip to content

E
edx-platform
Commit e729cc32 by Matthew Mongeau
Options

Fix url confusion for course/info and course/about

parent 9d1dc37b
Showing with 85 additions and 86 deletions
lms/djangoapps/courseware/views.py
...@@ -275,7 +275,6 @@ def jump_to(request, probname=None): ...@@ -275,7 +275,6 @@ def jump_to(request, probname=None):
@ensure_csrf_cookie @ensure_csrf_cookie
def course_info(request, course_id): def course_info(request, course_id):
# This is the advertising page for a student to look at the course before signing up
csrf_token = csrf(request)['csrf_token'] csrf_token = csrf(request)['csrf_token']
try: try:
...@@ -283,4 +282,4 @@ def course_info(request, course_id): ...@@ -283,4 +282,4 @@ def course_info(request, course_id):
except KeyError: except KeyError:
raise Http404("Course not found") raise Http404("Course not found")
return render_to_response('portal/course_about.html', {'csrf': csrf_token, 'course' : course}) return render_to_response('info.html', {'csrf': csrf_token, 'course' : course})
lms/djangoapps/student/views.py
...@@ -474,9 +474,11 @@ def accept_name_change(request): ...@@ -474,9 +474,11 @@ def accept_name_change(request):
@ensure_csrf_cookie @ensure_csrf_cookie
def course_info(request): def course_info(request):
# This is the advertising page for a student to look at the course before signing up
csrf_token = csrf(request)['csrf_token'] csrf_token = csrf(request)['csrf_token']
course = settings.COURSES_BY_ID[course_id]
# TODO: Couse should be a model # TODO: Couse should be a model
return render_to_response('course_info.html', {'csrf': csrf_token }) return render_to_response('portal/course_about.html', {'csrf': csrf_token, 'course': course })
def about(request): def about(request):
return render_to_response('about.html', None) return render_to_response('about.html', None)
......
lms/static/sass/application.css
...@@ -1171,7 +1171,6 @@ h1.top-header, div.course-wrapper section.course-content ol.vert-mod > li header ...@@ -1171,7 +1171,6 @@ h1.top-header, div.course-wrapper section.course-content ol.vert-mod > li header
border-bottom: 1px solid #eddfaa; border-bottom: 1px solid #eddfaa;
border-top: 1px solid #fff; border-top: 1px solid #fff;
font-size: 12px; font-size: 12px;
height: 46px;
line-height: 46px; line-height: 46px;
margin: -22.652px -22.652px 22.652px; margin: -22.652px -22.652px 22.652px;
text-shadow: 0 1px 0 #fff; } text-shadow: 0 1px 0 #fff; }
...@@ -1185,7 +1184,6 @@ h1.top-header, div.course-wrapper section.course-content ol.vert-mod > li header ...@@ -1185,7 +1184,6 @@ h1.top-header, div.course-wrapper section.course-content ol.vert-mod > li header
color: #7e691a; color: #7e691a;
text-decoration: none; } text-decoration: none; }
.topbar a.block-link, nav.sequence-nav a.block-link, .topbar nav.sequence-nav ol a, nav.sequence-nav ol .topbar a, nav.sequence-nav ol a { .topbar a.block-link, nav.sequence-nav a.block-link, .topbar nav.sequence-nav ol a, nav.sequence-nav ol .topbar a, nav.sequence-nav ol a {
background: #f2e7bf;
border-left: 1px solid #e4d080; border-left: 1px solid #e4d080;
-webkit-box-shadow: inset 1px 0 0 #faf7e9; -webkit-box-shadow: inset 1px 0 0 #faf7e9;
-moz-box-shadow: inset 1px 0 0 #faf7e9; -moz-box-shadow: inset 1px 0 0 #faf7e9;
...@@ -4622,17 +4620,17 @@ section.course-index div#accordion ul.ui-accordion-content { ...@@ -4622,17 +4620,17 @@ section.course-index div#accordion ul.ui-accordion-content {
margin: 0; margin: 0;
padding: 1em 1.5em; } padding: 1em 1.5em; }
section.course-index div#accordion ul.ui-accordion-content li { section.course-index div#accordion ul.ui-accordion-content li {
background: transparent; margin-bottom: 11.326px; }
border: 1px solid transparent;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
margin-bottom: 11.326px;
position: relative;
padding: 5px 36px 5px 10px; }
section.course-index div#accordion ul.ui-accordion-content li a { section.course-index div#accordion ul.ui-accordion-content li a {
border: 1px solid transparent;
background: transparent;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
position: relative;
padding: 5px 36px 5px 10px;
text-decoration: none; text-decoration: none;
display: block; display: block;
color: #666; } color: #666; }
...@@ -4643,80 +4641,80 @@ section.course-index div#accordion ul.ui-accordion-content { ...@@ -4643,80 +4641,80 @@ section.course-index div#accordion ul.ui-accordion-content {
color: #666; color: #666;
font-weight: normal; font-weight: normal;
display: block; } display: block; }
section.course-index div#accordion ul.ui-accordion-content li:after { section.course-index div#accordion ul.ui-accordion-content li a:after {
background: transparent; background: transparent;
border-top: 1px solid #b4b4b4; border-top: 1px solid #b4b4b4;
border-right: 1px solid #b4b4b4; border-right: 1px solid #b4b4b4;
content: ""; content: "";
display: block; display: block;
height: 12px; height: 12px;
margin-top: -6px; margin-top: -6px;
opacity: 0; opacity: 0;
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 30px; right: 30px;
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
-o-transform: rotate(45deg); -o-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
width: 12px; } width: 12px; }
section.course-index div#accordion ul.ui-accordion-content li:hover { section.course-index div#accordion ul.ui-accordion-content li a:hover {
background-image: -webkit-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4)); background-image: -webkit-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4));
background-image: -moz-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4)); background-image: -moz-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4));
background-image: -ms-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4)); background-image: -ms-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4));
background-image: -o-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4)); background-image: -o-linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4));
background-image: linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4)); background-image: linear-gradient(-90deg, rgba(245, 245, 245, 0.4), rgba(230, 230, 230, 0.4));
border-color: #c8c8c8; } border-color: #c8c8c8; }
section.course-index div#accordion ul.ui-accordion-content li:hover:after { section.course-index div#accordion ul.ui-accordion-content li a:hover:after {
opacity: 1; opacity: 1;
right: 15px; right: 15px;
-webkit-transition-property: all; -webkit-transition-property: all;
-moz-transition-property: all; -moz-transition-property: all;
-ms-transition-property: all; -ms-transition-property: all;
-o-transition-property: all; -o-transition-property: all;
transition-property: all; transition-property: all;
-webkit-transition-duration: 0.2s; -webkit-transition-duration: 0.2s;
-moz-transition-duration: 0.2s; -moz-transition-duration: 0.2s;
-ms-transition-duration: 0.2s; -ms-transition-duration: 0.2s;
-o-transition-duration: 0.2s; -o-transition-duration: 0.2s;
transition-duration: 0.2s; transition-duration: 0.2s;
-webkit-transition-timing-function: linear; -webkit-transition-timing-function: linear;
-moz-transition-timing-function: linear; -moz-transition-timing-function: linear;
-ms-transition-timing-function: linear; -ms-transition-timing-function: linear;
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
-webkit-transition-delay: 0; -webkit-transition-delay: 0;
-moz-transition-delay: 0; -moz-transition-delay: 0;
-ms-transition-delay: 0; -ms-transition-delay: 0;
-o-transition-delay: 0; -o-transition-delay: 0;
transition-delay: 0; } transition-delay: 0; }
section.course-index div#accordion ul.ui-accordion-content li:hover > a p { section.course-index div#accordion ul.ui-accordion-content li a:hover > a p {
color: #333; } color: #333; }
section.course-index div#accordion ul.ui-accordion-content li:active { section.course-index div#accordion ul.ui-accordion-content li a:active {
-webkit-box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 14px 0 rgba(0, 0, 0, 0.1); }
top: 1px; } section.course-index div#accordion ul.ui-accordion-content li a:active:after {
section.course-index div#accordion ul.ui-accordion-content li:active:after { opacity: 1;
opacity: 1; right: 15px; }
right: 15px; }
section.course-index div#accordion ul.ui-accordion-content li.active { section.course-index div#accordion ul.ui-accordion-content li.active {
background: #f0f0f0;
background-image: -webkit-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -moz-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -ms-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -o-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: linear-gradient(-90deg, #f5f5f5, #e6e6e6);
border-color: #c8c8c8;
font-weight: bold; } font-weight: bold; }
section.course-index div#accordion ul.ui-accordion-content li.active > a p { section.course-index div#accordion ul.ui-accordion-content li.active > a {
color: #333; } background: #f0f0f0;
background-image: -webkit-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -moz-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -ms-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: -o-linear-gradient(-90deg, #f5f5f5, #e6e6e6);
background-image: linear-gradient(-90deg, #f5f5f5, #e6e6e6);
border-color: #c8c8c8; }
section.course-index div#accordion ul.ui-accordion-content li.active > a:after {
opacity: 1;
right: 15px; }
section.course-index div#accordion ul.ui-accordion-content li.active > a p {
color: #333; }
section.course-index div#accordion ul.ui-accordion-content li.active span.subtitle { section.course-index div#accordion ul.ui-accordion-content li.active span.subtitle {
font-weight: normal; } font-weight: normal; }
section.course-index div#accordion ul.ui-accordion-content li.active:after {
opacity: 1;
right: 15px; }
@-moz-document url-prefix() { @-moz-document url-prefix() {
a.add-fullscreen { a.add-fullscreen {
......
lms/urls.py
...@@ -73,7 +73,7 @@ if settings.COURSEWARE_ENABLED: ...@@ -73,7 +73,7 @@ if settings.COURSEWARE_ENABLED:
# Multicourse related: # Multicourse related:
url(r'^courses/?$', 'courseware.views.courses', name="courses"), url(r'^courses/?$', 'courseware.views.courses', name="courses"),
url(r'^courses/(?P<course_id>[^/]*)/info$', 'util.views.info', name="info"), url(r'^courses/(?P<course_id>[^/]*)/info$', 'courseware.views.course_info', name="info"),
url(r'^courses/(?P<course_id>[^/]*)/book$', 'staticbook.views.index', name="book"), url(r'^courses/(?P<course_id>[^/]*)/book$', 'staticbook.views.index', name="book"),
url(r'^courses/(?P<course_id>[^/]*)/enroll$', 'student.views.enroll', name="enroll"), url(r'^courses/(?P<course_id>[^/]*)/enroll$', 'student.views.enroll', name="enroll"),
url(r'^courses/(?P<course_id>[^/]*)/courseware/?$', 'courseware.views.index', name="courseware"), url(r'^courses/(?P<course_id>[^/]*)/courseware/?$', 'courseware.views.index', name="courseware"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment